From 2a1795298ee03b33ec07613db01bc6389f3d7628 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Fri, 18 Feb 2011 21:17:51 +0000
Subject: [PATCH] hide term vocabulary constructors and create factory methods
 instead

---
 .../cdm/io/berlinModel/in/BerlinModelFactsImport.java         | 2 +-
 .../main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java   | 4 +---
 .../java/eu/etaxonomy/cdm/io/sdd/in/SDDDataSetImport.java     | 4 ++--
 .../src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java   | 4 ++--
 .../java/eu/etaxonomy/cdm/model/common/TermVocabulary.java    | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

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 2d2cabb01e..22f7c01ac8 100644
--- 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;
 		} catch (UnknownCdmTypeException e) {
 			logger.error("Feature vocabulary not available. New vocabulary created");
-			return new TermVocabulary<Feature>() ;
+			return TermVocabulary.NewInstance("User Defined Feature Vocabulary", "User Defined Feature Vocabulary", null, null); 
 		}
 	}
 	
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 358421187f..3df048528e 100644
--- 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) {
 		TermVocabulary voc = getVocabularyService().find(uuid);
 		if (voc == null){
-			voc = new TermVocabulary();
+			voc = TermVocabulary.NewInstance(text, label, abbrev, null);
 			voc.setUuid(uuid);
-			Representation representation = Representation.NewInstance(text, label, abbrev, Language.DEFAULT());
-			voc.addRepresentation(representation);
 			getVocabularyService().save(voc);
 		}
 		return voc;
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 854329c99d..03eccdca82 100644
--- 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
 
 				// <StateDefinition id="s1">
 				List<Element> elStateDefinitions = elStates.getChildren("StateDefinition",sddNamespace);
-				TermVocabulary<State> termVocabularyState = new TermVocabulary<State>();
+				TermVocabulary<State> termVocabularyState = TermVocabulary.NewInstance(null, null, null, null);
 				
 				vocabularies.add(termVocabularyState);
 				
@@ -1713,7 +1713,7 @@ public class SDDDataSetImport extends CdmImportBase<SDDImportConfigurator, SDDIm
 						Element elModifiers = elDescriptiveConcept.getChild("Modifiers", sddNamespace);
 					if (elModifiers !=null){
 						List<Element> listModifiers = elModifiers.getChildren("Modifier", sddNamespace);
-							TermVocabulary<Modifier> termVocabularyState = new TermVocabulary<Modifier>();
+							TermVocabulary<Modifier> termVocabularyState = TermVocabulary.NewInstance(null, null, null, null);
 						for (Element elModifier : listModifiers) {
 								Modifier modif = Modifier.NewInstance();
 								String idmod = elModifier.getAttributeValue("id");
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 f22f398072..c6fe7d36aa 100644
--- 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
 
 				// <StateDefinition id="s1">
 				List<Element> elStateDefinitions = elStates.getChildren("StateDefinition",sddNamespace);
-				TermVocabulary<State> termVocabularyState = new TermVocabulary<State>();
+				TermVocabulary<State> termVocabularyState = TermVocabulary.NewInstance(null, null, null, null);
 				
 				vocabularies.add(termVocabularyState);
 				
@@ -1683,7 +1683,7 @@ public class SDDImport extends CdmImportBase<SDDImportConfigurator, SDDImportSta
 						Element elModifiers = elDescriptiveConcept.getChild("Modifiers", sddNamespace);
 					if (elModifiers !=null){
 						List<Element> listModifiers = elModifiers.getChildren("Modifier", sddNamespace);
-							TermVocabulary<Modifier> termVocabularyState = new TermVocabulary<Modifier>();
+							TermVocabulary<Modifier> termVocabularyState = TermVocabulary.NewInstance(null, null, null, null);
 						for (Element elModifier : listModifiers) {
 								Modifier modif = Modifier.NewInstance();
 								String idmod = elModifier.getAttributeValue("id");
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 eb6a5c3cf2..de46f8749b 100644
--- 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);
 	}
-- 
2.34.1