X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/b9a0d3009c2413dc3114f643f0f27311ce1123e3..3ff018d47f65796db7767ff90eeb15a66779a22a:/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java?ds=sidebyside

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java
index a194b8fb9..23e5c6666 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java
@@ -29,6 +29,7 @@ public class TaxonRelationshipTypeInverseContainer extends DefinedTermBase<Defin
 	private boolean inverse;
 	private TaxonRelationshipType type;
 	
+	
 	/**
 	 * 
 	 * @param sourceTaxon
@@ -73,11 +74,31 @@ public class TaxonRelationshipTypeInverseContainer extends DefinedTermBase<Defin
 		return inverse;
 	}
 
+	/**
+	 * returns the representation for the given language, when there is no representation for this language available, the english version is returned.
+	 * @param language
+	 * @return representation
+	 * 
+	 */
 	public Representation getRepresentation(Language language){
-		return inverse ? type.getInverseRepresentation(language) : type.getRepresentation(language);
+		Representation result;
+		result = inverse ? type.getInverseRepresentation(language) : type.getRepresentation(language);
+		if (result == null){
+			result = inverse ? 
+					type.getInverseRepresentation(Language.getLanguageFromUuid(Language.uuidEnglish)) : 
+						type.getRepresentation(Language.getLanguageFromUuid(Language.uuidEnglish));
+		}
+		return result;
 	}
 	
+	
+	/**
+	 * returns the label of the TaxonRelationshipType for a given language, if the representation of the language is not available the english representation is returned.
+	 * @param language
+	 * @return label
+	 */
 	public String getLabel(Language language){
+		
 		return getRepresentation(language).getLabel();
 	}
 	
@@ -86,7 +107,7 @@ public class TaxonRelationshipTypeInverseContainer extends DefinedTermBase<Defin
 	}
 	
 	public String getAbbreviatedLabel(){
-		return getRepresentation(Language.ENGLISH()).getAbbreviatedLabel();
+		return getRepresentation(Language.getLanguageFromUuid(Language.uuidEnglish)).getAbbreviatedLabel();
 	}
 	
 	public void setInverse(boolean inverse) {