import org.apache.log4j.Logger;\r
import org.springframework.transaction.TransactionStatus;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\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
\r
//deduplicate\r
if (doDeduplicate){\r
- ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();\r
+ ICdmApplicationConfiguration app = myImport.getCdmAppController();\r
if (app == null){\r
- app = CdmApplicationDefaultController.NewInstance(cdmDestination, hbm2dll, false);\r
+ app = CdmApplicationController.NewInstance(cdmDestination, hbm2dll, false);\r
}\r
app.getAgentService().updateTitleCache(Team.class, null, null, null);\r
return;\r
\r
if (doSpecimen){\r
logger.warn("Start specimen import");\r
- ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();\r
+ ICdmApplicationConfiguration app = myImport.getCdmAppController();\r
SpecimenCdmExcelImportConfigurator specimenConfig= SpecimenCdmExcelImportConfigurator.NewInstance(specimenSource, cdmDestination);\r
- specimenConfig.setCdmAppController((CdmApplicationDefaultController)app);\r
+ specimenConfig.setCdmAppController((CdmApplicationController)app);\r
specimenConfig.setAreaMatchMode(specimenAreaMatchMode);\r
\r
config.setDbSchemaValidation(DbSchemaValidation.VALIDATE);\r
}\r
\r
private void newNamedAreas(CdmDefaultImport<EfloraImportConfigurator> myImport) {\r
- ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();\r
+ ICdmApplicationConfiguration app = myImport.getCdmAppController();\r
if (app == null){\r
- app = CdmApplicationDefaultController.NewInstance(cdmDestination, hbm2dll, false);\r
+ app = CdmApplicationController.NewInstance(cdmDestination, hbm2dll, false);\r
}\r
TransactionStatus tx = app.startTransaction();\r
\r
\r
import org.apache.log4j.Logger;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.api.service.ITermService;\r
import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
private void doImport(ICdmDataSource cdmDestination){\r
observerList.add(observer);\r
\r
- CdmApplicationDefaultController app = CdmIoApplicationController.NewInstance(cdmDestination, hbm2dll);\r
+ CdmApplicationController app = CdmIoApplicationController.NewInstance(cdmDestination, hbm2dll);\r
ITermService service = app.getTermService();\r
} \r
\r
import org.apache.log4j.Logger;\r
import org.springframework.transaction.TransactionStatus;\r
\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\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
\r
CdmDefaultImport<EfloraImportConfigurator> myImport = new CdmDefaultImport<EfloraImportConfigurator>();\r
\r
- ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();\r
+ ICdmApplicationConfiguration app = myImport.getCdmAppController();\r
\r
\r
//\r
* @param app\r
* @param tree\r
*/\r
- private void moveChild(ICdmApplicationDefaultConfiguration app, FeatureTree tree) {\r
+ private void moveChild(ICdmApplicationConfiguration app, FeatureTree tree) {\r
FeatureNode root = tree.getRoot();\r
int count = root.getChildCount();\r
FeatureNode lastChild = root.getChildAt(count - 1);\r