Project

General

Profile

« Previous | Next » 

Revision 9dc896c9

Added by Andreas Müller almost 7 years ago

fix #6368 rename table and class TaxonNameBase

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.java
105 105
import eu.etaxonomy.cdm.model.name.Rank;
106 106
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
107 107
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
108
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
108
import eu.etaxonomy.cdm.model.name.TaxonName;
109 109
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
110 110
import eu.etaxonomy.cdm.model.occurrence.Collection;
111 111
import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;
......
195 195
		//Others
196 196
		try {
197 197
			LSIDAuthority lsidAuthority = new LSIDAuthority("My authority");
198
			lsidAuthority.addNamespace("lsidNamespace", TaxonNameBase.class);
198
			lsidAuthority.addNamespace("lsidNamespace", TaxonName.class);
199 199
			cdmBases.add(lsidAuthority);
200 200
		} catch (MalformedLSIDException e) {
201 201
			e.printStackTrace();
......
397 397
		handleAnnotatableEntity(specDesc);
398 398

  
399 399
		//Name description
400
		TaxonNameBase<?,?> name = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
400
		TaxonName name = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
401 401
		TaxonNameDescription nameDesc = TaxonNameDescription.NewInstance(name);
402 402
		cdmBases.add(name);
403 403
		handleAnnotatableEntity(nameDesc);
......
622 622

  
623 623
	private void createTaxon(List<CdmBase> cdmBases) {
624 624
		Reference sec = getReference();
625
		TaxonNameBase<?,?> name = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
625
		TaxonName name = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
626 626
		Taxon taxon = Taxon.NewInstance(name, sec);
627 627
		handleIdentifiableEntity(taxon);
628 628

  
629
		TaxonNameBase<?,?> synName = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
629
		TaxonName synName = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
630 630
		Synonym syn = Synonym.NewInstance(synName, sec, "123");
631 631
		taxon.addSynonym(syn, SynonymType.HETEROTYPIC_SYNONYM_OF());
632 632
		taxon.setDoubtful(true);
......
760 760
		mediaSpecimen.setAccessionNumber("accessionNumber");
761 761
//		mediaSpecimen.setCollectorsNumber("collectorsNumber");
762 762
		mediaSpecimen.setBarcode("barcode");
763
		TaxonNameBase<?,?> storedUnder = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
763
		TaxonName storedUnder = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
764 764
		storedUnder.setTitleCache("Stored under", true);
765 765
		mediaSpecimen.setStoredUnder(storedUnder);
766 766
		mediaSpecimen.setExsiccatum("exsiccatum");
......
807 807

  
808 808

  
809 809
	private void createTaxonName(List<CdmBase> cdmBases) {
810
		TaxonNameBase<?,?> bacName = TaxonNameFactory.NewBacterialInstance(Rank.GENUS());
810
		TaxonName bacName = TaxonNameFactory.NewBacterialInstance(Rank.GENUS());
811 811
		bacName.setSubGenusAuthorship("sub Genus author");
812 812
		bacName.setNameApprobation("nameApprobation");
813 813
		handleIdentifiableEntity(bacName);
814 814

  
815
		TaxonNameBase<?,?> botName = TaxonNameFactory.NewCultivarInstance(Rank.SUBSPECIES());
815
		TaxonName botName = TaxonNameFactory.NewCultivarInstance(Rank.SUBSPECIES());
816 816
		botName.setAnamorphic(true);
817 817
		botName.setCultivarName("cultivarName");
818 818
		botName.setGenusOrUninomial("Genus");
......
829 829
		botName.setExBasionymAuthorship(exBasionymAuthorship);
830 830
		handleIdentifiableEntity(botName);
831 831
		handleAnnotatableEntity(botName.getHomotypicalGroup());
832
		TaxonNameBase<?,?> botName2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
832
		TaxonName botName2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
833 833
		HybridRelationship hybridRel = botName2.addHybridChild(botName, HybridRelationshipType.FIRST_PARENT(), "Rule 1.2.3");
834 834
		hybridRel.setCitation(ReferenceFactory.newBook());
835 835
		hybridRel.setCitationMicroReference("p. 123");
836 836
		handleAnnotatableEntity(hybridRel);
837 837

  
838
		TaxonNameBase<?,?> zooName = TaxonNameFactory.NewZoologicalInstance(Rank.GENUS());
838
		TaxonName zooName = TaxonNameFactory.NewZoologicalInstance(Rank.GENUS());
839 839
		zooName.setBreed("breed");
840 840
		zooName.setPublicationYear(1922);
841 841
		zooName.setOriginalPublicationYear(1987);
......
851 851
		handleIdentifiableEntity(zooName);
852 852

  
853 853
		//TypeDesignation
854
		TaxonNameBase<?,?> speciesZooName = TaxonNameFactory.NewZoologicalInstance(Rank.SPECIES());
854
		TaxonName speciesZooName = TaxonNameFactory.NewZoologicalInstance(Rank.SPECIES());
855 855
		NameTypeDesignation nameDesig = zooName.addNameTypeDesignation(speciesZooName, getReference(), "111", "original name",
856 856
				NameTypeDesignationStatus.AUTOMATIC(), true, true, true, true);
857 857
		handleAnnotatableEntity(nameDesig);
......
859 859
				getReference(), "p,22", "original name", false, true);
860 860
		handleAnnotatableEntity(specimenDesig);
861 861

  
862
		TaxonNameBase<?,?> viralName = TaxonNameFactory.NewViralInstance(Rank.GENUS());
862
		TaxonName viralName = TaxonNameFactory.NewViralInstance(Rank.GENUS());
863 863
		viralName.setAcronym("acronym");
864 864
		handleIdentifiableEntity(viralName);
865 865

  
......
946 946

  
947 947
	private Taxon getTaxon() {
948 948
		Reference sec = getReference();
949
		TaxonNameBase<?,?> name = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
949
		TaxonName name = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
950 950
		Taxon taxon = Taxon.NewInstance(name, sec);
951 951
		return taxon;
952 952

  

Also available in: Unified diff