Merging latest changes from dev branch

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / element / MultilanguageTextElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
index ab24fc43c75080288ec89e662a5ac9eb31c47ac4..b7ab20c35476cd8b3a141456596b19a3df32c544 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
@@ -204,10 +204,9 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                        }
                        if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                                combo_language.setTerms(getLanguages());
+                               button.setEnabled(false);
                        }
                        updateControls();
-               }else{
-                       button.setEnabled(false);
                }
        }
 
@@ -223,10 +222,8 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                element_languageString.setLanguageString(preferredLanguageString);
                if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                        combo_language.setSelection(preferredLanguageString.getLanguage());
-               }
-               
-               button.setEnabled(true);
-               
+                       button.setEnabled(true);
+               }               
        }
 
        /**