Handle new NamedArea vocabulary as OrderedVocabulary

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
index eb70a19aeb1196cca283b24db3b8e773d7ddc66e..ae5035a0154ce5916b06d31a42875911d390a332 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
@@ -35,6 +35,7 @@ import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
+import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.Representation;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
@@ -221,7 +222,8 @@ public abstract class CdmImportBase<CONFIG extends IImportConfigurator, STATE ex
                        if (namedArea == null){\r
                                namedArea = NamedArea.NewInstance(text, label, labelAbbrev);\r
                                if (voc == null){\r
-                                       voc = getVocabulary(uuidUserDefinedNamedAreaVocabulary, "User defined vocabulary for named areas", "User Defined Named Areas", null);\r
+                                       boolean isOrdered = true;\r
+                                       voc = getVocabulary(uuidUserDefinedNamedAreaVocabulary, "User defined vocabulary for named areas", "User Defined Named Areas", null, null, isOrdered);\r
                                }\r
                                voc.addTerm(namedArea);\r
                                namedArea.setType(areaType);\r
@@ -332,10 +334,14 @@ public abstract class CdmImportBase<CONFIG extends IImportConfigurator, STATE ex
         * @return\r
         * \r
         */\r
-       protected TermVocabulary getVocabulary(UUID uuid, String text, String label, String abbrev) {\r
+       protected TermVocabulary getVocabulary(UUID uuid, String text, String label, String abbrev, String termSourceUri, boolean isOrdered) {\r
                TermVocabulary voc = getVocabularyService().find(uuid);\r
                if (voc == null){\r
-                       voc = TermVocabulary.NewInstance(text, label, abbrev, null);\r
+                       if (isOrdered){\r
+                               voc = OrderedTermVocabulary.NewInstance(text, label, abbrev, termSourceUri);\r
+                       }else{\r
+                               voc = TermVocabulary.NewInstance(text, label, abbrev, termSourceUri);\r
+                       }\r
                        voc.setUuid(uuid);\r
                        getVocabularyService().save(voc);\r
                }\r