Revision f33355c3
Added by Andreas Müller over 3 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NameCacheStrategyBase.java | ||
---|---|---|
14 | 14 |
import java.util.Set; |
15 | 15 |
import java.util.UUID; |
16 | 16 |
|
17 |
import org.apache.commons.lang.StringUtils; |
|
18 | 17 |
import org.apache.log4j.Logger; |
19 | 18 |
|
20 | 19 |
import eu.etaxonomy.cdm.common.CdmUtils; |
... | ... | |
102 | 101 |
logger.warn(message); |
103 | 102 |
throw new IllegalStateException(message); |
104 | 103 |
} |
105 |
}else if(StringUtils.isNotBlank(ncStatus.getRuleConsidered())){
|
|
104 |
}else if(isNotBlank(ncStatus.getRuleConsidered())){ |
|
106 | 105 |
nomStatusStr = ncStatus.getRuleConsidered(); |
107 | 106 |
} |
108 | 107 |
String statusSeparator = ", "; |
... | ... | |
212 | 211 |
referenceCache = reference.getNomenclaturalCitation(microReference); |
213 | 212 |
} |
214 | 213 |
//add to tags |
215 |
if (StringUtils.isNotBlank(referenceCache)){
|
|
214 |
if (isNotBlank(referenceCache)){ |
|
216 | 215 |
if (! referenceCache.trim().startsWith("in ")){ |
217 | 216 |
String refConcat = ", "; |
218 | 217 |
tags.add(new TaggedText(TagEnum.separator, refConcat)); |
... | ... | |
230 | 229 |
|
231 | 230 |
protected void addOriginalSpelling(List<TaggedText> tags, TaxonName taxonName){ |
232 | 231 |
String originalName = getOriginalNameString(taxonName, tags); |
233 |
if (StringUtils.isNotBlank(originalName)){
|
|
232 |
if (isNotBlank(originalName)){ |
|
234 | 233 |
tags.add(new TaggedText(TagEnum.name, originalName)); |
235 | 234 |
} |
236 | 235 |
} |
... | ... | |
265 | 264 |
List<TaggedText> currentNameTags) { |
266 | 265 |
//use cache if necessary |
267 | 266 |
String cacheToUse = null; |
268 |
if (originalName.isProtectedNameCache() && StringUtils.isNotBlank(originalName.getNameCache())){
|
|
267 |
if (originalName.isProtectedNameCache() && isNotBlank(originalName.getNameCache())){ |
|
269 | 268 |
cacheToUse = originalName.getNameCache(); |
270 |
}else if (originalName.isProtectedTitleCache() && StringUtils.isNotBlank(originalName.getTitleCache())){
|
|
269 |
}else if (originalName.isProtectedTitleCache() && isNotBlank(originalName.getTitleCache())){ |
|
271 | 270 |
cacheToUse = originalName.getTitleCache(); |
272 |
}else if (originalName.isProtectedFullTitleCache() && StringUtils.isNotBlank(originalName.getFullTitleCache())){
|
|
271 |
}else if (originalName.isProtectedFullTitleCache() && isNotBlank(originalName.getFullTitleCache())){ |
|
273 | 272 |
cacheToUse = originalName.getFullTitleCache(); |
274 | 273 |
} |
275 | 274 |
if (cacheToUse != null){ |
Also available in: Unified diff
ref #9204 remove commons-lang2 from cdmlib dependencies