hide term vocabulary constructors and create factory methods instead

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelFactsImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelFactsImport.java
index 2d2cabb01e3baafdeaf8d731bef7e9aa3d39849b..22f7c01ac814061b067c60afdb60fe97b1f83823 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelFactsImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelFactsImport.java
@@ -85,7 +85,7 @@ public class BerlinModelFactsImport  extends BerlinModelImportBase {
                        return featureVocabulary;\r
                } catch (UnknownCdmTypeException e) {\r
                        logger.error("Feature vocabulary not available. New vocabulary created");\r
-                       return new TermVocabulary<Feature>() ;\r
+                       return TermVocabulary.NewInstance("User Defined Feature Vocabulary", "User Defined Feature Vocabulary", null, null); \r
                }\r
        }\r
        \r

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 358421187fbed949ca852b0764854c30e365ce28..3df048528e037b6d884f14983d395863cdbf175d 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
@@ -335,10 +335,8 @@ public abstract class CdmImportBase<CONFIG extends IImportConfigurator, STATE ex
        protected TermVocabulary getVocabulary(UUID uuid, String text, String label, String abbrev) {\r
                TermVocabulary voc = getVocabularyService().find(uuid);\r
                if (voc == null){\r
-                       voc = new TermVocabulary();\r
+                       voc = TermVocabulary.NewInstance(text, label, abbrev, null);\r
                        voc.setUuid(uuid);\r
-                       Representation representation = Representation.NewInstance(text, label, abbrev, Language.DEFAULT());\r
-                       voc.addRepresentation(representation);\r
                        getVocabularyService().save(voc);\r
                }\r
                return voc;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDDataSetImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDDataSetImport.java
index 854329c99d827906189b6b39905dfc29ceb738f7..03eccdca82c28e0b4f6228e97015286dc1a1e020 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDDataSetImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDDataSetImport.java
@@ -984,7 +984,7 @@ public class SDDDataSetImport extends CdmImportBase<SDDImportConfigurator, SDDIm
 \r
                                // <StateDefinition id="s1">\r
                                List<Element> elStateDefinitions = elStates.getChildren("StateDefinition",sddNamespace);\r
-                               TermVocabulary<State> termVocabularyState = new TermVocabulary<State>();\r
+                               TermVocabulary<State> termVocabularyState = TermVocabulary.NewInstance(null, null, null, null);\r
                                \r
                                vocabularies.add(termVocabularyState);\r
                                \r
@@ -1713,7 +1713,7 @@ public class SDDDataSetImport extends CdmImportBase<SDDImportConfigurator, SDDIm
                                                Element elModifiers = elDescriptiveConcept.getChild("Modifiers", sddNamespace);\r
                                        if (elModifiers !=null){\r
                                                List<Element> listModifiers = elModifiers.getChildren("Modifier", sddNamespace);\r
-                                                       TermVocabulary<Modifier> termVocabularyState = new TermVocabulary<Modifier>();\r
+                                                       TermVocabulary<Modifier> termVocabularyState = TermVocabulary.NewInstance(null, null, null, null);\r
                                                for (Element elModifier : listModifiers) {\r
                                                                Modifier modif = Modifier.NewInstance();\r
                                                                String idmod = elModifier.getAttributeValue("id");\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
index f22f398072d62bbfdbb4f4e8d200eb61a9803ec8..c6fe7d36aafce4d8573c1c59f14a66bcd2e6430b 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
@@ -952,7 +952,7 @@ public class SDDImport extends CdmImportBase<SDDImportConfigurator, SDDImportSta
 \r
                                // <StateDefinition id="s1">\r
                                List<Element> elStateDefinitions = elStates.getChildren("StateDefinition",sddNamespace);\r
-                               TermVocabulary<State> termVocabularyState = new TermVocabulary<State>();\r
+                               TermVocabulary<State> termVocabularyState = TermVocabulary.NewInstance(null, null, null, null);\r
                                \r
                                vocabularies.add(termVocabularyState);\r
                                \r
@@ -1683,7 +1683,7 @@ public class SDDImport extends CdmImportBase<SDDImportConfigurator, SDDImportSta
                                                Element elModifiers = elDescriptiveConcept.getChild("Modifiers", sddNamespace);\r
                                        if (elModifiers !=null){\r
                                                List<Element> listModifiers = elModifiers.getChildren("Modifier", sddNamespace);\r
-                                                       TermVocabulary<Modifier> termVocabularyState = new TermVocabulary<Modifier>();\r
+                                                       TermVocabulary<Modifier> termVocabularyState = TermVocabulary.NewInstance(null, null, null, null);\r
                                                for (Element elModifier : listModifiers) {\r
                                                                Modifier modif = Modifier.NewInstance();\r
                                                                String idmod = elModifier.getAttributeValue("id");\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
index eb6a5c3cf2365dd613815b1a11e96bcdaebfd955..de46f8749b5b8b6102fcdc8e1687f82e0cee707c 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
@@ -85,7 +85,7 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
        protected Set<T> terms = getNewTermSet();
        
 // ********************************* FACTORY METHODS *****************************************/
-       
+
        public static TermVocabulary NewInstance(String description, String label, String abbrev, String termSourceUri){
                return new TermVocabulary(description, label, abbrev, termSourceUri);
        }