From d7deac682d33fd6d1853dfcaf58ffe571f3cc288 Mon Sep 17 00:00:00 2001
From: "n.hoffmann" <n.hoffmann@localhost>
Date: Wed, 10 Jun 2009 15:40:58 +0000
Subject: [PATCH] fixes #780

---
 .../taxeditor/preference/PreferencesUtil.java    | 16 ++++++----------
 .../preference/RankMenuPreferences.java          |  3 ++-
 .../eu/etaxonomy/taxeditor/store/CdmStore.java   | 12 ++++++------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index d6cb75706..593530679 100644
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -189,18 +189,14 @@ public class PreferencesUtil {
 		if (preferredRankList == null) {
 			
 			setPreferredRanks(new ArrayList<Rank>());	
-						
-			SortedSet<Rank> ranks = CdmStore.getRanks();
-			if (ranks != null) {
 			
-				for (Rank rank : CdmStore.getRanks()) {
-					
-					// If the feature is set to show, add it to preferredFeatureSet
-					if (PreferencesUtil.getRankPreference(rank)) {
-						addPreferredRank(rank);
-					}
+			for (Rank rank : CdmStore.getDefault().getRanksInternal()) {
+				
+				// If the feature is set to show, add it to preferredFeatureSet
+				if (PreferencesUtil.getRankPreference(rank)) {
+					addPreferredRank(rank);
 				}
-			} // else { TODO: error message
+			}
 			
 			Collections.sort(preferredRankList, new Comparator<Rank>(){
 
diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/RankMenuPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/RankMenuPreferences.java
index 72cbe4378..3796b0feb 100644
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/RankMenuPreferences.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/RankMenuPreferences.java
@@ -9,6 +9,7 @@
 package eu.etaxonomy.taxeditor.preference;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.SortedSet;
 
@@ -60,7 +61,7 @@ public class RankMenuPreferences extends PreferencePage implements
 		container.setLayout(gridLayout);
 
 		CdmStore.getDefault();
-		SortedSet<Rank> ranks = CdmStore.getRanks();
+		List<Rank> ranks = CdmStore.getPreferredRanks();
 		
 		for (Rank rank : ranks) {
 						
diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index e75cb9125..357d0891c 100644
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -50,6 +50,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 /**
  * This implementation of ICdmDataRepository depends on hibernate sessions to store the data correctly 
@@ -166,16 +167,15 @@ public class CdmStore{
 		return getDefault().getNomenclaturalStatusTypesInternal().getTerms();
 	}
 	
-	private SortedSet<Rank> getRanksInternal() {
-		OrderedTermVocabulary rankVocabulary = HibernateProxyHelper.deproxy(applicationController.getTermService().getVocabulary(VocabularyEnum.Rank), OrderedTermVocabulary.class);
-		return rankVocabulary.getOrderedTerms(null);
+	public OrderedTermVocabulary<Rank> getRanksInternal(){
+		TermVocabulary<Rank> vocabulary = applicationController.getTermService().getVocabulary(VocabularyEnum.Rank);
+		return HibernateProxyHelper.deproxy(vocabulary, OrderedTermVocabulary.class);
 	}
 	
-	public static SortedSet<Rank> getRanks() {
-		return getDefault().getRanksInternal();
+	public static List<Rank> getPreferredRanks(){
+		return PreferencesUtil.getPreferredRanks();
 	}
 
-
 	public List<Taxon> getRootTaxa() {
 		boolean onlyWithChildren = false;
 		boolean withMisapplications = true;
-- 
2.34.1