Changed calls to retrieve term vocabularies to preferred term mechanism where applicable.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CommonNameComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CommonNameComposite.java
index b774e764e3db597cdc6b054aff70a22ec896fe65..1310c5fd02c5733c537514ed50418dc4676a058d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CommonNameComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CommonNameComposite.java
@@ -15,7 +15,6 @@ import org.eclipse.ui.views.properties.IPropertySource;
 \r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
-import eu.etaxonomy.taxeditor.model.LanguageUtil;\r
 import eu.etaxonomy.taxeditor.propertysheet.description.CommonNamePropertySource;\r
 \r
 /**\r
@@ -44,7 +43,7 @@ public class CommonNameComposite extends DescriptionElementComposite {
                \r
                Language language = ((CommonTaxonName) element).getLanguage();\r
                if (language != null) {\r
-                       setNonEditableInfo(LanguageUtil.getDescription(language));\r
+                       setNonEditableInfo(language.getDescription());\r
                } else {\r
                        setNonEditableInfo("No language");\r
                }               \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionDialog.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionDialog.java
index f7c1a8997cbf1c1c9afacbf6e8f4a4a86b32f77b..8073bc06d087674501fba1ff0095068e54186fcd 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionDialog.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionDialog.java
@@ -35,6 +35,7 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
 import eu.etaxonomy.taxeditor.editor.reference.ReferenceSelectComposite;\r
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 \r
 /**\r
@@ -357,18 +358,8 @@ public class DistributionDialog extends Dialog {
        /**\r
         * @return\r
         */\r
-       private List<PresenceAbsenceTermBase<?>> getPresenceAbsenceTerms() {\r
-               if (presenceAbsenceTerms == null) {\r
-                       presenceAbsenceTerms = new ArrayList<PresenceAbsenceTermBase<?>>();\r
-                       \r
-                       for (PresenceAbsenceTermBase<?> term : locationService.getPresenceTermVocabulary().getTermsOrderedByLabels(CdmStore.getDefaultLanguage())) {\r
-                               presenceAbsenceTerms.add(term);\r
-                       }\r
-                       for (PresenceAbsenceTermBase<?> term : locationService.getAbsenceTermVocabulary().getTermsOrderedByLabels(CdmStore.getDefaultLanguage())) {\r
-                               presenceAbsenceTerms.add(term);\r
-                       }\r
-               }\r
-               return presenceAbsenceTerms;\r
+       private List<PresenceAbsenceTermBase<PresenceAbsenceTermBase<?>>> getPresenceAbsenceTerms() {\r
+               return PreferencesUtil.getPreferredPresenceAbsenceTerms();\r
        }\r
 \r
        /**\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/LanguageDialog.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/LanguageDialog.java
index 6c7328ee38dc52d982f2dce4713a6da879ec70f0..6e2513e482af6b865c6ba1b00454276777cdfa9a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/LanguageDialog.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/LanguageDialog.java
@@ -31,8 +31,7 @@ import org.eclipse.swt.widgets.Shell;
 \r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
-import eu.etaxonomy.taxeditor.model.LanguageUtil;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
+import eu.etaxonomy.taxeditor.store.VocabularyStore;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -140,9 +139,9 @@ public class LanguageDialog extends InputDialog {
                languages = new ArrayList<Language>();\r
                int i = 0;              \r
                int index = 0;\r
-               for (Language language : CdmStore.getLanguages()) {\r
+               for (Language language : VocabularyStore.getLanguages()) {\r
                                                \r
-                       String description = LanguageUtil.getDescription(language); \r
+                       String description = language.getDescription(); \r
                        if (description == null) {\r
                                logger.warn("No description for " + language + " - not added to language menu");\r
                                continue;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/labels/DefaultLabelStrategy.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/labels/DefaultLabelStrategy.java
index e572aaecfe5aa41e716cb8370e36e081ce712f1d..c347d6499b78d747a919b20a45bbcc5439009733 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/labels/DefaultLabelStrategy.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/labels/DefaultLabelStrategy.java
@@ -10,7 +10,7 @@ import org.eclipse.swt.graphics.Image;
 import eu.etaxonomy.cdm.model.name.NameRelationship;\r
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
 import eu.etaxonomy.taxeditor.model.ImageResources;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
+import eu.etaxonomy.taxeditor.store.VocabularyStore;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -23,7 +23,7 @@ public class DefaultLabelStrategy implements ILabelImageStrategy {
         */\r
        public String getNameRelationTypeLabel(NameRelationshipType type) {\r
                SortedSet<NameRelationshipType> vocab = \r
-                       CdmStore.getDefault().getNameRelationshipTypes();\r
+                       VocabularyStore.getNameRelationshipTypes();\r
        \r
                for (NameRelationshipType type1 : vocab) {\r
                        if (type1.equals(type)) {\r
@@ -39,7 +39,7 @@ public class DefaultLabelStrategy implements ILabelImageStrategy {
        public String getNameRelationTypeInverseLabel(NameRelationshipType type) {\r
                \r
                SortedSet<NameRelationshipType> vocab = \r
-               CdmStore.getDefault().getNameRelationshipTypes();\r
+                       VocabularyStore.getNameRelationshipTypes();\r
 \r
                for (NameRelationshipType type1 : vocab) {\r
                        if (type1.equals(type)) {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/AbstractDynamicConceptRelationMenu.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/AbstractDynamicConceptRelationMenu.java
index fc2bf2441a3e232be549251611c66a1a02073685..d85f918b654d7203afe803e331df8b58f7f88a93 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/AbstractDynamicConceptRelationMenu.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/AbstractDynamicConceptRelationMenu.java
@@ -14,7 +14,7 @@ import org.eclipse.ui.handlers.IHandlerService;
 
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
-import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.VocabularyStore;
 
 /**
  * 
@@ -33,7 +33,7 @@ public abstract class AbstractDynamicConceptRelationMenu extends ContributionIte
        public void fill(Menu menu, int index){
                final IHandlerService handlerService = (IHandlerService) TaxeditorEditorPlugin.getDefault().getWorkbench().getService(IHandlerService.class);
        
-               for(final TaxonRelationshipType type : CdmStore.getDefault().getConceptRelationshipTypes()){
+               for(final TaxonRelationshipType type : VocabularyStore.getConceptRelationshipTypes()){
                        MenuItem menuItem = new MenuItem(menu, -1);
                        menuItem.setText(type.getLabel());
                        menuItem.setData(type);

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/PropertySheetUtil.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/PropertySheetUtil.java
index 09584c155341b8db8e0ca96af48a63ec3d08f44f..54469dddf8d4c5ef4e037805d460d98333551112 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/PropertySheetUtil.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/PropertySheetUtil.java
@@ -9,8 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r
-import java.util.SortedSet;\r
-\r
 import org.apache.log4j.Logger;\r
 import org.eclipse.swt.graphics.Color;\r
 import org.eclipse.swt.widgets.Tree;\r
@@ -23,9 +21,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.views.properties.PropertySheet;\r
 import org.eclipse.ui.views.properties.PropertySheetPage;\r
 \r
-import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
 \r
 /**\r
  * @author n.hoffmann\r
@@ -193,24 +189,6 @@ public class PropertySheetUtil {
                }\r
        }\r
        \r
-       /**\r
-        * Get the name out of the session's name relations vocabulary, not directly\r
-        * from the object. \r
-        * \r
-        * @param type\r
-        * @return\r
-        */\r
-       public static String getNameRelationLabelType(NameRelationshipType type) {\r
-               SortedSet<NameRelationshipType> vocab = \r
-                               CdmStore.getDefault().getNameRelationshipTypes();\r
-               for (NameRelationshipType type1 : vocab) {\r
-                       if (type1.equals(type)) {\r
-                               return type1.getLabel();\r
-                       }\r
-               }\r
-               return "";\r
-       }\r
-       \r
        /***************************************************************************\r
         * PROPERTY SHEET\r
         **************************************************************************/\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/CommonNamePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/CommonNamePropertySource.java
index 08e81f60a4db829fc2f79dd7525a0f280fca891b..f6340c8f3be98fc82f713397e183f6e838bb21de 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/CommonNamePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/CommonNamePropertySource.java
@@ -10,6 +10,7 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.description;\r
 \r
+import java.util.ArrayList;\r
 import java.util.List;\r
 \r
 import org.apache.log4j.Logger;\r
@@ -17,8 +18,7 @@ import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
 \r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
-import eu.etaxonomy.taxeditor.model.LanguageUtil;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
+import eu.etaxonomy.taxeditor.store.VocabularyStore;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -64,12 +64,12 @@ public class CommonNamePropertySource extends DescriptionElementPropertySource {
         */\r
        private String[] getLanguageStringArray() {\r
                if (languages == null) {\r
-                       languages = CdmStore.getLanguages();\r
+                       languages = new ArrayList<Language>(VocabularyStore.getLanguages());\r
                        \r
                        int i = 0;\r
                        languageStrings = new String[languages.size()];\r
                        for (Language language : languages) {\r
-                               languageStrings[i] = LanguageUtil.getDescription(language);\r
+                               languageStrings[i] = language.getDescription();\r
                                if (language.equals(commonName.getLanguage())) {\r
                                        selectedLanguageIndex = i;\r
                                }       \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
index e0be8cb4680eea5d5f03658610ba42fa2384e06d..a5184b16958c9328cd78c924da8f89b0073c4c54 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
@@ -25,7 +25,6 @@ import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;\r
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
@@ -39,7 +38,6 @@ import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;
 import eu.etaxonomy.taxeditor.propertysheet.MarkersPropertySource;\r
 import eu.etaxonomy.taxeditor.propertysheet.reference.NomenclaturalReferencePropertySource;\r
 import eu.etaxonomy.taxeditor.propertysheet.reference.ReferencePropertySource;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -135,15 +133,14 @@ public class NonViralNamePropertySource implements ICdmBasePropertySource {
        // ***********************************************************\r
        //              NOMENCLATURAL STATUS\r
        // ***********************************************************\r
-//     static TermVocabulary<NomenclaturalStatusType> nomStatusVocabulary = \r
-//                     TaxEditorPlugin.getDefault().getNomStatusVocabulary();\r
+\r
        NomenclaturalStatusType[] nomStatusTypes = null;\r
        String[] P_NOMSTATUS_MENU = null;\r
        private void populateNomStatusTypes() {\r
                \r
                // Get terms from nom status vocabulary\r
                List<NomenclaturalStatusType> nomStatusTypesList = new ArrayList<NomenclaturalStatusType>();\r
-                Set<NomenclaturalStatusType> statusVocab = CdmStore.getNomenclaturalStatusTypes();\r
+               List<NomenclaturalStatusType> statusVocab = PreferencesUtil.getPreferredNomenclaturalStatusTypes();\r
                \r
                // If there is no status vocabulary, init type and status w empty arrays and return\r
                if (statusVocab == null) {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java
index f5ae2891a302d8114cb4dbe312bc2fd89aac5b2e..844fb2cc745c5c35c4d78bcaa57c25c50864372e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java
@@ -37,7 +37,8 @@ import eu.etaxonomy.taxeditor.editor.labels.LabelImageProvider;
 import eu.etaxonomy.taxeditor.editor.name.NameSelectComposite;\r
 import eu.etaxonomy.taxeditor.editor.reference.ReferenceSelectComposite;\r
 import eu.etaxonomy.taxeditor.model.NameUtil;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
+import eu.etaxonomy.taxeditor.store.VocabularyStore;\r
 \r
 /**\r
  * An all-in-one relation wizard page where the user chooses a related name, a\r
@@ -132,7 +133,7 @@ public class ChooseRelationWizardPage extends WizardPage {
                typeCombo = new Combo(container, SWT.BORDER);\r
                typeCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));\r
                for (NameRelationshipType relationType : \r
-                               CdmStore.getDefault().getNameRelationshipTypes()) {\r
+                               PreferencesUtil.getPreferredNameRelationshipTypes()) {\r
                        \r
                        relationTypes.add(relationType);\r
                        String label = labelProvider.getNameRelationTypeLabel(relationType);\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/tabbed/NamePropertySection.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/tabbed/NamePropertySection.java
index 5fed3ff4a803992473f57a25f4c851913d6e4945..b74d93de80094ffa48649186ddbc325c379ebb54 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/tabbed/NamePropertySection.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/tabbed/NamePropertySection.java
@@ -10,6 +10,8 @@
 
 package eu.etaxonomy.taxeditor.propertysheet.tabbed;
 
+import java.util.Properties;
+
 import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -26,6 +28,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.VocabularyStore;
 
 /**
  * @author n.hoffmann
@@ -117,7 +120,7 @@ public class NamePropertySection extends AbstractNamePropertySection {
                nomenclaturalStatusCombo = getWidgetFactory().createCCombo(composite);
                nomenclaturalStatusCombo.setLayoutData(comboLayout);
                
-               for(NomenclaturalStatusType nomenclaturalStatusType : CdmStore.getNomenclaturalStatusTypes()){
+               for(NomenclaturalStatusType nomenclaturalStatusType : PreferencesUtil.getPreferredNomenclaturalStatusTypes()){
                        nomenclaturalStatusCombo.add(nomenclaturalStatusType.getLabel(CdmStore.getDefaultLanguage()));
                }
         

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
index bf6fe55b41fe4b4417e743ffd86e7ede266f7e2e..0d9646d334b7828b52430168a46ea942884083a8 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
@@ -34,6 +34,7 @@ import eu.etaxonomy.cdm.model.occurrence.Specimen;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.taxeditor.editor.reference.ReferenceSelectComposite;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
+import eu.etaxonomy.taxeditor.store.VocabularyStore;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -85,7 +86,7 @@ public class ChooseSpecimenTypeWizardPage extends WizardPage {
                // Create designation type status dropdown \r
                statusCombo = new Combo(container, SWT.BORDER);\r
                statusCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));\r
-               typeStatusArray = new SpecimenTypeDesignationStatus[CdmStore.getDefault().getSpecimenTypeDesignationStatus().size()];\r
+               typeStatusArray = new SpecimenTypeDesignationStatus[VocabularyStore.getSpecimenTypeDesignationStatus().size()];\r
                int i = 0;\r
                int selectedIndex = -1;\r
                \r
@@ -95,8 +96,7 @@ public class ChooseSpecimenTypeWizardPage extends WizardPage {
                                        SpecimenTypeDesignationStatus.class);\r
                }\r
                                        \r
-               for (Object typeStatusObject : \r
-                               CdmStore.getDefault().getSpecimenTypeDesignationStatus()) {                     \r
+               for (Object typeStatusObject : VocabularyStore.getSpecimenTypeDesignationStatus()) {                    \r
                        \r
                        SpecimenTypeDesignationStatus typeStatus = CdmBase.deproxy(typeStatusObject, \r
                                        SpecimenTypeDesignationStatus.class);\r