ExtensionType implemented (cont.)

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 bc32a1ea13bf682d5b0cef1d1aeb45ce2af346ea..74cc41038afd65d54d1e286a4bd3b36c55c2ac5f 100644 (file)
--- 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;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
-import eu.etaxonomy.cdm.model.common.VocabularyType;\r
+import eu.etaxonomy.cdm.model.common.VocabularyEnum;\r
 import eu.etaxonomy.cdm.model.common.init.TermLoader;\r
 import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;\r
 \r
@@ -84,10 +84,10 @@ public class PersistentTermInitializer extends DefaultTermInitializer {
                        return;\r
                } else {\r
                        Map<UUID,DefinedTermBase> terms = new HashMap<UUID,DefinedTermBase>();\r
-                       logger.info("PersistentTermInitializer.omit == false, initializing " + VocabularyType.values().length + " term classes");\r
+                       logger.info("PersistentTermInitializer.omit == false, initializing " + VocabularyEnum.values().length + " term classes");\r
                        \r
                        TransactionStatus txStatus = transactionManager.getTransaction(txDefinition);\r
-                       for(VocabularyType vocabularyType : VocabularyType.values()) {\r
+                       for(VocabularyEnum vocabularyType : VocabularyEnum.values()) {\r
                                Class<? extends DefinedTermBase<?>> clazz = vocabularyType.getClazz();\r
                                UUID vocabularyUuid = firstPass(clazz,terms);\r
                                secondPass(clazz,vocabularyUuid,terms);\r

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 e250488289f7910c1ed848580fbc26b359168e39..9615a75554e047afca17b6f0090826f36e2bc04e 100644 (file)
--- 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;\r
 \r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
-import eu.etaxonomy.cdm.model.common.VocabularyType;\r
+import eu.etaxonomy.cdm.model.common.VocabularyEnum;\r
 import eu.etaxonomy.cdm.test.integration.HsqldbDataTypeFactory;\r
 \r
 public class TestingTermInitializer extends PersistentTermInitializer {\r
@@ -69,7 +69,7 @@ public class TestingTermInitializer extends PersistentTermInitializer {
                }\r
                transactionManager.commit(txStatus);\r
                \r
-               for(VocabularyType vocabularyType : VocabularyType.values()) {\r
+               for(VocabularyEnum vocabularyType : VocabularyEnum.values()) {\r
                        Class<? extends DefinedTermBase<?>> clazz = vocabularyType.getClazz();\r
                        UUID vocabularyUuid = vocabularyType.getUuid();\r
                        secondPass(clazz, vocabularyUuid,new HashMap<UUID,DefinedTermBase>());\r