merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / occurrence / NamedAreaDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/NamedAreaDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/NamedAreaDetailElement.java
index 661d6c63069b7ebf1400d34591d066b2ea921db3..021e68273a1e4a55b9d9ee22fb117bed846cbe8f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/NamedAreaDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/NamedAreaDetailElement.java
@@ -17,7 +17,7 @@ import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
-import eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 
 /**
  * <p>
@@ -31,7 +31,7 @@ import eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement;
 public class NamedAreaDetailElement extends
                AbstractEntityCollectionElement<NamedArea> {
 
-       private NamedAreaSelectionElement selection_namedArea;
+       private EntitySelectionElement<NamedArea> selection_namedArea;
 
        /**
         * <p>
@@ -79,9 +79,10 @@ public class NamedAreaDetailElement extends
         */
        /** {@inheritDoc} */
        @Override
-       public void createControls(ICdmFormElement element, int style) {
-               selection_namedArea = formFactory.createNamedAreaSelectionElement(
-                               element, getConversationHolder(), "Area", null, style);
+       public void createControls(ICdmFormElement formElement, int style) {
+               selection_namedArea = formFactory.createSelectionElement(NamedArea.class, getConversationHolder(),
+                               formElement, "Area",
+                               null, EntitySelectionElement.NOTHING, style);
        }
 
        /*