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

[taxeditor.git] / taxeditor-editor / src / main / java / eu / etaxonomy / taxeditor / propertysheet / name / NonViralNamePropertySource.java

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