Revision 7316cc00
Added by Andreas Müller over 2 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java | ||
---|---|---|
591 | 591 |
* @param strRank the string identifying the rank |
592 | 592 |
* @return the rank |
593 | 593 |
*/ |
594 |
public static Rank getRankByNameOrIdInVoc(String strRank) throws UnknownCdmTypeException{ |
|
595 |
return getRankByNameOrIdInVoc(strRank, false); |
|
594 |
public static Rank getRankByLatinNameOrIdInVoc(String strRank) throws UnknownCdmTypeException{
|
|
595 |
return getRankByLatinNameOrIdInVoc(strRank, false);
|
|
596 | 596 |
} |
597 | 597 |
|
598 | 598 |
/** |
... | ... | |
604 | 604 |
* @param nc the nomenclatural code |
605 | 605 |
* @return the rank |
606 | 606 |
*/ |
607 |
public static Rank getRankByNameOrIdInVoc(String strRank, NomenclaturalCode nc) throws UnknownCdmTypeException{ |
|
608 |
return getRankByNameOrIdInVoc(strRank, nc, false); |
|
607 |
public static Rank getRankByLatinNameOrIdInVoc(String strRank, NomenclaturalCode nc) throws UnknownCdmTypeException{
|
|
608 |
return getRankByLatinNameOrIdInVoc(strRank, nc, false);
|
|
609 | 609 |
} |
610 | 610 |
|
611 | 611 |
// TODO |
... | ... | |
620 | 620 |
* unknown or not yet implemented |
621 | 621 |
* @return the rank |
622 | 622 |
*/ |
623 |
public static Rank getRankByNameOrIdInVoc(String strRank, boolean useUnknown) throws UnknownCdmTypeException{ |
|
623 |
public static Rank getRankByLatinNameOrIdInVoc(String strRank, boolean useUnknown) throws UnknownCdmTypeException{
|
|
624 | 624 |
try { |
625 | 625 |
strRank = strRank.replace("prol.", "proles"); |
626 | 626 |
return getRankByIdInVoc(strRank); |
627 | 627 |
} catch (UnknownCdmTypeException e) { |
628 |
return getRankByName(strRank, useUnknown); |
|
628 |
return getRankByLatinName(strRank, useUnknown);
|
|
629 | 629 |
} |
630 | 630 |
} |
631 | 631 |
|
... | ... | |
642 | 642 |
* unknown or not yet implemented |
643 | 643 |
* @return the rank |
644 | 644 |
*/ |
645 |
public static Rank getRankByNameOrIdInVoc(String strRank, NomenclaturalCode nc, boolean useUnknown) |
|
645 |
public static Rank getRankByLatinNameOrIdInVoc(String strRank, NomenclaturalCode nc, boolean useUnknown)
|
|
646 | 646 |
throws UnknownCdmTypeException{ |
647 | 647 |
try { |
648 | 648 |
return getRankByIdInVoc(strRank, nc); |
649 | 649 |
} catch (UnknownCdmTypeException e) { |
650 |
return getRankByName(strRank, nc, useUnknown); |
|
650 |
return getRankByLatinName(strRank, nc, useUnknown);
|
|
651 | 651 |
} |
652 | 652 |
} |
653 | 653 |
|
... | ... | |
813 | 813 |
* @param rankName the string for the name of the rank |
814 | 814 |
* @return the rank |
815 | 815 |
*/ |
816 |
public static Rank getRankByName(String rankName) throws UnknownCdmTypeException{ |
|
817 |
return getRankByName(rankName, false); |
|
816 |
public static Rank getRankByLatinName(String rankName) throws UnknownCdmTypeException{
|
|
817 |
return getRankByLatinName(rankName, false);
|
|
818 | 818 |
} |
819 | 819 |
|
820 | 820 |
|
... | ... | |
829 | 829 |
* @param nc the nomenclatural code |
830 | 830 |
* @return the rank |
831 | 831 |
*/ |
832 |
public static Rank getRankByName(String rankName, NomenclaturalCode nc) throws UnknownCdmTypeException{ |
|
833 |
return getRankByName(rankName, nc, false); |
|
832 |
public static Rank getRankByLatinName(String rankName, NomenclaturalCode nc) throws UnknownCdmTypeException{
|
|
833 |
return getRankByLatinName(rankName, nc, false);
|
|
834 | 834 |
} |
835 | 835 |
|
836 | 836 |
/** |
... | ... | |
843 | 843 |
* unknown or not yet implemented |
844 | 844 |
* @return the rank |
845 | 845 |
*/ |
846 |
public static Rank getRankByName(String rankName, boolean useUnknown) |
|
846 |
public static Rank getRankByLatinName(String rankName, boolean useUnknown)
|
|
847 | 847 |
throws UnknownCdmTypeException{ |
848 | 848 |
if (rankName.equalsIgnoreCase("Regnum")){ return Rank.KINGDOM(); |
849 | 849 |
}else if (rankName.equalsIgnoreCase("Subregnum")){ return Rank.SUBKINGDOM(); |
... | ... | |
955 | 955 |
} |
956 | 956 |
} |
957 | 957 |
|
958 |
|
|
959 |
public static Rank getRankByName(String rankName, NomenclaturalCode nc, boolean useUnknown) |
|
958 |
/** |
|
959 |
* Preliminary implementation for name parser. |
|
960 |
*/ |
|
961 |
public static Rank getRankByLatinName(String rankName, NomenclaturalCode nc, boolean useUnknown) |
|
960 | 962 |
throws UnknownCdmTypeException { |
961 | 963 |
|
962 | 964 |
if (nc.equals(NomenclaturalCode.ICZN)) { |
... | ... | |
964 | 966 |
}else if (rankName.equalsIgnoreCase("Subsectio")) { return Rank.SUBSECTION_ZOOLOGY(); |
965 | 967 |
} |
966 | 968 |
} |
967 |
return getRankByName(rankName, useUnknown); |
|
969 |
return getRankByLatinName(rankName, useUnknown);
|
|
968 | 970 |
} |
969 | 971 |
|
970 | 972 |
/** |
Also available in: Unified diff
ref #824 rename Rank.getByNameXXX to getByLatinNameXXX