Merge branch 'develop' into termSearch

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / model / TaxonRelationshipTypeInverseContainer.java

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 a194b8fb92047a5ec2b80aac7e0c6a1bb3c40c69..23e5c66665b098d825c6072de785d0c79b2bb5f2 100644 (file)
--- 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) {