Project

General

Profile

« Previous | Next » 

Revision 236ab161

Added by Andreas Müller almost 9 years ago

Rename remaining occurrences of xxxAuthorTeam #4968

Rename remaining occurrences of combinationAuthorTeam and
basionymAuthorTeam in code and other files

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
99 99 
    "infraGenericEpithet",
100 100 
    "specificEpithet",
101 101 
    "infraSpecificEpithet",
102 
    "combinationAuthorTeam",
103 
    "exCombinationAuthorTeam",
104 
    "basionymAuthorTeam",
105 
    "exBasionymAuthorTeam",
102 
    "combinationAuthorship",
103 
    "exCombinationAuthorship",
104 
    "basionymAuthorship",
105 
    "exBasionymAuthorship",
106 106 
    "authorshipCache",
107 107 
    "protectedAuthorshipCache",
108 108 
    "protectedNameCache",
......
228 228 
        @Field(analyze = Analyze.NO)
229 229 
    })
230 230 
    @Match(value=MatchMode.CACHE, cacheReplaceMode=ReplaceMode.DEFINED,
231 
            cacheReplacedProperties={"combinationAuthorTeam", "basionymAuthorTeam", "exCombinationAuthorTeam", "exBasionymAuthorTeam"} )
231 
            cacheReplacedProperties={"combinationAuthorship", "basionymAuthorship", "exCombinationAuthorship", "exBasionymAuthorship"} )
232 232 
    //TODO Val #3379
233 233 
//    @NotNull
234 234 
    @Size(max = 255)
......
373 373 
     * 			<i>this</i> non viral taxon name if its rank is species aggregate or lower
374 374 
     * @param	infraSpecificEpithet  the string for the second epithet of
375 375 
     * 			<i>this</i> non viral taxon name if its rank is lower than species
376 
     * @param	combinationAuthorTeam  the author or the team who published <i>this</i> non viral taxon name
376 
     * @param	combinationAuthorship  the author or the team who published <i>this</i> non viral taxon name
377 377 
     * @param	nomenclaturalReference  the nomenclatural reference where <i>this</i> non viral taxon name was published
378 378 
     * @param	nomenclMicroRef  the string with the details for precise location within the nomenclatural reference
379 379 
     * @param	homotypicalGroup  the homotypical group to which <i>this</i> non viral taxon name belongs
......
384 384 
     * @see 	eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy
385 385 
     * @see 	eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy
386 386 
     */
387 
    protected NonViralName(Rank rank, String genusOrUninomial, String infraGenericEpithet, String specificEpithet, String infraSpecificEpithet, TeamOrPersonBase combinationAuthorTeam, INomenclaturalReference nomenclaturalReference, String nomenclMicroRef, HomotypicalGroup homotypicalGroup) {
387 
    protected NonViralName(Rank rank, String genusOrUninomial, String infraGenericEpithet, String specificEpithet, String infraSpecificEpithet, TeamOrPersonBase combinationAuthorship, INomenclaturalReference nomenclaturalReference, String nomenclMicroRef, HomotypicalGroup homotypicalGroup) {
388 388 
        super(rank, homotypicalGroup);
389 389 
        setNameCacheStrategy();
390 390 
        setGenusOrUninomial(genusOrUninomial);
391 391 
        setInfraGenericEpithet (infraGenericEpithet);
392 392 
        setSpecificEpithet(specificEpithet);
393 393 
        setInfraSpecificEpithet(infraSpecificEpithet);
394 
        setCombinationAuthorship(combinationAuthorTeam);
394 
        setCombinationAuthorship(combinationAuthorship);
395 395 
        setNomenclaturalReference(nomenclaturalReference);
396 396 
        this.setNomenclaturalMicroReference(nomenclMicroRef);
397 397 
    }
......
1419 1419 
            result.authorshipCache = null;
1420 1420 
        }
1421 1421 

  		




  1422
  
  
    
        //no changes to: basionamyAuthorTeam, combinationAuthorTeam, exBasionymAuthorTeam, exCombinationAuthorTeam


  		




  
  1422
  
    
        //no changes to: basionamyAuthorship, combinationAuthorship, exBasionymAuthorship, exCombinationAuthorship


  		




  1423
  1423
  
    
        //genusOrUninomial, infraGenericEpithet, specificEpithet, infraSpecificEpithet,


  		




  1424
  1424
  
    
        //protectedAuthorshipCache, protectedNameCache


  		




  1425
  1425
  
    
        //binomHybrid, monomHybrid, trinomHybrid, hybridFormula,


  		












Also available in:  Unified diff