Project

General

Profile

« Previous | Next » 

Revision 531fc7bc

Added by Andreas Müller almost 8 years ago

Remove generics from Reference in cdmlib (except for cdmlib-model) #5830

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java
183 183

  
184 184
	private void createSupplemental(List<CdmBase> cdmBases)  {
185 185

  
186
		Reference<?> ref = ReferenceFactory.newBook();
186
		Reference ref = ReferenceFactory.newBook();
187 187

  
188 188
		Annotation annotation = Annotation.NewDefaultLanguageInstance("annotation");
189 189
		ref.addAnnotation(annotation);
......
387 387
		textData.addModifier(DefinedTerm.SEX_HERMAPHRODITE());
388 388
		textData.putModifyingText(Language.ENGLISH(), "no modification");
389 389
		textData.setTimeperiod(TimePeriodParser.parseString("1970-1980"));
390
		Reference<?> ref = ReferenceFactory.newArticle();
390
		Reference ref = ReferenceFactory.newArticle();
391 391
		DescriptionElementSource source = textData.addSource(OriginalSourceType.Import, "22", "taxon description table", ref, "detail");
392 392
		source.setNameUsedInSource(BotanicalName.NewInstance(Rank.GENUS()));
393 393
		handleAnnotatableEntity(source);
......
596 596
		sequence.setGeneticAccessionNumber("GenNO12345");
597 597
		sequence.setBoldProcessId("boldId");
598 598
		sequence.setHaplotype("haplotype");
599
		Reference<?> sequenceCitation = getReference();
599
		Reference sequenceCitation = getReference();
600 600
		sequence.addCitation(sequenceCitation);
601 601
		handleAnnotatableEntity(sequence);
602 602

  
......
626 626

  
627 627

  
628 628
	private void createTaxon(List<CdmBase> cdmBases) {
629
		Reference<?> sec = getReference();
629
		Reference sec = getReference();
630 630
		TaxonNameBase<?,?> name = BotanicalName.NewInstance(Rank.GENUS());
631 631
		Taxon taxon = Taxon.NewInstance(name, sec);
632 632
		handleIdentifiableEntity(taxon);
......
676 676

  
677 677

  
678 678
	private void createReference(List<CdmBase> cdmBases) {
679
		Reference<?> reference = ReferenceFactory.newArticle();
679
		Reference reference = ReferenceFactory.newArticle();
680 680
		Person author = Person.NewTitledInstance("Author team");
681 681
		reference.setAuthorship(author);
682 682
		reference.setTitle("ref title");
......
701 701
		reference.setVolume("vol. 3");
702 702
		reference.setUri(URI.create("http://rer.abc.de"));
703 703

  
704
		Reference<?> journal = ReferenceFactory.newJournal();
704
		Reference journal = ReferenceFactory.newJournal();
705 705
		reference.setInJournal(journal);
706 706

  
707 707
		handleIdentifiableEntity(reference);
......
938 938
	}
939 939

  
940 940

  
941
	private Reference<?> getReference() {
942
		 Reference<?> result = ReferenceFactory.newGeneric();
941
	private Reference getReference() {
942
		 Reference result = ReferenceFactory.newGeneric();
943 943
		 result.setTitle("some generic reference");
944 944
		 return result;
945 945
	}
......
953 953

  
954 954

  
955 955
	private Taxon getTaxon() {
956
		Reference<?> sec = getReference();
956
		Reference sec = getReference();
957 957
		TaxonNameBase<?,?> name = BotanicalName.NewInstance(Rank.GENUS());
958 958
		Taxon taxon = Taxon.NewInstance(name, sec);
959 959
		return taxon;

Also available in: Unified diff