reverting back cdm application configuration refactoring

[cdmlib-apps.git] / cdm-eflora / src / main / java / eu / etaxonomy / cdm / app / eflora / CentralAfricaEricaceaeActivator.java

diff --git a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/CentralAfricaEricaceaeActivator.java b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/CentralAfricaEricaceaeActivator.java
index 7ef766b792afaa0ac8226cb60404ce614eedb2af..3f3ca15824ff43963f691142a356c47b3732f435 100644 (file)
--- a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/CentralAfricaEricaceaeActivator.java
+++ b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/CentralAfricaEricaceaeActivator.java
@@ -36,6 +36,7 @@ import eu.etaxonomy.cdm.io.specimen.excel.in.SpecimenCdmExcelImportConfigurator;
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;\r
+import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
 import eu.etaxonomy.cdm.model.description.FeatureTree;\r
@@ -197,82 +198,82 @@ public class CentralAfricaEricaceaeActivator {
                }\r
                TransactionStatus tx = app.startTransaction();\r
                \r
-               OrderedTermVocabulary<NamedArea> voc = OrderedTermVocabulary.NewInstance("Phytogeographic Regions of Central Africa", "Phytogeographic Regions of Central Africa", "FdAC regions", null);\r
-               app.getVocabularyService().save(voc);\r
+               OrderedTermVocabulary<NamedArea> areaVoc = OrderedTermVocabulary.NewInstance(TermType.NamedArea, "Phytogeographic Regions of Central Africa", "Phytogeographic Regions of Central Africa", "FdAC regions", null);\r
+               app.getVocabularyService().save(areaVoc);\r
                \r
                NamedAreaLevel level = NamedAreaLevel.NewInstance("Phytogeographic Regions of Central Africa", "Phytogeographic Regions of Central Africa", "FdAC regions");\r
                ITermService termService = app.getTermService();\r
                \r
                termService.save(level);\r
                \r
-               NamedArea area = NamedArea.NewInstance("Côtier", "Côtier", "I");\r
+               NamedArea area = NamedArea.NewInstance("C\u00F4tier", "C\u00F4tier", "I");\r
                area.setLevel(level);\r
                area.setType(NamedAreaType.NATURAL_AREA());\r
-               voc.addTerm(area);\r
+               areaVoc.addTerm(area);\r
                termService.save(area);\r
                \r
 \r
                area = NamedArea.NewInstance("Mayumbe", "Mayumbe", "II");\r
                area.setLevel(level);\r
                area.setType(NamedAreaType.NATURAL_AREA());\r
-               voc.addTerm(area);\r
+               areaVoc.addTerm(area);\r
                termService.save(area);\r
 \r
                area = NamedArea.NewInstance("Bas-Congo", "Bas-Congo", "III");\r
                area.setLevel(level);\r
                area.setType(NamedAreaType.NATURAL_AREA());\r
-               voc.addTerm(area);\r
+               areaVoc.addTerm(area);\r
                termService.save(area);\r
 \r
                area = NamedArea.NewInstance("Kasai", "Kasai", "IV");\r
                area.setLevel(level);\r
                area.setType(NamedAreaType.NATURAL_AREA());\r
-               voc.addTerm(area);\r
+               areaVoc.addTerm(area);\r
                termService.save(area);\r
 \r
                area = NamedArea.NewInstance("Bas-Katanga", "Bas-Katanga", "V");\r
                area.setLevel(level);\r
                area.setType(NamedAreaType.NATURAL_AREA());\r
-               voc.addTerm(area);\r
+               areaVoc.addTerm(area);\r
                termService.save(area);\r
 \r
                area = NamedArea.NewInstance("Forestier Central", "Forestier Central", "VI");\r
                area.setLevel(level);\r
                area.setType(NamedAreaType.NATURAL_AREA());\r
-               voc.addTerm(area);\r
+               areaVoc.addTerm(area);\r
                termService.save(area);\r
 \r
                area = NamedArea.NewInstance("Ubangi-Uele", "Ubangi-Uele", "VII");\r
                area.setLevel(level);\r
                area.setType(NamedAreaType.NATURAL_AREA());\r
-               voc.addTerm(area);\r
+               areaVoc.addTerm(area);\r
                termService.save(area);\r
 \r
                area = NamedArea.NewInstance("Lac Albert", "Lac Albert", "VIII");\r
                area.setLevel(level);\r
                area.setType(NamedAreaType.NATURAL_AREA());\r
-               voc.addTerm(area);\r
+               areaVoc.addTerm(area);\r
                termService.save(area);\r
 \r
-               area = NamedArea.NewInstance("Lacs Édouard et Kivu", "Lacs Édouard et Kivu", "IX");\r
+               area = NamedArea.NewInstance("Lacs \u00C9douard et Kivu", "Lacs \u00C9douard et Kivu", "IX");\r
                area.setLevel(level);\r
                area.setType(NamedAreaType.NATURAL_AREA());\r
-               voc.addTerm(area);\r
+               areaVoc.addTerm(area);\r
                termService.save(area);\r
 \r
                area = NamedArea.NewInstance("Rwanda-Burundi", "Rwanda-Burundi", "X");\r
                area.setLevel(level);\r
                area.setType(NamedAreaType.NATURAL_AREA());\r
-               voc.addTerm(area);\r
+               areaVoc.addTerm(area);\r
                termService.save(area);\r
 \r
                area = NamedArea.NewInstance("Haut-Katanga", "Haut-Katanga", "XI");\r
                area.setLevel(level);\r
                area.setType(NamedAreaType.NATURAL_AREA());\r
-               voc.addTerm(area);\r
+               areaVoc.addTerm(area);\r
                termService.save(area);\r
                \r
-               app.getVocabularyService().save(voc);\r
+               app.getVocabularyService().save(areaVoc);\r
                \r
                app.commitTransaction(tx);\r
 \r