Project

General

Profile

« Previous | Next » 

Revision da39aca0

Added by Andreas Müller about 7 years ago

ref #6365 merge static methods from BotanicaName to TaxonNameBase

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java
214 214

  
215 215
	private void insertSomeData(CdmApplicationController appCtr) {
216 216
		Classification cl = Classification.NewInstance("myClass");
217
		TaxonNode node1 = cl.addChildTaxon(Taxon.NewInstance(BotanicalName.NewInstance(null), null), null, null);
217
		TaxonNode node1 = cl.addChildTaxon(Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(null), null), null, null);
218 218
		appCtr.getClassificationService().save(cl);
219 219

  
220 220
		Taxon t2 = Taxon.NewInstance(null, null);
......
292 292
		CdmApplicationController appCtr = CdmApplicationController.NewInstance(ds);
293 293
		Person agent = Person.NewInstance();
294 294
		appCtr.getAgentService().save(agent);
295
		TaxonNameBase<?,?> tn = BotanicalName.NewInstance(null);
295
		TaxonNameBase<?,?> tn = TaxonNameBase.NewBotanicalInstance(null);
296 296
		appCtr.getNameService().save(tn);
297 297
		appCtr.close();
298 298

  
......
312 312
		CdmApplicationController appCtr = CdmApplicationController.NewInstance(ds);
313 313
		Person agent = Person.NewInstance();
314 314
		appCtr.getAgentService().save(agent);
315
		TaxonNameBase<?,?> tn = BotanicalName.NewInstance(null);
315
		TaxonNameBase<?,?> tn = TaxonNameBase.NewBotanicalInstance(null);
316 316
		appCtr.getNameService().save(tn);
317 317
		appCtr.close();
318 318

  
......
352 352

  
353 353
		boolean exists = appCtr.getUserService().userExists("admin");
354 354
		try {
355
			BotanicalName name = BotanicalName.NewInstance(null);
355
			BotanicalName name = TaxonNameBase.NewBotanicalInstance(null);
356 356
			String nameCache = "testName";
357 357
			name.setNameCache(nameCache);
358 358
			name.setTitleCache(nameCache, true);
......
428 428
//			 CdmPersistentDataSource.NewInstance("localH2");
429 429
		CdmApplicationController appCtr = CdmApplicationController.NewInstance(ds, validation);
430 430
		try {
431
			BotanicalName botName1 = BotanicalName.NewInstance(Rank.SPECIES());
432
			BotanicalName botName2 = BotanicalName.NewInstance(Rank.SPECIES());
433
			BotanicalName hybridName = BotanicalName.NewInstance(Rank.SPECIES());
431
			BotanicalName botName1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
432
			BotanicalName botName2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
433
			BotanicalName hybridName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
434 434
			botName1.addRelationshipToName(botName2, NameRelationshipType.ORTHOGRAPHIC_VARIANT(), null);
435 435
			UUID uuid1 = botName1.getUuid();
436 436
			UUID uuid2 = botName2.getUuid();

Also available in: Unified diff