merge master into develop

[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 021e68273a1e4a55b9d9ee22fb117bed846cbe8f..68f8169cedc7ca5cb84eaf9cca7a26ef3b8a27fc 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
@@ -1,9 +1,8 @@
-// $Id$
 /**
  * Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy 
+ * European Distributed Institute of Taxonomy
  * http://www.e-taxonomy.eu
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
@@ -23,7 +22,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * <p>
  * CollectingAreasDetailElement class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created Oct 14, 2010
  * @version 1.0
@@ -37,7 +36,7 @@ public class NamedAreaDetailElement extends
         * <p>
         * Constructor for CollectingAreasDetailElement.
         * </p>
-        * 
+        *
         * @param formFactory
         *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
         *            object.
@@ -59,7 +58,7 @@ public class NamedAreaDetailElement extends
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#setEntity
         * (java.lang.Object)
@@ -72,7 +71,7 @@ public class NamedAreaDetailElement extends
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#createControls
         * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, int)
@@ -80,14 +79,14 @@ public class NamedAreaDetailElement extends
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement formElement, int style) {
-               selection_namedArea = formFactory.createSelectionElement(NamedArea.class, getConversationHolder(),
+               selection_namedArea = formFactory.createSelectionElement(NamedArea.class, //getConversationHolder(),
                                formElement, "Area",
                                null, EntitySelectionElement.NOTHING, style);
        }
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent
         * (java.lang.Object)