Merge branch 'release/4.1.0'

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

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 7878c67965ec20380da982e21f458e642923a5cc..90e1584048a03f04fd3e0bce41303e777f5f9de7 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
@@ -1,18 +1,21 @@
 // $Id$\r
 /**\r
 * Copyright (C) 2009 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 package eu.etaxonomy.taxeditor.ui.section.vocabulary;\r
 \r
+import org.apache.commons.lang.StringUtils;\r
+\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
-import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;\r
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;\r
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;\r
+import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;\r
 \r
 /**\r
  * @author l.morris\r
@@ -20,7 +23,12 @@ import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
  *\r
  */\r
 public class DefinedTermDetailElement<T extends DefinedTermBase> extends AbstractTermBaseDetailElement<T> {\r
-       \r
+\r
+    protected TextWithLabelElement textIdInVocabulary;\r
+\r
+    protected TextWithLabelElement textSymbol;\r
+\r
+\r
        /**\r
         * @param formFactory\r
         * @param formElement\r
@@ -30,12 +38,35 @@ public class DefinedTermDetailElement<T extends DefinedTermBase> extends Abstrac
                super(formFactory, formElement);\r
        }\r
 \r
+       @Override\r
+    protected void createControls(ICdmFormElement formElement, T entity, int style) {\r
+           super.createControls(formElement, entity, style);\r
+           textIdInVocabulary = formFactory.createTextWithLabelElement(formElement, "ID in vocabulary", entity.getIdInVocabulary(), style);\r
+           textSymbol = formFactory.createTextWithLabelElement(formElement, "Symbol", entity.getSymbol(), 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
                handleRepresentation(eventSource);\r
+               if(eventSource==textIdInVocabulary){\r
+                       if (StringUtils.isBlank(textIdInVocabulary.getText())){\r
+                               getEntity().setIdInVocabulary(null);\r
+                       }else{\r
+                               getEntity().setIdInVocabulary(textIdInVocabulary.getText());\r
+                       }\r
+\r
+               }\r
+               if(eventSource==textSymbol){\r
+            if (StringUtils.isBlank(textSymbol.getText())){\r
+                getEntity().setSymbol(null);\r
+            }else{\r
+                getEntity().setSymbol(textIdInVocabulary.getText());\r
+            }\r
+\r
+        }\r
        }\r
 \r
        /* (non-Javadoc)\r