From cbe91b8109a3da5a19fa8831c1cabb8b93219601 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 26 Apr 2011 17:30:43 +0000 Subject: [PATCH 1/1] Use interface type for get/setCdmAppController in CdmDefaultIOBase (#2347) --- .../app/berlinModelImport/CampanulaceaeActivator.java | 3 ++- .../cdm/app/berlinModelImport/IldisActivator.java | 4 ++-- .../eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java | 3 ++- .../eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java | 3 ++- .../app/eflora/CentralAfricaEricaceaeActivator.java | 3 ++- .../eu/etaxonomy/cdm/app/globis/GlobisActivator.java | 6 +++--- .../java/eu/etaxonomy/cdm/app/pesi/ErmsActivator.java | 7 +++---- .../eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java | 6 +++--- .../etaxonomy/cdm/app/pesi/FaunaEuropaeaActivator.java | 8 ++++---- .../eu/etaxonomy/cdm/app/pesi/erms/ErmsActivator.java | 6 +++--- .../eu/etaxonomy/cdm/app/tcs/TcsRdfTestActivator.java | 1 - .../app/testUpdate/EricaceaeTestUpdateActivator.java | 6 +++--- .../cdm/app/wp6/cichorieae/CichorieaeActivator.java | 6 +++--- .../cdm/app/wp6/cichorieae/TaraxacumActivator.java | 10 +++++----- .../cdm/app/wp6/diptera/DipteraActivator.java | 3 ++- .../cdm/app/wp6/diptera/DipteraDistributionParser.java | 3 ++- .../etaxonomy/cdm/app/wp6/palmae/PalmaeActivator.java | 3 ++- 17 files changed, 43 insertions(+), 38 deletions(-) diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CampanulaceaeActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CampanulaceaeActivator.java index ab634a23..f49855d8 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CampanulaceaeActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CampanulaceaeActivator.java @@ -14,6 +14,7 @@ import java.util.UUID; import org.apache.log4j.Logger; import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; @@ -169,7 +170,7 @@ public class CampanulaceaeActivator { success &= bmImport.invoke(bmImportConfigurator); if (doFacts && (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT) || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) ) ){ - CdmApplicationController app = bmImport.getCdmAppController(); + ICdmApplicationConfiguration app = bmImport.getCdmAppController(); //make feature tree FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/IldisActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/IldisActivator.java index 7aee84b2..e67f4d59 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/IldisActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/IldisActivator.java @@ -13,7 +13,7 @@ import java.util.UUID; import org.apache.log4j.Logger; -import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.app.pesi.FaunaEuropaeaActivator; import eu.etaxonomy.cdm.database.DbSchemaValidation; @@ -156,7 +156,7 @@ public class IldisActivator { success &= bmImport.invoke(bmImportConfigurator); if (doFacts && (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT) || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) ) ){ - CdmApplicationController app = bmImport.getCdmAppController(); + ICdmApplicationConfiguration app = bmImport.getCdmAppController(); //make feature tree FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java index bcf7515e..c34faba0 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java @@ -16,6 +16,7 @@ import java.util.UUID; import org.apache.log4j.Logger; import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.api.service.ITermService; import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.database.DbSchemaValidation; @@ -99,7 +100,7 @@ public class CyprusActivator { //deduplicate if (doDeduplicate){ - CdmApplicationController app = myImport.getCdmAppController(); + ICdmApplicationConfiguration app = myImport.getCdmAppController(); int count = app.getAgentService().deduplicate(Person.class, null, null); logger.warn("Deduplicated " + count + " persons."); // count = app.getAgentService().deduplicate(Team.class, null, null); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java index 7b1d55c7..ded0eb6f 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java @@ -43,7 +43,8 @@ public class DwcaExportActivator { private static List featureExclusions = Arrays.asList(new UUID[]{ UUID.fromString("5deff505-1a32-4817-9a74-50e6936fd630"), //occurrences - UUID.fromString("8075074c-ace8-496b-ac82-47c14553f7fd") //Editor_Parenthesis + UUID.fromString("8075074c-ace8-496b-ac82-47c14553f7fd"), //Editor_Parenthesis + UUID.fromString("c0cc5ebe-1f0c-4c31-af53-d486858ea415") //Image Sources }); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/eflora/CentralAfricaEricaceaeActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/eflora/CentralAfricaEricaceaeActivator.java index 8a439713..ac0e8509 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/eflora/CentralAfricaEricaceaeActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/eflora/CentralAfricaEricaceaeActivator.java @@ -17,6 +17,7 @@ import org.apache.log4j.Logger; import org.springframework.transaction.TransactionStatus; import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.api.service.ITermService; import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.common.DefaultProgressMonitor; @@ -132,7 +133,7 @@ public class CentralAfricaEricaceaeActivator { //deduplicate if (doDeduplicate){ - CdmApplicationController app = myImport.getCdmAppController(); + ICdmApplicationConfiguration app = myImport.getCdmAppController(); int count = app.getAgentService().deduplicate(Person.class, null, null); logger.warn("Deduplicated " + count + " persons."); // count = app.getAgentService().deduplicate(Team.class, null, null); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/globis/GlobisActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/globis/GlobisActivator.java index 265d1c20..40f7e0ad 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/globis/GlobisActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/globis/GlobisActivator.java @@ -14,15 +14,15 @@ import java.util.UUID; import org.apache.log4j.Logger; -import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.app.common.CdmImportSources; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.common.CdmDefaultImport; -import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES; +import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.io.globis.GlobisImportConfigurator; import eu.etaxonomy.cdm.model.common.ISourceable; import eu.etaxonomy.cdm.model.name.NomenclaturalCode; @@ -110,7 +110,7 @@ public class GlobisActivator { globisImport.invoke(config); if (config.getCheck().equals(CHECK.CHECK_AND_IMPORT) || config.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) ){ - CdmApplicationController app = globisImport.getCdmAppController(); + ICdmApplicationConfiguration app = globisImport.getCdmAppController(); ISourceable obj = app.getCommonService().getSourcedObjectByIdInSource(ZoologicalName.class, "1000027", null); logger.info(obj); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsActivator.java index 8746d9a8..37c3ed1a 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsActivator.java @@ -13,16 +13,15 @@ import java.util.UUID; import org.apache.log4j.Logger; -import eu.etaxonomy.cdm.api.application.CdmApplicationController; -import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator; import eu.etaxonomy.cdm.io.common.CdmDefaultImport; -import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES; +import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.model.common.ISourceable; import eu.etaxonomy.cdm.model.name.NomenclaturalCode; import eu.etaxonomy.cdm.model.name.ZoologicalName; @@ -138,7 +137,7 @@ public class ErmsActivator { bmImport.invoke(bmImportConfigurator); if (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT) || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) ){ - CdmApplicationController app = bmImport.getCdmAppController(); + ICdmApplicationConfiguration app = bmImport.getCdmAppController(); ISourceable obj = app.getCommonService().getSourcedObjectByIdInSource(ZoologicalName.class, "1000027", null); logger.info(obj); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java index 05e3baea..435d491c 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java @@ -13,7 +13,7 @@ import java.util.UUID; import org.apache.log4j.Logger; -import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources; import eu.etaxonomy.cdm.app.berlinModelImport.TreeCreator; import eu.etaxonomy.cdm.app.common.CdmDestinations; @@ -21,10 +21,10 @@ import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator; import eu.etaxonomy.cdm.io.common.CdmDefaultImport; -import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES; import eu.etaxonomy.cdm.io.common.IImportConfigurator.EDITOR; +import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.description.FeatureNode; import eu.etaxonomy.cdm.model.description.FeatureTree; @@ -177,7 +177,7 @@ public class EuroMedActivator { bmImport.invoke(bmImportConfigurator); if (doFacts && bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT) || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) ){ - CdmApplicationController app = bmImport.getCdmAppController(); + ICdmApplicationConfiguration app = bmImport.getCdmAppController(); //make feature tree FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaActivator.java index 80b95f22..693fefc4 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaActivator.java @@ -13,15 +13,14 @@ import java.util.UUID; import org.apache.log4j.Logger; -import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; +import eu.etaxonomy.cdm.io.common.CdmDefaultImport; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES; -import eu.etaxonomy.cdm.io.common.CdmDefaultImport; import eu.etaxonomy.cdm.io.common.Source; - import eu.etaxonomy.cdm.io.pesi.faunaEuropaea.FaunaEuropaeaImportConfigurator; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.description.FeatureNode; @@ -33,6 +32,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode; * @created 12.05.2009 */ public class FaunaEuropaeaActivator { + @SuppressWarnings("unused") private static final Logger logger = Logger.getLogger(FaunaEuropaeaActivator.class); static final Source faunaEuropaeaSource = FaunaEuropaeaSources.faunaEu_1_3(); @@ -147,7 +147,7 @@ public class FaunaEuropaeaActivator { FeatureTree featureTree = FeatureTree.NewInstance(UUID.fromString("ff59b9ad-1fb8-4aa4-a8ba-79d62123d0fb")); FeatureNode root = featureTree.getRoot(); - CdmApplicationController app = fauEuImport.getCdmAppController(); + ICdmApplicationConfiguration app = fauEuImport.getCdmAppController(); Feature citationFeature = (Feature)app.getTermService().find(UUID.fromString("99b2842f-9aa7-42fa-bd5f-7285311e0101")); FeatureNode citationNode = FeatureNode.NewInstance(citationFeature); root.addChild(citationNode); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/erms/ErmsActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/erms/ErmsActivator.java index 9b0a76d9..f3ffa329 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/erms/ErmsActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/erms/ErmsActivator.java @@ -13,15 +13,15 @@ import java.util.UUID; import org.apache.log4j.Logger; -import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.app.pesi.FaunaEuropaeaSources; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.common.CdmDefaultImport; -import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES; +import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.io.pesi.erms.ErmsImportConfigurator; import eu.etaxonomy.cdm.model.common.ISourceable; import eu.etaxonomy.cdm.model.name.NomenclaturalCode; @@ -119,7 +119,7 @@ public class ErmsActivator { ermsImport.invoke(ermsImportConfigurator); if (ermsImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT) || ermsImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) ){ - CdmApplicationController app = ermsImport.getCdmAppController(); + ICdmApplicationConfiguration app = ermsImport.getCdmAppController(); ISourceable obj = app.getCommonService().getSourcedObjectByIdInSource(ZoologicalName.class, "1000027", null); logger.info(obj); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsRdfTestActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsRdfTestActivator.java index b06acac3..ba5a8cfa 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsRdfTestActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsRdfTestActivator.java @@ -95,7 +95,6 @@ public class TcsRdfTestActivator { //book.setDatePublished(TimePeriod.NewInstance(1945)); book.setDatePublished(TimePeriod.NewInstance(1945).setEndDay(12).setEndMonth(4)); refService.saveOrUpdate((Reference)book); - tcsImport.getCdmAppController().close(); logger.info("End"); System.out.println("End import from TCS ("+ source.toString() + ")..."); } catch (URISyntaxException e) { diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/testUpdate/EricaceaeTestUpdateActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/testUpdate/EricaceaeTestUpdateActivator.java index 3d71fc22..3c0ec28b 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/testUpdate/EricaceaeTestUpdateActivator.java +++ b/app-import/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.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.app.eflora.EfloraSources; import eu.etaxonomy.cdm.common.DefaultProgressMonitor; @@ -90,7 +90,7 @@ public class EricaceaeTestUpdateActivator { CdmDefaultImport myImport = new CdmDefaultImport(); - CdmApplicationController app = myImport.getCdmAppController(); + ICdmApplicationConfiguration app = myImport.getCdmAppController(); // @@ -120,7 +120,7 @@ public class EricaceaeTestUpdateActivator { * @param app * @param tree */ - private void moveChild(CdmApplicationController app, FeatureTree tree) { + private void moveChild(ICdmApplicationConfiguration app, FeatureTree tree) { FeatureNode root = tree.getRoot(); int count = root.getChildCount(); FeatureNode lastChild = root.getChildAt(count - 1); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeActivator.java index 90f61c6a..d4c27e4e 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeActivator.java @@ -16,7 +16,7 @@ import java.util.UUID; import org.apache.log4j.Logger; -import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources; import eu.etaxonomy.cdm.app.berlinModelImport.TreeCreator; import eu.etaxonomy.cdm.app.common.CdmDestinations; @@ -26,10 +26,10 @@ import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator; import eu.etaxonomy.cdm.io.common.CdmDefaultImport; import eu.etaxonomy.cdm.io.common.IImportConfigurator; -import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES; import eu.etaxonomy.cdm.io.common.IImportConfigurator.EDITOR; +import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.io.wp6.CichorieaeImageImport; import eu.etaxonomy.cdm.model.common.ISourceable; import eu.etaxonomy.cdm.model.description.Feature; @@ -218,7 +218,7 @@ public class CichorieaeActivator { success &= bmImport.invoke(bmImportConfigurator); if (doFacts && (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT) || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) ) ){ - CdmApplicationController app = bmImport.getCdmAppController(); + ICdmApplicationConfiguration app = bmImport.getCdmAppController(); ISourceable obj = app.getCommonService().getSourcedObjectByIdInSource(ZoologicalName.class, "1000027", null); logger.info(obj); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/TaraxacumActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/TaraxacumActivator.java index 91776891..4bc52b29 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/TaraxacumActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/TaraxacumActivator.java @@ -16,21 +16,21 @@ import java.util.UUID; import org.apache.log4j.Logger; import org.springframework.transaction.TransactionStatus; -import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources; import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator; import eu.etaxonomy.cdm.io.common.CdmDefaultImport; -import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES; +import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.model.name.NomenclaturalCode; import eu.etaxonomy.cdm.model.reference.Reference; +import eu.etaxonomy.cdm.model.taxon.Classification; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonNode; -import eu.etaxonomy.cdm.model.taxon.Classification; /** @@ -174,7 +174,7 @@ public class TaraxacumActivator { success &= bmImport.invoke(bmImportConfigurator); if (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT) || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) ){ - CdmApplicationController app = bmImport.getCdmAppController(); + ICdmApplicationConfiguration app = bmImport.getCdmAppController(); TransactionStatus tx = app.startTransaction(); //make feature tree // FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList); @@ -193,7 +193,7 @@ public class TaraxacumActivator { } - public boolean mergeIntoCichorieae(CdmApplicationController app){ + public boolean mergeIntoCichorieae(ICdmApplicationConfiguration app){ boolean success = true; // String taraxTaraxacumUuidStr = "9a7bced0-fa1a-432e-9cca-57b62219cde6"; String taraxTaraxacumUuidStr = "b86f1156-091c-494d-a9c9-c84d71058f98"; diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraActivator.java index aec74501..592540e0 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraActivator.java @@ -15,6 +15,7 @@ import java.util.UUID; import org.apache.log4j.Logger; import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources; import eu.etaxonomy.cdm.app.berlinModelImport.TreeCreator; import eu.etaxonomy.cdm.app.common.CdmDestinations; @@ -183,7 +184,7 @@ public class DipteraActivator { success &= bmImport.invoke(bmImportConfigurator); if (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT) || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) ){ - CdmApplicationController app = bmImport.getCdmAppController(); + ICdmApplicationConfiguration app = bmImport.getCdmAppController(); //parse distributions if (doDistributionParser){ diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraDistributionParser.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraDistributionParser.java index 4ab95169..b8e45ed6 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraDistributionParser.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraDistributionParser.java @@ -27,6 +27,7 @@ import org.apache.log4j.Logger; import org.springframework.transaction.TransactionStatus; import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; @@ -57,7 +58,7 @@ public class DipteraDistributionParser { final static String epiSplitter = "(\\s+|\\[|\\]|\\(|\\))"; //( ' '+| '(' | ')'| '[' | ']' ) static Pattern pattern = null; - protected void doDistribution(CdmApplicationController app){ + protected void doDistribution(ICdmApplicationConfiguration app){ pattern = Pattern.compile(epiSplitter); TransactionStatus txStatus = app.startTransaction(); List taxa = app.getTaxonService().list(null, null, null, null, null); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeActivator.java index 9895c179..b9d6fe3c 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeActivator.java @@ -17,6 +17,7 @@ import java.util.UUID; import org.apache.log4j.Logger; import eu.etaxonomy.cdm.api.application.CdmApplicationController; +import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.app.images.ImageImportConfigurator; import eu.etaxonomy.cdm.app.tcs.TcsSources; @@ -120,7 +121,7 @@ public class PalmaeActivator { //make feature tree logger.info("Make feature tree"); - CdmApplicationController app = tcsImport.getCdmAppController(); + ICdmApplicationConfiguration app = tcsImport.getCdmAppController(); FeatureTree tree = getFeatureTree(); app.getFeatureTreeService().saveOrUpdate(tree); -- 2.34.1