Fix details editing for TermEditor

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 747f53041caaa1789e4a8db1b63578815e4c03e1..03fd75d6d1010b546ffe3e8c113b3352d892e15e 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,6 +10,7 @@ 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.taxeditor.editor.definedterm.TermBasePropertyTester;\r
@@ -27,21 +28,11 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
  */\r
 public abstract class AbstractTermBaseDetailElement<T extends TermBase> extends AbstractCdmDetailElement<T> {\r
 \r
-    //protected TextWithLabelElement text_label;\r
-       //protected TextWithLabelElement text_description;\r
        protected UriWithLabelElement uri_uri;\r
-       //protected TextWithLabelElement text_abbreviatedLabel;\r
-       //protected TermComboElement<Language> combo_language;\r
-       //private TermBase term;\r
-       //protected Representation representation;\r
        protected RepresentationElement element_Representation;\r
        private Button button;\r
 \r
 \r
-       /**\r
-        * @param formFactory\r
-        * @param formElement\r
-        */\r
        public AbstractTermBaseDetailElement(CdmFormFactory formFactory,\r
                        ICdmFormElement formElement) {\r
                super(formFactory, formElement);\r
@@ -50,25 +41,32 @@ public abstract class AbstractTermBaseDetailElement<T extends TermBase> extends
        @Override\r
        protected void createControls(ICdmFormElement formElement,\r
                        T entity, int style) {\r
-\r
                element_Representation = formFactory.createTranslatableRepresentationElement(formElement,  getEntity().getPreferredRepresentation(CdmStore.getDefaultLanguage()),getEntity(), 100, style, true);\r
-\r
                uri_uri = formFactory.createUriWithLabelElement(formElement, "URI", getEntity().getUri(), style);\r
-\r
        }\r
 \r
-\r
-\r
     @Override\r
        public void setEntity(T entity) {\r
                super.setEntity(entity);\r
                setEnabled(TermBasePropertyTester.isModifiable(entity));\r
        }\r
 \r
-\r
+    @Override\r
+    public void handleEvent(Object eventSource) {\r
+        if (eventSource == uri_uri) {\r
+            getEntity().setUri(uri_uri.parseText());\r
+        }\r
+        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
+            }\r
+            getEntity().setTitleCache(null);\r
+        }\r
+    }\r
 \r
        public abstract TermVocabulary getVocabulary();\r
 \r
-\r
-\r
 }\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
index d51a443771d556000a854ae24163ee6ada123be1..909d259890f9f582ab88529345b693e70ddc3d02 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
@@ -49,6 +49,7 @@ public class DefinedTermDetailElement<T extends DefinedTermBase> extends Abstrac
         */\r
        @Override\r
        public void handleEvent(Object eventSource) {\r
+           super.handleEvent(eventSource);\r
                //handleRepresentation(eventSource);\r
                if(eventSource==textIdInVocabulary){\r
                        if (StringUtils.isBlank(textIdInVocabulary.getText())){\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java
index e626ed1522d64dfee92e2900bd5355a359356b4e..1930cd332c2241acf9268ac2955b66792ed6ce6c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java
@@ -8,7 +8,6 @@
 */\r
 package eu.etaxonomy.taxeditor.ui.section.vocabulary;\r
 \r
-import eu.etaxonomy.cdm.model.common.Representation;\r
 import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;\r
@@ -56,20 +55,8 @@ public class NamedAreaDetailElement extends DefinedTermDetailElement<NamedArea>
         */\r
        @Override\r
        public void handleEvent(Object eventSource) {\r
-\r
-               if (eventSource == textIdInVocabulary){\r
-                       getEntity().setIdInVocabulary(textIdInVocabulary.getText());\r
-               } 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
-                       }\r
-                       getEntity().setTitleCache(null);\r
-               } else if (eventSource == uri_uri) {\r
-                       getEntity().setUri(uri_uri.parseText());\r
-               } else if (eventSource == timePeriod_validPeriod) {\r
+        super.handleEvent(eventSource);\r
+               if (eventSource == timePeriod_validPeriod) {\r
                        getEntity().setValidPeriod(timePeriod_validPeriod.getTimePeriod());\r
                } else if (eventSource == combo_namedAreaType) {\r
                        getEntity().setType(combo_namedAreaType.getSelection());\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java
index 1be3c8e5d486e2b2798351209345d7758c5271e6..7a43b3f828b7d84b384c849bc2b652016d098a9c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java
@@ -21,18 +21,11 @@ import eu.etaxonomy.taxeditor.ui.element.UriWithLabelElement;
 public class TermVocabularyDetailElement extends AbstractTermBaseDetailElement<TermVocabulary> {\r
 \r
        private UriWithLabelElement uri_uriTermSource;\r
-       /**\r
-        * @param formFactory\r
-        * @param formElement\r
-        */\r
        public TermVocabularyDetailElement(CdmFormFactory formFactory,\r
                        ICdmFormElement formElement) {\r
                super(formFactory, formElement);\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#createControls(eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement, java.lang.Object, int)\r
-        */\r
        @Override\r
        protected void createControls(ICdmFormElement formElement,\r
                        TermVocabulary entity, int style) {\r
@@ -41,24 +34,15 @@ public class TermVocabularyDetailElement extends AbstractTermBaseDetailElement<T
                uri_uriTermSource = formFactory.createUriWithLabelElement(formElement, "Term Source URI", getEntity().getTermSourceUri(), style);\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#handleEvent(java.lang.Object)\r
-        */\r
        @Override\r
        public void handleEvent(Object eventSource) {\r
+           super.handleEvent(eventSource);\r
 \r
-               //handleRepresentation(eventSource);\r
-\r
-               if (eventSource == uri_uri) {\r
-                       getEntity().setUri(uri_uri.parseText());\r
-               } else if (eventSource == uri_uriTermSource) {\r
+               if (eventSource == uri_uriTermSource) {\r
                        getEntity().setTermSourceUri(uri_uriTermSource.parseText());\r
                }\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.taxeditor.ui.section.vocabulary.AbstractTermBaseDetailElement#getVocabularyMarkers()\r
-        */\r
        @Override\r
        public TermVocabulary getVocabulary() {\r
                return getEntity();\r