Committing changes to definedtermeditor after merge from branch

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/RankMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/RankMenuPreferences.java
index 78a40b855648a5e44b23f21a22aac194e838fe19..9c16f51bc247eae4ffd2951c40f0dccf067db178 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/RankMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/RankMenuPreferences.java
@@ -8,8 +8,6 @@
 */
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import java.util.List;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -19,7 +17,6 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
 
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.store.TermStore;
 
 /**
  * Allows the user to choose which <code>Rank</code>s to display in the
@@ -52,8 +49,6 @@ public class RankMenuPreferences extends AbstractMenuPreferences<Rank> implement
        @Override
        protected void createAdditionalContent(Composite container) {
                
-               // TODO create option to sort ranks either alphabetically or hierarchically (asc- or descending)
-               
                final Button checkbox = new Button(container, SWT.CHECK);
                checkbox.setText("Sort ranks hierarchically (default is alphabetically)");
                
@@ -66,7 +61,7 @@ public class RankMenuPreferences extends AbstractMenuPreferences<Rank> implement
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                PreferencesUtil.setSortRanksHierarchichally(checkbox.getSelection());
-                               refresh(TermStore.getRanks());
+                               refresh(getTerms());
                        }
                });
                
@@ -81,12 +76,4 @@ public class RankMenuPreferences extends AbstractMenuPreferences<Rank> implement
                return Rank.class;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<Rank> getTerms() {
-               return TermStore.getRanks();
-       }
-
 }