Project

General

Profile

« Previous | Next » 

Revision 5f031b4f

Added by Patrick Plitzner over 7 years ago

ref #5458 Error handling for abbreviated labels

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionTablePresenter.java
63 63 
	    Set<DefinedTermBase> chosenTerms = getChosenTerms();
64 64 
	    NamedArea namedArea = null;
65 65 
	    for(DefinedTermBase term:chosenTerms){
66 
	        if(term.getTitleCache().equalsIgnoreCase(distributionAreaString)){
66 
	        if(term.getRepresentation(Language.DEFAULT()).getAbbreviatedLabel().equalsIgnoreCase(distributionAreaString)){
67 67 
	            namedArea = (NamedArea) term;
68 68 
	            break;
69 69 
	        }
70 
	        if(term.getTitleCache().equalsIgnoreCase(distributionAreaString)){
71 
	        	namedArea = (NamedArea) term;
72 
	        	break;
73 
	        }
70 74 
	    }
71 75 
	    List<Distribution> distributions = getDistributions(taxon);
72 76 
	    Distribution distribution = null;
73 77 
	    for(Distribution dist : distributions){
74 
	        if(dist.getArea().equals(namedArea)){
78 
	        if(dist.getArea()!=null && dist.getArea().equals(namedArea)){
75 79 
	            distribution = dist;
76 80 
	            break;
77 81 
	        }
......
139 143 
        Set<NamedArea> selectedAreas = getNamedAreas();
140 144 
    	List<String> namedAreaTitles = new ArrayList<>();
141 145 
    	for (NamedArea namedArea : selectedAreas) {
142 
    	    if(abbreviated){
143 
    	        namedAreaTitles.add(namedArea.getRepresentation(Language.DEFAULT()).getAbbreviatedLabel());
146 
    		String title = null;
147 
    	    Representation representation = namedArea.getRepresentation(Language.DEFAULT());
148 
    	    if(representation!=null){
149 
    	    	if(abbreviated){
150 
    	    		title = representation.getAbbreviatedLabel();
151 
    	    	}
152 
    	    	else{
153 
    	    		title = representation.getLabel();
154 
    	    	}
144 155 
    	    }
145 
    	    else{
146 
    	        namedAreaTitles.add(namedArea.getRepresentation(Language.DEFAULT()).getLabel());
156 
    	    if(title==null){
157 
    	    	title = namedArea.getTitleCache();
147 158 
    	    }
159 
    	    namedAreaTitles.add(title);
148 160 
        }
149 161 
    	return namedAreaTitles;
150 162 
    }

Also available in: Unified diff