Project

General

Profile

Revision 133e595c

ID133e595c1ee87f9b265c7eb0c38b9c8b99af9498
Parent c1e5ed0d
Child 7cf9a2d3

Added by Andreas Kohlbecker over 2 years ago

fix #8104 renaming familiyNamePart back to lastNamePart

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/INonViralName.java
242 242

  
243 243

  
244 244
    /**
245
     * Defines the family part of the name.
245
     * Defines the last part of the name.
246 246
     * This is for infraspecific taxa, the infraspecific epithet,
247 247
     * for species the specific epithet, for infageneric taxa the infrageneric epithet
248 248
     * else the genusOrUninomial.
......
251 251
     * considering the above order.
252 252
     * @return the first not blank name part in reverse order
253 253
     */
254
    public String getFamilyNamePart();
254
    public String getLastNamePart();
255 255

  
256 256
    /**
257 257
     * Returns or generates the nameCache (scientific name
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
66 66
import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;
67 67
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
68 68
import eu.etaxonomy.cdm.model.common.CdmBase;
69
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
70 69
import eu.etaxonomy.cdm.model.common.IIntextReferenceTarget;
71 70
import eu.etaxonomy.cdm.model.common.IParsable;
72 71
import eu.etaxonomy.cdm.model.common.IRelated;
......
74 73
import eu.etaxonomy.cdm.model.common.OriginalSourceType;
75 74
import eu.etaxonomy.cdm.model.common.RelationshipBase;
76 75
import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
77
import eu.etaxonomy.cdm.model.common.TermType;
78
import eu.etaxonomy.cdm.model.common.TermVocabulary;
79 76
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
80 77
import eu.etaxonomy.cdm.model.description.IDescribable;
81 78
import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
......
3407 3404
     * @return the first not blank name part in reverse order
3408 3405
     */
3409 3406
    @Override
3410
    public String getFamilyNamePart() {
3407
    public String getLastNamePart() {
3411 3408
        String result =
3412 3409
                StringUtils.isNotBlank(this.getInfraSpecificEpithet())?
3413 3410
                    this.getInfraSpecificEpithet() :
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/homotypicgroup/BasionymRelationCreator.java
136 136
            TaxonName newCombinationCandidate) {
137 137
        if (basionymCandidate.isGenusOrSupraGeneric() || newCombinationCandidate.isGenusOrSupraGeneric()){
138 138
            return false;
139
        }else if (matchFamilyNamePart(basionymCandidate, newCombinationCandidate)){
139
        }else if (matchLastNamePart(basionymCandidate, newCombinationCandidate)){
140 140
            return true;
141 141
        }
142 142
        return false;
......
198 198
     * @param newCombination
199 199
     * @return
200 200
     */
201
    public static boolean matchFamilyNamePart(TaxonName name1, TaxonName name2) {
202
        String familyNamePart1 = name1.getFamilyNamePart();
203
        String familyNamePart2 = name2.getFamilyNamePart();
201
    public static boolean matchLastNamePart(TaxonName name1, TaxonName name2) {
202
        String familyNamePart1 = name1.getLastNamePart();
203
        String familyNamePart2 = name2.getLastNamePart();
204 204
        if (familyNamePart1 != null && familyNamePart2 != null){
205 205
            familyNamePart1 = normalizeBasionymNamePart(familyNamePart1);
206 206
            familyNamePart2 = normalizeBasionymNamePart(familyNamePart2);

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)