From 55c054e2a3fa209fa1eda6b55b372c750d84727a Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Thu, 13 Feb 2014 11:28:10 +0000 Subject: [PATCH] reverting back cdm application configuration refactoring --- .../eflora/CentralAfricaEricaceaeActivator.java | 15 +++++++-------- .../eflora/FloraMalesianaProspectiveTester.java | 4 ++-- .../testUpdate/EricaceaeTestUpdateActivator.java | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) 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 d777c4a3..3f3ca158 100644 --- 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,9 +16,8 @@ import java.util.UUID; import org.apache.log4j.Logger; import org.springframework.transaction.TransactionStatus; -import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController; +import eu.etaxonomy.cdm.api.application.CdmApplicationController; import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; -import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration; import eu.etaxonomy.cdm.api.service.ITermService; import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor; import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; @@ -151,9 +150,9 @@ public class CentralAfricaEricaceaeActivator { //deduplicate if (doDeduplicate){ - ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController(); + ICdmApplicationConfiguration app = myImport.getCdmAppController(); if (app == null){ - app = CdmApplicationDefaultController.NewInstance(cdmDestination, hbm2dll, false); + app = CdmApplicationController.NewInstance(cdmDestination, hbm2dll, false); } app.getAgentService().updateTitleCache(Team.class, null, null, null); return; @@ -172,9 +171,9 @@ public class CentralAfricaEricaceaeActivator { if (doSpecimen){ logger.warn("Start specimen import"); - ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController(); + ICdmApplicationConfiguration app = myImport.getCdmAppController(); SpecimenCdmExcelImportConfigurator specimenConfig= SpecimenCdmExcelImportConfigurator.NewInstance(specimenSource, cdmDestination); - specimenConfig.setCdmAppController((CdmApplicationDefaultController)app); + specimenConfig.setCdmAppController((CdmApplicationController)app); specimenConfig.setAreaMatchMode(specimenAreaMatchMode); config.setDbSchemaValidation(DbSchemaValidation.VALIDATE); @@ -193,9 +192,9 @@ public class CentralAfricaEricaceaeActivator { } private void newNamedAreas(CdmDefaultImport myImport) { - ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController(); + ICdmApplicationConfiguration app = myImport.getCdmAppController(); if (app == null){ - app = CdmApplicationDefaultController.NewInstance(cdmDestination, hbm2dll, false); + app = CdmApplicationController.NewInstance(cdmDestination, hbm2dll, false); } TransactionStatus tx = app.startTransaction(); 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 8f7b87ee..1267a6e7 100644 --- 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; import org.apache.log4j.Logger; -import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController; +import eu.etaxonomy.cdm.api.application.CdmApplicationController; import eu.etaxonomy.cdm.api.service.ITermService; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; @@ -54,7 +54,7 @@ public class FloraMalesianaProspectiveTester extends EfloraActivatorBase { private void doImport(ICdmDataSource cdmDestination){ observerList.add(observer); - CdmApplicationDefaultController app = CdmIoApplicationController.NewInstance(cdmDestination, hbm2dll); + CdmApplicationController app = CdmIoApplicationController.NewInstance(cdmDestination, hbm2dll); ITermService service = app.getTermService(); } 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 947608e9..cd55ad2c 100644 --- 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; import org.springframework.transaction.TransactionStatus; -import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.eflora.CdmDestinations; import eu.etaxonomy.cdm.app.eflora.EfloraSources; import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor; @@ -91,7 +91,7 @@ public class EricaceaeTestUpdateActivator { CdmDefaultImport myImport = new CdmDefaultImport(); - ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController(); + ICdmApplicationConfiguration app = myImport.getCdmAppController(); // @@ -121,7 +121,7 @@ public class EricaceaeTestUpdateActivator { * @param app * @param tree */ - private void moveChild(ICdmApplicationDefaultConfiguration app, FeatureTree tree) { + private void moveChild(ICdmApplicationConfiguration app, FeatureTree tree) { FeatureNode root = tree.getRoot(); int count = root.getChildCount(); FeatureNode lastChild = root.getChildAt(count - 1); -- 2.34.1