Project

General

Profile

« Previous | Next » 

Revision f33355c3

Added by Andreas Müller over 3 years ago

ref #9204 remove commons-lang2 from cdmlib dependencies

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
9

  
10 9
package eu.etaxonomy.cdm.model.location;
11 10

  
12

  
13 11
import java.util.ArrayList;
14 12
import java.util.HashMap;
15 13
import java.util.HashSet;
......
34 32
import javax.xml.bind.annotation.XmlSeeAlso;
35 33
import javax.xml.bind.annotation.XmlType;
36 34

  
37
import org.apache.commons.lang.StringUtils;
35
import org.apache.commons.lang3.StringUtils;
38 36
import org.apache.log4j.Logger;
39 37
import org.hibernate.annotations.Cascade;
40 38
import org.hibernate.annotations.CascadeType;
......
786 784
            title.append(areaString);
787 785
        }else if (area.isProtectedTitleCache()){
788 786
        	title.append(area.getTitleCache());
789
        }else if (StringUtils.isNotBlank(area.getIdInVocabulary())){
787
        }else if (isNotBlank(area.getIdInVocabulary())){
790 788
        	title.append(area.getIdInVocabulary());
791 789
        }
792 790
        if (area.getLevel() == null){
......
805 803
        String areaString = null;
806 804
        if (representation != null){
807 805
            areaString = representation.getLabel();
808
            if (StringUtils.isBlank(areaString)){
806
            if (isBlank(areaString)){
809 807
                areaString = representation.getAbbreviatedLabel();
810 808
            }
811
            if (StringUtils.isBlank(areaString)){
809
            if (isBlank(areaString)){
812 810
                areaString = representation.getText();
813 811
            }
814 812
        }
815
        if (StringUtils.isBlank(areaString)){
813
        if (isBlank(areaString)){
816 814
            areaString = definedTerm == null ? null : definedTerm.getTitleCache();
817 815
        }
818
        if (StringUtils.isBlank(areaString)){
816
        if (isBlank(areaString)){
819 817
            areaString = "no title";
820 818
        }
821 819
        return areaString;

Also available in: Unified diff