.

[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 5c99878508364d3026a6f07e963fb5d9fef3bee9..e0be8cb4680eea5d5f03658610ba42fa2384e06d 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
@@ -33,13 +33,13 @@ import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.reference.Generic;\r
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
 import eu.etaxonomy.taxeditor.propertysheet.AnnotationsPropertyDescriptor;\r
 import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;\r
 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
-import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -143,8 +143,7 @@ public class NonViralNamePropertySource implements ICdmBasePropertySource {
                \r
                // Get terms from nom status vocabulary\r
                List<NomenclaturalStatusType> nomStatusTypesList = new ArrayList<NomenclaturalStatusType>();\r
-               TermVocabulary<NomenclaturalStatusType> statusVocab = \r
-                               CdmStore.getDefault().getNomStatus();\r
+                Set<NomenclaturalStatusType> statusVocab = CdmStore.getNomenclaturalStatusTypes();\r
                \r
                // If there is no status vocabulary, init type and status w empty arrays and return\r
                if (statusVocab == null) {\r
@@ -153,7 +152,7 @@ public class NonViralNamePropertySource implements ICdmBasePropertySource {
                        return;\r
                }\r
                \r
-               nomStatusTypesList.addAll(statusVocab.getTerms());\r
+               nomStatusTypesList.addAll(statusVocab);\r
                \r
                // Populate nom status type menu labels \r
                List<String> nomStatusTypesMenuList = new ArrayList<String>();\r