Revision fa9ef8c4
minor
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java | ||
|---|---|---|
| 20 | 20 |
import java.util.Set; |
| 21 | 21 |
import java.util.UUID; |
| 22 | 22 |
|
| 23 |
import org.apache.commons.lang.StringUtils; |
|
| 24 | 23 |
import org.apache.log4j.Logger; |
| 25 | 24 |
|
| 26 | 25 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
| ... | ... | |
| 172 | 171 |
|
| 173 | 172 |
protected Classification makeTree(STATE state, Reference reference){
|
| 174 | 173 |
String treeName = "Classification (Import)"; |
| 175 |
if (reference != null && StringUtils.isNotBlank(reference.getTitleCache())){
|
|
| 174 |
if (reference != null && isNotBlank(reference.getTitleCache())){
|
|
| 176 | 175 |
treeName = reference.getTitleCache(); |
| 177 | 176 |
} |
| 178 | 177 |
Classification tree = Classification.NewInstance(treeName); |
| ... | ... | |
| 202 | 201 |
*/ |
| 203 | 202 |
protected Classification makeTreeMemSave(STATE state, Reference ref){
|
| 204 | 203 |
String treeName = "Classification (Import)"; |
| 205 |
if (ref != null && StringUtils.isNotBlank(ref.getTitleCache())){
|
|
| 204 |
if (ref != null && isNotBlank(ref.getTitleCache())){
|
|
| 206 | 205 |
treeName = ref.getTitleCache(); |
| 207 | 206 |
} |
| 208 | 207 |
Classification tree = Classification.NewInstance(treeName); |
| ... | ... | |
| 1045 | 1044 |
* @param childTaxon |
| 1046 | 1045 |
*/ |
| 1047 | 1046 |
protected void fillMissingEpithets(INonViralName parentName, INonViralName childName) {
|
| 1048 |
if (StringUtils.isBlank(childName.getGenusOrUninomial()) && childName.getRank().isLower(Rank.GENUS()) ){
|
|
| 1047 |
if (isBlank(childName.getGenusOrUninomial()) && childName.getRank().isLower(Rank.GENUS()) ){
|
|
| 1049 | 1048 |
childName.setGenusOrUninomial(parentName.getGenusOrUninomial()); |
| 1050 | 1049 |
} |
| 1051 | 1050 |
|
| 1052 |
if (StringUtils.isBlank(childName.getSpecificEpithet()) && childName.getRank().isLower(Rank.SPECIES()) ){
|
|
| 1051 |
if (isBlank(childName.getSpecificEpithet()) && childName.getRank().isLower(Rank.SPECIES()) ){
|
|
| 1053 | 1052 |
childName.setSpecificEpithet(parentName.getSpecificEpithet()); |
| 1054 | 1053 |
} |
| 1055 | 1054 |
if (childName.isAutonym() && childName.getCombinationAuthorship() == null && childName.getBasionymAuthorship() == null ){
|
| ... | ... | |
| 1550 | 1549 |
* @return |
| 1551 | 1550 |
*/ |
| 1552 | 1551 |
protected String NB(String str) {
|
| 1553 |
if (StringUtils.isBlank(str)){
|
|
| 1552 |
if (isBlank(str)){
|
|
| 1554 | 1553 |
return null; |
| 1555 | 1554 |
}else{
|
| 1556 | 1555 |
return str; |
| ... | ... | |
| 1600 | 1599 |
|
| 1601 | 1600 |
} |
| 1602 | 1601 |
}else{
|
| 1603 |
if (StringUtils.isNotBlank(authorName)){
|
|
| 1602 |
if (isNotBlank(authorName)){
|
|
| 1604 | 1603 |
author = Person.NewInstance(); |
| 1605 | 1604 |
author.setTitleCache(authorName, true); |
| 1606 | 1605 |
}else{
|
| cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/UuidAndTitleCache.java | ||
|---|---|---|
| 20 | 20 |
* @author n.hoffmann |
| 21 | 21 |
* @since Aug 14, 2009 |
| 22 | 22 |
*/ |
| 23 |
|
|
| 24 |
|
|
| 25 | 23 |
public class UuidAndTitleCache<T extends ICdmBase> implements Serializable {
|
| 26 |
/** |
|
| 27 |
* |
|
| 28 |
*/ |
|
| 24 |
|
|
| 29 | 25 |
private static final long serialVersionUID = 3446993458279371682L; |
| 30 | 26 |
|
| 31 | 27 |
@SuppressWarnings("unused")
|
Also available in: Unified diff
