refactoring cdm application configuration / controller

[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 3f3ca15824ff43963f691142a356c47b3732f435..d777c4a321cce6cd910340a97c2798a121f559c7 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
@@ -16,8 +16,9 @@ import java.util.UUID;
 import org.apache.log4j.Logger;\r
 import org.springframework.transaction.TransactionStatus;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
 import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor;\r
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
@@ -150,9 +151,9 @@ public class CentralAfricaEricaceaeActivator {
                \r
                //deduplicate\r
                if (doDeduplicate){\r
-                       ICdmApplicationConfiguration app = myImport.getCdmAppController();\r
+                       ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();\r
                        if (app == null){\r
-                               app = CdmApplicationController.NewInstance(cdmDestination, hbm2dll, false);\r
+                               app = CdmApplicationDefaultController.NewInstance(cdmDestination, hbm2dll, false);\r
                        }\r
                        app.getAgentService().updateTitleCache(Team.class, null, null, null);\r
                        return;\r
@@ -171,9 +172,9 @@ public class CentralAfricaEricaceaeActivator {
 \r
                if (doSpecimen){\r
                        logger.warn("Start specimen import");\r
-                       ICdmApplicationConfiguration app = myImport.getCdmAppController();\r
+                       ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();\r
                        SpecimenCdmExcelImportConfigurator specimenConfig= SpecimenCdmExcelImportConfigurator.NewInstance(specimenSource, cdmDestination);\r
-                       specimenConfig.setCdmAppController((CdmApplicationController)app);\r
+                       specimenConfig.setCdmAppController((CdmApplicationDefaultController)app);\r
                        specimenConfig.setAreaMatchMode(specimenAreaMatchMode);\r
                        \r
                        config.setDbSchemaValidation(DbSchemaValidation.VALIDATE);\r
@@ -192,9 +193,9 @@ public class CentralAfricaEricaceaeActivator {
        }\r
 \r
        private void newNamedAreas(CdmDefaultImport<EfloraImportConfigurator> myImport) {\r
-               ICdmApplicationConfiguration app = myImport.getCdmAppController();\r
+               ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();\r
                if (app == null){\r
-                       app = CdmApplicationController.NewInstance(cdmDestination, hbm2dll, false);\r
+                       app = CdmApplicationDefaultController.NewInstance(cdmDestination, hbm2dll, false);\r
                }\r
                TransactionStatus tx = app.startTransaction();\r
                \r