Project

General

Profile

« Previous | Next » 

Revision 6bd0f9a3

Added by Andreas Müller almost 7 years ago

Add "ined." as nomenclatural status #5896

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java
100 100
	private static final UUID uuidCombNov = UUID.fromString("ed508710-deef-44b1-96f6-1ce6d2c9c884");
101 101
	private static final UUID uuidOrthographyRejected = UUID.fromString("39a25673-f716-4ec7-ae27-2498fce43166");
102 102
	private static final UUID uuidConservedDesig = UUID.fromString("4e9c9702-a74d-4033-9d47-792ad123712c");
103
	private static final UUID uuidIned = UUID.fromString("51429574-c6f9-4aa1-bab9-0bbc5b160ba1");
103 104

  
104 105
	//zoological uuids
105 106
	public static final UUID uuidIcznNomStatusVocabulary = UUID.fromString("5e3c08e9-13a9-498e-861e-b9b5656ab6ac");
......
211 212
		if (this.equals(INVALID())
212 213
			|| this.equals(NUDUM())
213 214
			|| 	this.equals(PROVISIONAL())
215
			||  this.equals(INED())
214 216
			|| 	this.equals(COMBINATION_INVALID())
215 217
			|| 	this.equals(OPUS_UTIQUE_OPPR())
216 218
			||  this.equals(ZOO_NOT_AVAILABLE())
......
559 561
		return getTermByUuid(uuidOrthographyConserved);
560 562
	}
561 563

  
564

  
565

  
566

  
562 567
    /**
563 568
     * Returns the nomenclatural status type "orthography rejected". <BR>
564 569
     * TBC.
......
690 695

  
691 696
	/**
692 697
	 * Returns the nomenclatural status type "provisional". A {@link TaxonNameBase taxon name} is
693
	 * "provisional" if it has not been yet effectively published.<BR>
694
	 * A "provisional" taxon name is therefore also "invalid"
695
	 * ("not available" for {@link ZoologicalName zoological names}).
698
	 * "provisional" if it is not validly published, because not finally accepted by the author<BR>
699
	 * Some people use it in the same way as {@link #INED() ined.}
696 700
	 *
701
	 * @see #INED()
697 702
	 * @see  #isInvalidType()
698 703
	 */
699 704
	public static final NomenclaturalStatusType PROVISIONAL(){
700 705
		return getTermByUuid(uuidProvisional);
701 706
	}
702 707

  
708
    /**
709
     * Returns the nomenclatural status type "ined.". A {@link TaxonNameBase taxon name} is
710
     * "inedited" if it it has not yet been published.<BR>
711
     * An inedited taxon name is therefore also "invalid" (bot.) / "not available (zool.)
712
     *<BR>
713
     * see also http://dev.e-taxonomy.eu/trac/ticket/5896
714
     *
715
     * @see #PROVISIONAL()
716
     * @see  #isInvalidType()
717
     * @return
718
     */
719
    public static final NomenclaturalStatusType INED(){
720
        return getTermByUuid(uuidIned);
721
    }
722

  
703 723
	/**
704 724
	 * Returns the nomenclatural status type "valid" (this corresponds to
705 725
	 * "available" for {@link ZoologicalName zoological names}).<BR>
......
830 850
			}
831 851
			throw new UnknownCdmTypeException("Unknown nom. status abbreviation: " + statusAbbreviation);
832 852
		}
833

  
834
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. ambig.")) { return NomenclaturalStatusType.AMBIGUOUS();
835
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. dub.")) { return NomenclaturalStatusType.DOUBTFUL();
836
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. confus.")) { return NomenclaturalStatusType.CONFUSUM();
837
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. illeg.")){return NomenclaturalStatusType.ILLEGITIMATE();
838
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. superfl.")){ return NomenclaturalStatusType.SUPERFLUOUS();
839
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. rej.")) { return NomenclaturalStatusType.REJECTED();
840
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. utique rej.")) { return NomenclaturalStatusType.UTIQUE_REJECTED();
841
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. cons. prop.")) { return NomenclaturalStatusType.CONSERVED_PROP();
842
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. orth. cons. prop.")) { return NomenclaturalStatusType.ORTHOGRAPHY_CONSERVED_PROP();
843
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. legit.")) { return NomenclaturalStatusType.LEGITIMATE();
844
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. altern.")) { return NomenclaturalStatusType.ALTERNATIVE();
845

  
846
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. alternativ.")) { return NomenclaturalStatusType.ALTERNATIVE();
847

  
848
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. nov.")) { return NomenclaturalStatusType.NOVUM();
849
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. utique rej. prop.")) { return NomenclaturalStatusType.UTIQUE_REJECTED_PROP();
850
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. orth. cons.")) { return NomenclaturalStatusType.ORTHOGRAPHY_CONSERVED();
851
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. rej. prop.")) { return NomenclaturalStatusType.REJECTED_PROP();
852
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. cons.")) { return NomenclaturalStatusType.CONSERVED();
853
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. sanct.")) { return NomenclaturalStatusType.SANCTIONED();
854
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. inval.")) { return NomenclaturalStatusType.INVALID();
855
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. nud.")){ return NomenclaturalStatusType.NUDUM();
856
//		}else if (statusAbbreviation.equalsIgnoreCase("comb. inval.")){ return NomenclaturalStatusType.COMBINATION_INVALID();
857
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. provis.")) { return NomenclaturalStatusType.PROVISIONAL();
858
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. valid")) { return NomenclaturalStatusType.VALID();
859
//		}else if (statusAbbreviation.equalsIgnoreCase("opus. utique oppr.")) { return NomenclaturalStatusType.OPUS_UTIQUE_OPPR();
860
//		}else if (statusAbbreviation.equalsIgnoreCase("nom. subnud.")) { return NomenclaturalStatusType.SUBNUDUM();
861
//		//TODO make generic, use labels for map
862
//		}else {
863
//			if (statusAbbreviation == null){
864
//				statusAbbreviation = "(null)";
865
//			}
866
//			throw new eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException("Unknown NomenclaturalStatusType abbreviation: " + statusAbbreviation);
867
//		}
868 853
	}
869 854

  
870 855
	/**
......
895 880
			}
896 881
			throw new UnknownCdmTypeException("Unknown nom. status label: " + statusLabel);
897 882
		}
898

  
899
//		if (statusLabel == null){ throw new NullPointerException("statusLabel is 'null' in getNomenclaturalStatusTypeByLabel");
900
//		}else if (statusLabel.equalsIgnoreCase("Ambiguous")) { return NomenclaturalStatusType.AMBIGUOUS();
901
//		}else if (statusLabel.equalsIgnoreCase("Doubtful")) { return NomenclaturalStatusType.DOUBTFUL();
902
//		}else if (statusLabel.equalsIgnoreCase("Confusum")) { return NomenclaturalStatusType.CONFUSUM();
903
//		}else if (statusLabel.equalsIgnoreCase("Illegitimate")){return NomenclaturalStatusType.ILLEGITIMATE();
904
//		}else if (statusLabel.equalsIgnoreCase("Superfluous")){ return NomenclaturalStatusType.SUPERFLUOUS();
905
//		}else if (statusLabel.equalsIgnoreCase("Rejected")) { return NomenclaturalStatusType.REJECTED();
906
//		}else if (statusLabel.equalsIgnoreCase("Utique Rejected")) { return NomenclaturalStatusType.UTIQUE_REJECTED();
907
//		}else if (statusLabel.equalsIgnoreCase("Conserved Prop")) { return NomenclaturalStatusType.CONSERVED_PROP();
908
//		}else if (statusLabel.equalsIgnoreCase("Orthography Conserved Prop")) { return NomenclaturalStatusType.ORTHOGRAPHY_CONSERVED_PROP();
909
//		}else if (statusLabel.equalsIgnoreCase("Legitimate")) { return NomenclaturalStatusType.LEGITIMATE();
910
//		}else if (statusLabel.equalsIgnoreCase("Alternative")) { return NomenclaturalStatusType.ALTERNATIVE();
911
//		}else if (statusLabel.equalsIgnoreCase("Novum")) { return NomenclaturalStatusType.NOVUM();
912
//		}else if (statusLabel.equalsIgnoreCase("Utique Rejected Prop")) { return NomenclaturalStatusType.UTIQUE_REJECTED_PROP();
913
//		}else if (statusLabel.equalsIgnoreCase("Orthography Conserved")) { return NomenclaturalStatusType.ORTHOGRAPHY_CONSERVED();
914
//		}else if (statusLabel.equalsIgnoreCase("Rejected Prop")) { return NomenclaturalStatusType.REJECTED_PROP();
915
//		}else if (statusLabel.equalsIgnoreCase("Conserved")) { return NomenclaturalStatusType.CONSERVED();
916
//		}else if (statusLabel.equalsIgnoreCase("Sanctioned")) { return NomenclaturalStatusType.SANCTIONED();
917
//		}else if (statusLabel.equalsIgnoreCase("Invalid")) { return NomenclaturalStatusType.INVALID();
918
//		}else if (statusLabel.equalsIgnoreCase("Nudum")){ return NomenclaturalStatusType.NUDUM();
919
//		}else if (statusLabel.equalsIgnoreCase("Combination Invalid")){ return NomenclaturalStatusType.COMBINATION_INVALID();
920
//		}else if (statusLabel.equalsIgnoreCase("Provisional")) { return NomenclaturalStatusType.PROVISIONAL();
921
//		}else if (statusLabel.equalsIgnoreCase("Valid")) { return NomenclaturalStatusType.VALID();
922
//		}else if (statusLabel.equalsIgnoreCase("Opus Utique Oppr")) { return NomenclaturalStatusType.OPUS_UTIQUE_OPPR();
923
//		}else if (statusLabel.equalsIgnoreCase("Subnudum")) { return NomenclaturalStatusType.SUBNUDUM();
924
//		}else {
925
//			if (statusLabel == null){
926
//				statusLabel = "(null)";
927
//			}
928
//			throw new eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException("Unknown NomenclaturalStatusType abbreviation: " + statusLabel);
929
//		}
930 883
	}
931 884

  
932 885

  
cdmlib-model/src/main/resources/terms/NomenclaturalStatusType.csv
26 26
"a5055d80-dbba-4660-b091-a1835d59fe7c",,"Opus Utique Oppr","Opus Utique Oppr","opus. utique oppr."
27 27
"92a76bd0-6ea8-493f-98e0-4be0b98c092f",,"Subnudum","Subnudum","nom. subnud."
28 28
"ed508710-deef-44b1-96f6-1ce6d2c9c884",,"New combination","New combination","comb. nov."
29
"39a25673-f716-4ec7-ae27-2498fce43166",,"Orthography Rejected","Orthography Rejected","orth. rej."
29
"39a25673-f716-4ec7-ae27-2498fce43166",,"Orthography Rejected","Orthography Rejected","orth. rej."
30
"51429574-c6f9-4aa1-bab9-0bbc5b160ba1",,"Name not yet publised","Not yet published","ined."

Also available in: Unified diff