Revision 6ab31377
Added by Andreas Müller over 13 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java | ||
|---|---|---|
| 307 | 307 |
result = nonViralName.getNameCache(); |
| 308 | 308 |
}else if (rank == null){
|
| 309 | 309 |
result = getRanklessNameCache(nonViralName); |
| 310 |
}else if (nonViralName.isInfragenericUnranked()){
|
|
| 311 |
result = getUnrankedInfragenericNameCache(nonViralName); |
|
| 310 | 312 |
}else if (rank.isInfraSpecific()){
|
| 311 | 313 |
result = getInfraSpeciesNameCache(nonViralName); |
| 312 | 314 |
}else if (rank.isSpecies()){
|
| ... | ... | |
| 323 | 325 |
} |
| 324 | 326 |
return result; |
| 325 | 327 |
} |
| 326 |
|
|
| 328 |
// |
|
| 329 |
// |
|
| 330 |
// /** |
|
| 331 |
// * @param nonViralName |
|
| 332 |
// * @return |
|
| 333 |
// */ |
|
| 334 |
// private boolean isInfragenericUnranked(T nonViralName) {
|
|
| 335 |
// Rank rank = nonViralName.getRank(); |
|
| 336 |
// if (rank == null || ! rank.equals(Rank.UNRANKED())){
|
|
| 337 |
// return false; |
|
| 338 |
// } |
|
| 339 |
// if (StringUtils.isBlank(nonViralName.getSpecificEpithet()) && StringUtils.isBlank(nonViralName.getInfraSpecificEpithet()) ){
|
|
| 340 |
// return true; |
|
| 341 |
// }else{
|
|
| 342 |
// return false; |
|
| 343 |
// } |
|
| 344 |
// } |
|
| 345 |
|
|
| 346 |
|
|
| 347 |
private String getUnrankedInfragenericNameCache(T nonViralName) {
|
|
| 348 |
String result; |
|
| 349 |
Rank rank = nonViralName.getRank(); |
|
| 350 |
if (rank.isSpeciesAggregate()){
|
|
| 351 |
return getSpeciesAggregateCache(nonViralName); |
|
| 352 |
} |
|
| 353 |
String infraGenericMarker = rank.getAbbreviation(); |
|
| 354 |
result = CdmUtils.Nz(nonViralName.getGenusOrUninomial()).trim(); |
|
| 355 |
result += " " + infraGenericMarker + " " + (CdmUtils.Nz(nonViralName.getInfraGenericEpithet())).trim().replace("null", "");
|
|
| 356 |
result = addAppendedPhrase(result, nonViralName).trim(); |
|
| 357 |
return result; |
|
| 358 |
} |
|
| 359 |
|
|
| 327 | 360 |
|
| 328 | 361 |
/* (non-Javadoc) |
| 329 | 362 |
* @see eu.etaxonomy.cdm.strategy.cache.INonViralNameCacheStrategy#getAuthorCache(eu.etaxonomy.cdm.model.name.NonViralName) |
Also available in: Unified diff
Added new rank "unranked" (#2141) and updated language labels and titleCaches with full language name (#2144)