Merge branch 'develop' into LibrAlign

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / preference / menu / MarkerTypeMenuPreferences.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java
index 406ae6162621c21459ccfe5df1b5b40a568d89f7..d226f610f177d000e777c3136aa50420c0fec7e3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2007 EDIT
 * European Distributed Institute of Taxonomy 
@@ -10,10 +9,7 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import java.util.List;
-
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.taxeditor.store.TermStore;
 
 /**
  * <p>MarkerTypeMenuPreferences class.</p>
@@ -41,12 +37,4 @@ public class MarkerTypeMenuPreferences extends AbstractMenuPreferences<MarkerTyp
        protected Class<MarkerType> getTermClass() {
                return MarkerType.class;
        }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<MarkerType> getTerms() {
-               return TermStore.getNonTechnicalMarkerTypes();
-       }
 }