Merge branch 'release/3.7.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / supplemental / MarkerSection.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerSection.java
index ffc3f10a2b37db0062f764bb674006014e2962ba..9d7dba4562032edc56a5dec3cf63a03b5403de7d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerSection.java
@@ -1,6 +1,3 @@
-/**
- * 
- */
 package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import java.util.Collection;
@@ -8,9 +5,9 @@ import java.util.Collection;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.Marker;
-import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AbstractUnboundEntityCollectionSection;
 
 /**
  * <p>MarkerSection class.</p>
@@ -18,7 +15,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
  * @author nho
  * @version $Id: $
  */
-public class MarkerSection extends AbstractEntityCollectionSection<AnnotatableEntity, Marker> {
+public class MarkerSection extends AbstractUnboundEntityCollectionSection<AnnotatableEntity, Marker> {
 
        /**
         * <p>Constructor for MarkerSection.</p>
@@ -38,12 +35,6 @@ public class MarkerSection extends AbstractEntityCollectionSection<AnnotatableEn
                return Marker.NewInstance();
        }
 
-       /** {@inheritDoc} */
-       @Override
-       public Collection<Marker> getCollection(AnnotatableEntity entity) {
-               return entity.getMarkers();
-       }
-
        /** {@inheritDoc} */
        @Override
        public String getEmptyString() {
@@ -68,4 +59,9 @@ public class MarkerSection extends AbstractEntityCollectionSection<AnnotatableEn
                getEntity().removeMarker(element);
        }
 
+    @Override
+    protected Collection<Marker> getEntityCollection(AnnotatableEntity entity) {
+        return entity.getMarkers();
+    }
+
 }