refactoring cdm application configuration / controller

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

diff --git a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/FloraMalesianaProspectiveTester.java b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/FloraMalesianaProspectiveTester.java
index 1267a6e77798049365b8264b6abbecc76973bd40..8f7b87ee18e723aabd83eab2988ad9842ef30ee8 100644 (file)
--- a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/FloraMalesianaProspectiveTester.java
+++ b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/FloraMalesianaProspectiveTester.java
@@ -14,7 +14,7 @@ import java.util.Set;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
@@ -54,7 +54,7 @@ public class FloraMalesianaProspectiveTester extends EfloraActivatorBase {
        private void doImport(ICdmDataSource cdmDestination){\r
                observerList.add(observer);\r
 \r
-               CdmApplicationController app = CdmIoApplicationController.NewInstance(cdmDestination, hbm2dll);\r
+               CdmApplicationDefaultController app = CdmIoApplicationController.NewInstance(cdmDestination, hbm2dll);\r
                ITermService service = app.getTermService();\r
        }               \r
        \r

diff --git a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/testUpdate/EricaceaeTestUpdateActivator.java b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/testUpdate/EricaceaeTestUpdateActivator.java
index cd55ad2ce796120a4b5c5cbc64f4207aaaaf270d..947608e9d0826ad6a6c9099fd06ca94525d01c3e 100644 (file)
--- a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/testUpdate/EricaceaeTestUpdateActivator.java
+++ b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/testUpdate/EricaceaeTestUpdateActivator.java
@@ -16,7 +16,7 @@ import java.util.UUID;
 import org.apache.log4j.Logger;\r
 import org.springframework.transaction.TransactionStatus;\r
 \r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
 import eu.etaxonomy.cdm.app.eflora.CdmDestinations;\r
 import eu.etaxonomy.cdm.app.eflora.EfloraSources;\r
 import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor;\r
@@ -91,7 +91,7 @@ public class EricaceaeTestUpdateActivator {
                \r
                CdmDefaultImport<EfloraImportConfigurator> myImport = new CdmDefaultImport<EfloraImportConfigurator>();\r
                \r
-               ICdmApplicationConfiguration app = myImport.getCdmAppController();\r
+               ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();\r
                \r
                \r
                //\r
@@ -121,7 +121,7 @@ public class EricaceaeTestUpdateActivator {
         * @param app\r
         * @param tree\r
         */\r
-       private void moveChild(ICdmApplicationConfiguration app, FeatureTree tree) {\r
+       private void moveChild(ICdmApplicationDefaultConfiguration app, FeatureTree tree) {\r
                FeatureNode root = tree.getRoot();\r
                int count = root.getChildCount();\r
                FeatureNode lastChild = root.getChildAt(count - 1);\r