Project

General

Profile

« Previous | Next » 

Revision db183545

Added by Andreas Müller almost 7 years ago

ref #6630 and ref #6368 remove generics from TaxonName

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/ClassificationTest.java
64 64
	private static Taxon taxon3;
65 65
	private static Taxon taxon12;
66 66
	private static Taxon taxon121;
67
	private static TaxonName<?,?> taxonName1;
68
	private static TaxonName<?,?> taxonName2;
69
	private static TaxonName<?,?> taxonName3;
70
	private static TaxonName<?,?> taxonName12;
71
	private static TaxonName<?,?> taxonName121;
67
	private static TaxonName taxonName1;
68
	private static TaxonName taxonName2;
69
	private static TaxonName taxonName3;
70
	private static TaxonName taxonName12;
71
	private static TaxonName taxonName121;
72 72
	private static Reference ref1;
73 73
	private static Reference ref2;
74 74
	private static Reference ref3;
......
129 129
	 */
130 130
	@Test
131 131
	public void testAddRoot() {
132
		TaxonName<?,?> synonymName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
132
		TaxonName synonymName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
133 133
		Synonym synonym = Synonym.NewInstance(synonymName, ref1);
134 134
		TaxonNode taxonNode1 = classification1.addChildTaxon(taxon1, null, null);
135 135
		taxonNode1.setSynonymToBeUsed(synonym);
......
230 230
	@Test
231 231
	public void testAddParentChild() {
232 232

  
233
		TaxonName<?,?> synonymName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
233
		TaxonName synonymName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
234 234
		Synonym synonym = Synonym.NewInstance(synonymName, ref1);
235 235
		TaxonNode rootNode = classification1.addChildTaxon(taxon1, null, null);
236 236
		rootNode.setSynonymToBeUsed(synonym);
......
346 346
		//genericDao.getCdmBasesByFieldAndClass(clazz, field.getName(), value);
347 347

  
348 348

  
349
		TaxonName<?,?> name = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
349
		TaxonName name = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
350 350
		name.setTitleCache("A dummy name", true);
351 351
		result.add(name);
352 352
		Reference ref = ReferenceFactory.newBook();

Also available in: Unified diff