From c40fd45bd30983ef8ec697c79449ba28f8863e23 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Mon, 8 Jun 2009 11:22:17 +0000
Subject: [PATCH] ExtensionType implemented (cont.)

---
 .../etaxonomy/cdm/database/PersistentTermInitializer.java   | 6 +++---
 .../eu/etaxonomy/cdm/database/TestingTermInitializer.java   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java
index bc32a1ea13..74cc41038a 100644
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java
@@ -27,7 +27,7 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
 import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.cdm.model.common.VocabularyType;
+import eu.etaxonomy.cdm.model.common.VocabularyEnum;
 import eu.etaxonomy.cdm.model.common.init.TermLoader;
 import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;
 
@@ -84,10 +84,10 @@ public class PersistentTermInitializer extends DefaultTermInitializer {
 			return;
 		} else {
 			Map<UUID,DefinedTermBase> terms = new HashMap<UUID,DefinedTermBase>();
-			logger.info("PersistentTermInitializer.omit == false, initializing " + VocabularyType.values().length + " term classes");
+			logger.info("PersistentTermInitializer.omit == false, initializing " + VocabularyEnum.values().length + " term classes");
 			
 			TransactionStatus txStatus = transactionManager.getTransaction(txDefinition);
-			for(VocabularyType vocabularyType : VocabularyType.values()) {
+			for(VocabularyEnum vocabularyType : VocabularyEnum.values()) {
 				Class<? extends DefinedTermBase<?>> clazz = vocabularyType.getClazz();
 				UUID vocabularyUuid = firstPass(clazz,terms);
 				secondPass(clazz,vocabularyUuid,terms);
diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java
index e250488289..9615a75554 100644
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java
@@ -20,7 +20,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.transaction.TransactionStatus;
 
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.VocabularyType;
+import eu.etaxonomy.cdm.model.common.VocabularyEnum;
 import eu.etaxonomy.cdm.test.integration.HsqldbDataTypeFactory;
 
 public class TestingTermInitializer extends PersistentTermInitializer {
@@ -69,7 +69,7 @@ public class TestingTermInitializer extends PersistentTermInitializer {
 		}
 		transactionManager.commit(txStatus);
 		
-		for(VocabularyType vocabularyType : VocabularyType.values()) {
+		for(VocabularyEnum vocabularyType : VocabularyEnum.values()) {
 			Class<? extends DefinedTermBase<?>> clazz = vocabularyType.getClazz();
 			UUID vocabularyUuid = vocabularyType.getUuid();
 			secondPass(clazz, vocabularyUuid,new HashMap<UUID,DefinedTermBase>());
-- 
2.34.1