Merge branch 'release/5.6.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / vocabulary / AbstractTermBaseDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
index 03fd75d6d1010b546ffe3e8c113b3352d892e15e..4cf0c6f825f78a8f28bd3b350cd17a41529e765f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
@@ -10,9 +10,10 @@ package eu.etaxonomy.taxeditor.ui.section.vocabulary;
 \r
 import org.eclipse.swt.widgets.Button;\r
 \r
-import eu.etaxonomy.cdm.model.common.Representation;\r
-import eu.etaxonomy.cdm.model.common.TermBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.term.Representation;\r
+import eu.etaxonomy.cdm.model.term.TermBase;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 import eu.etaxonomy.taxeditor.editor.definedterm.TermBasePropertyTester;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;\r
@@ -59,9 +60,13 @@ public abstract class AbstractTermBaseDetailElement<T extends TermBase> extends
         else if (eventSource == element_Representation) {\r
             Representation selectedRepresentation = element_Representation.getSelectedRepresentation();\r
             if(selectedRepresentation!=null){\r
-                getEntity().setLabel(selectedRepresentation.getLabel(),  selectedRepresentation.getLanguage());\r
-                getEntity().getRepresentation(selectedRepresentation.getLanguage()).setAbbreviatedLabel(selectedRepresentation.getAbbreviatedLabel());\r
-                getEntity().getRepresentation(selectedRepresentation.getLanguage()).setText(selectedRepresentation.getDescription());\r
+                Language representationLanguage = selectedRepresentation.getLanguage();\r
+                if(representationLanguage==null){\r
+                    representationLanguage = Language.getDefaultLanguage();\r
+                }\r
+                getEntity().setLabel(selectedRepresentation.getLabel(),  representationLanguage);\r
+                getEntity().getRepresentation(representationLanguage).setAbbreviatedLabel(selectedRepresentation.getAbbreviatedLabel());\r
+                getEntity().getRepresentation(representationLanguage).setText(selectedRepresentation.getDescription());\r
             }\r
             getEntity().setTitleCache(null);\r
         }\r