Project

General

Profile

« Previous | Next » 

Revision b663b23c

Added by Andreas Müller over 1 year ago

adapt to new DescriptionElementFormatter package

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
13 13

  
14 14
import org.apache.commons.lang3.StringUtils;
15 15

  
16
import eu.etaxonomy.cdm.format.DescriptionElementFormatter;
17 16
import eu.etaxonomy.cdm.format.common.ExtendedTimePeriodFormatter;
18 17
import eu.etaxonomy.cdm.format.description.CategoricalDataFormatter;
18
import eu.etaxonomy.cdm.format.description.DescriptionElementFormatter;
19 19
import eu.etaxonomy.cdm.format.description.QuantitativeDataFormatter;
20 20
import eu.etaxonomy.cdm.model.common.ExtendedTimePeriod;
21 21
import eu.etaxonomy.cdm.model.common.Language;
......
129 129
	public static String getFeatureNodeContainerText(FeatureNodeContainer element) {
130 130
		String result = null;
131 131
		if(element.getFeatureNode() != null && element.getFeatureNode().getTerm() != null){
132
			
132

  
133 133
			result = element.getFeatureNode().getTerm().getPreferredRepresentation(CdmStore.getDefaultLanguage()).getLabel();
134
			
134

  
135 135
		} else{
136 136
			return "No label set";
137 137
		}
......
231 231
		String areaLabel = null;
232 232
		String languageLabel = null;
233 233
		if (area != null){
234
			areaLabel = area.getPreferredRepresentation(CdmStore.getDefaultLanguage()).getLabel();			
235
		} 
236
		if (language != null){			
234
			areaLabel = area.getPreferredRepresentation(CdmStore.getDefaultLanguage()).getLabel();
235
		}
236
		if (language != null){
237 237
			languageLabel = language.getPreferredRepresentation(CdmStore.getDefaultLanguage()).getLabel();
238 238
		}
239 239
		if (areaLabel != null || languageLabel != null){
......
249 249
			}
250 250
			name +=  ")";
251 251
		}
252
		
253
		
252

  
253

  
254 254
		return name;
255 255
	}
256 256

  

Also available in: Unified diff