Use interface type for get/setCdmAppController in CdmDefaultIOBase (#2347)

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 ab634a23663d9355d20aa0322742b4f2c942a6d3..f49855d8d576d655862b72ad81de3bd5e8bd7af1 100644 (file)
--- 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;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
@@ -169,7 +170,7 @@ public class CampanulaceaeActivator {
                success &= bmImport.invoke(bmImportConfigurator);\r
                \r
                if (doFacts && (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) )   ){\r
-                       CdmApplicationController app = bmImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = bmImport.getCdmAppController();\r
                        \r
                        //make feature tree\r
                        FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList);\r

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 7aee84b2e454cf33511370bf6a536c54f1090476..e67f4d591e768bad64872e132298712a30b94ab4 100644 (file)
--- 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;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.app.pesi.FaunaEuropaeaActivator;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
@@ -156,7 +156,7 @@ public class IldisActivator {
                success &= bmImport.invoke(bmImportConfigurator);\r
                \r
                if (doFacts && (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) )   ){\r
-                       CdmApplicationController app = bmImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = bmImport.getCdmAppController();\r
                        \r
                        //make feature tree\r
                        FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList);\r

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 bcf7515e96a32f295e7df35bd038b7c24285cb92..c34faba00307ddcb00a0dc59a84f51dd798d2fbb 100644 (file)
--- 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;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
@@ -99,7 +100,7 @@ public class CyprusActivator {
                \r
                //deduplicate\r
                if (doDeduplicate){\r
-                       CdmApplicationController app = myImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = myImport.getCdmAppController();\r
                        int count = app.getAgentService().deduplicate(Person.class, null, null);\r
                        logger.warn("Deduplicated " + count + " persons.");\r
 //                     count = app.getAgentService().deduplicate(Team.class, null, null);\r

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 7b1d55c7fac1c76690d05a47fc029dab59593b3d..ded0eb6f6d1aacf2661f47c2ca811627075d66b9 100644 (file)
--- 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 {
 \r
        private static List<UUID> featureExclusions = Arrays.asList(new UUID[]{\r
                        UUID.fromString("5deff505-1a32-4817-9a74-50e6936fd630"),   //occurrences\r
-                       UUID.fromString("8075074c-ace8-496b-ac82-47c14553f7fd")    //Editor_Parenthesis\r
+                       UUID.fromString("8075074c-ace8-496b-ac82-47c14553f7fd"),    //Editor_Parenthesis\r
+                       UUID.fromString("c0cc5ebe-1f0c-4c31-af53-d486858ea415")   //Image Sources\r
        });\r
        \r
        \r

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 8a439713ebd675103d72dbfb579d28f7bfc589bd..ac0e8509701492249c24764dd485d9298b037cc1 100644 (file)
--- 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;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.common.DefaultProgressMonitor;\r
@@ -132,7 +133,7 @@ public class CentralAfricaEricaceaeActivator {
                \r
                //deduplicate\r
                if (doDeduplicate){\r
-                       CdmApplicationController app = myImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = myImport.getCdmAppController();\r
                        int count = app.getAgentService().deduplicate(Person.class, null, null);\r
                        logger.warn("Deduplicated " + count + " persons.");\r
 //                     count = app.getAgentService().deduplicate(Team.class, null, null);\r

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 265d1c2016cdb85fcde4fdf107d5fd3e612ed9df..40f7e0ad7998b6d14ab503efa72508816f3d17f0 100644 (file)
--- 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;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.app.common.CdmImportSources;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;\r
-import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES;\r
+import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.io.globis.GlobisImportConfigurator;\r
 import eu.etaxonomy.cdm.model.common.ISourceable;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
@@ -110,7 +110,7 @@ public class GlobisActivator {
                globisImport.invoke(config);\r
                \r
                if (config.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || config.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK)    ){\r
-                       CdmApplicationController app = globisImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = globisImport.getCdmAppController();\r
                        ISourceable obj = app.getCommonService().getSourcedObjectByIdInSource(ZoologicalName.class, "1000027", null);\r
                        logger.info(obj);\r
                        \r

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 8746d9a895ca26c9768be86941821505c09462e4..37c3ed1ad212a44880cea2335f46eaba9c468e75 100644 (file)
--- 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;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
-import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;\r
-import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES;\r
+import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.model.common.ISourceable;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
@@ -138,7 +137,7 @@ public class ErmsActivator {
                bmImport.invoke(bmImportConfigurator);\r
                \r
                if (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK)    ){\r
-                       CdmApplicationController app = bmImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = bmImport.getCdmAppController();\r
                        ISourceable obj = app.getCommonService().getSourcedObjectByIdInSource(ZoologicalName.class, "1000027", null);\r
                        logger.info(obj);\r
                        \r

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 05e3baea6660d695a30909b31f1d9bc4957fa3e0..435d491c727b84e35adc39c65b04b633c45e8943 100644 (file)
--- 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;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources;\r
 import eu.etaxonomy.cdm.app.berlinModelImport.TreeCreator;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
@@ -21,10 +21,10 @@ import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;\r
-import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.EDITOR;\r
+import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
 import eu.etaxonomy.cdm.model.description.FeatureTree;\r
@@ -177,7 +177,7 @@ public class EuroMedActivator {
                bmImport.invoke(bmImportConfigurator);\r
                \r
                if (doFacts && bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK)    ){\r
-                       CdmApplicationController app = bmImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = bmImport.getCdmAppController();\r
                        \r
                        //make feature tree\r
                        FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList);\r

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 80b95f2231a04a2e4926d5014bd4b3f3efdbedef..693fefc48f7581ab494fed96acdbd234ca925505 100644 (file)
--- 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;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
+import eu.etaxonomy.cdm.io.common.CdmDefaultImport;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES;\r
-import eu.etaxonomy.cdm.io.common.CdmDefaultImport;\r
 import eu.etaxonomy.cdm.io.common.Source;\r
-\r
 import eu.etaxonomy.cdm.io.pesi.faunaEuropaea.FaunaEuropaeaImportConfigurator;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
@@ -33,6 +32,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
  * @created 12.05.2009\r
  */\r
 public class FaunaEuropaeaActivator {\r
+       @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(FaunaEuropaeaActivator.class);\r
 \r
        static final Source faunaEuropaeaSource = FaunaEuropaeaSources.faunaEu_1_3();\r
@@ -147,7 +147,7 @@ public class FaunaEuropaeaActivator {
                        FeatureTree featureTree = FeatureTree.NewInstance(UUID.fromString("ff59b9ad-1fb8-4aa4-a8ba-79d62123d0fb"));\r
                        FeatureNode root = featureTree.getRoot();\r
 \r
-                       CdmApplicationController app = fauEuImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = fauEuImport.getCdmAppController();\r
                        Feature citationFeature = (Feature)app.getTermService().find(UUID.fromString("99b2842f-9aa7-42fa-bd5f-7285311e0101"));\r
                        FeatureNode citationNode = FeatureNode.NewInstance(citationFeature);\r
                        root.addChild(citationNode);\r

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 9b0a76d9ccc0d8280f449edc48b2386c02424943..f3ffa32934b40ed73df8d8c55d2793ae4c821896 100644 (file)
--- 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;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.app.pesi.FaunaEuropaeaSources;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;\r
-import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES;\r
+import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.io.pesi.erms.ErmsImportConfigurator;\r
 import eu.etaxonomy.cdm.model.common.ISourceable;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
@@ -119,7 +119,7 @@ public class ErmsActivator {
                ermsImport.invoke(ermsImportConfigurator);\r
                \r
                if (ermsImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || ermsImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK)    ){\r
-                       CdmApplicationController app = ermsImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = ermsImport.getCdmAppController();\r
                        ISourceable obj = app.getCommonService().getSourcedObjectByIdInSource(ZoologicalName.class, "1000027", null);\r
                        logger.info(obj);\r
                        \r

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 b06acac3db8e1f6f23a957e770bbaa10db3895b2..ba5a8cfa2450ebf403334a02e0503aba214a41ac 100644 (file)
--- 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));\r
                        book.setDatePublished(TimePeriod.NewInstance(1945).setEndDay(12).setEndMonth(4));\r
                        refService.saveOrUpdate((Reference)book);\r
-                       tcsImport.getCdmAppController().close();\r
                        logger.info("End");\r
                        System.out.println("End import from TCS ("+ source.toString() + ")...");\r
                } catch (URISyntaxException e) {\r

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 3d71fc226cf55369b183e231e86b9aff53aea914..3c0ec28b9f3b39d70dfad8733a652137c70c99fc 100644 (file)
--- 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;\r
 import org.springframework.transaction.TransactionStatus;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.app.eflora.EfloraSources;\r
 import eu.etaxonomy.cdm.common.DefaultProgressMonitor;\r
@@ -90,7 +90,7 @@ public class EricaceaeTestUpdateActivator {
                \r
                CdmDefaultImport<EfloraImportConfigurator> myImport = new CdmDefaultImport<EfloraImportConfigurator>();\r
                \r
-               CdmApplicationController app = myImport.getCdmAppController();\r
+               ICdmApplicationConfiguration app = myImport.getCdmAppController();\r
                \r
                \r
                //\r
@@ -120,7 +120,7 @@ public class EricaceaeTestUpdateActivator {
         * @param app\r
         * @param tree\r
         */\r
-       private void moveChild(CdmApplicationController 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

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 90f61c6aee0f0eed18264437bc780fb293835fb0..d4c27e4e28f82574d059a549da91d70cf16b4750 100644 (file)
--- 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;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources;\r
 import eu.etaxonomy.cdm.app.berlinModelImport.TreeCreator;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
@@ -26,10 +26,10 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
-import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.EDITOR;\r
+import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.io.wp6.CichorieaeImageImport;\r
 import eu.etaxonomy.cdm.model.common.ISourceable;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
@@ -218,7 +218,7 @@ public class CichorieaeActivator {
                success &= bmImport.invoke(bmImportConfigurator);\r
                \r
                if (doFacts && (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) )   ){\r
-                       CdmApplicationController app = bmImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = bmImport.getCdmAppController();\r
                        ISourceable obj = app.getCommonService().getSourcedObjectByIdInSource(ZoologicalName.class, "1000027", null);\r
                        logger.info(obj);\r
                        \r

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 91776891b35d4844556f151453d8c064159148e6..4bc52b29b090cd512b1be12fb33151dd2dc95ff8 100644 (file)
--- 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;\r
 import org.springframework.transaction.TransactionStatus;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;\r
-import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES;\r
+import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
+import eu.etaxonomy.cdm.model.taxon.Classification;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
-import eu.etaxonomy.cdm.model.taxon.Classification;\r
 \r
 \r
 /**\r
@@ -174,7 +174,7 @@ public class TaraxacumActivator {
                success &= bmImport.invoke(bmImportConfigurator);\r
                \r
                if (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK)    ){\r
-                       CdmApplicationController app = bmImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = bmImport.getCdmAppController();\r
                        TransactionStatus tx = app.startTransaction();\r
                        //make feature tree\r
 //                     FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList);\r
@@ -193,7 +193,7 @@ public class TaraxacumActivator {
        }\r
        \r
        \r
-       public boolean mergeIntoCichorieae(CdmApplicationController app){\r
+       public boolean mergeIntoCichorieae(ICdmApplicationConfiguration app){\r
                boolean success = true;\r
        //      String taraxTaraxacumUuidStr = "9a7bced0-fa1a-432e-9cca-57b62219cde6";\r
                String taraxTaraxacumUuidStr = "b86f1156-091c-494d-a9c9-c84d71058f98";\r

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 aec7450181560185e4c71f90547575e6c19059a8..592540e08326b80759810b421b2778bbcbb6a1d9 100644 (file)
--- 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;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources;\r
 import eu.etaxonomy.cdm.app.berlinModelImport.TreeCreator;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
@@ -183,7 +184,7 @@ public class DipteraActivator {
                success &= bmImport.invoke(bmImportConfigurator);\r
                \r
                if (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK)    ){\r
-                       CdmApplicationController app = bmImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = bmImport.getCdmAppController();\r
                        \r
                        //parse distributions\r
                        if (doDistributionParser){\r

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 4ab95169b1ef46b15bf897c50e58a97bbc42a863..b8e45ed6aed79463142e81787f10c99687998880 100644 (file)
--- 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;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
@@ -57,7 +58,7 @@ public class DipteraDistributionParser {
        final static String epiSplitter = "(\\s+|\\[|\\]|\\(|\\))"; //( ' '+| '(' | ')'| '[' | ']' )\r
        static Pattern pattern = null;\r
        \r
-       protected void doDistribution(CdmApplicationController app){\r
+       protected void doDistribution(ICdmApplicationConfiguration app){\r
                pattern = Pattern.compile(epiSplitter); \r
            TransactionStatus txStatus = app.startTransaction();\r
                List<TaxonBase> taxa = app.getTaxonService().list(null, null, null, null, null);\r

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 9895c1793fd41bc22269e7b9eab7f9b2edea4b15..b9d6fe3cc0057c423019f4adf44d7cd95b64214c 100644 (file)
--- 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;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.app.images.ImageImportConfigurator;\r
 import eu.etaxonomy.cdm.app.tcs.TcsSources;\r
@@ -120,7 +121,7 @@ public class PalmaeActivator {
                        \r
                        //make feature tree\r
                        logger.info("Make feature tree");\r
-                       CdmApplicationController app = tcsImport.getCdmAppController();\r
+                       ICdmApplicationConfiguration app = tcsImport.getCdmAppController();\r
                        \r
                        FeatureTree tree = getFeatureTree();\r
                        app.getFeatureTreeService().saveOrUpdate(tree);\r