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

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / app / wp6 / cichorieae / TaraxacumActivator.java

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 08337ae47198189099e1d34af1ddef269ab832dc..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.ReferenceBase;\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.TaxonomicTree;\r
 \r
 \r
 /**\r
@@ -130,7 +130,7 @@ public class TaraxacumActivator {
                \r
                BerlinModelImportConfigurator bmImportConfigurator = BerlinModelImportConfigurator.NewInstance(source,  destination);\r
                \r
-               bmImportConfigurator.setTaxonomicTreeUuid(treeUuid);\r
+               bmImportConfigurator.setClassificationUuid(treeUuid);\r
 //             bmImportConfigurator.setSecUuid(secUuid);\r
                bmImportConfigurator.setSourceSecId(sourceSecId);\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
@@ -225,28 +225,28 @@ public class TaraxacumActivator {
                        \r
                        Set<TaxonNode> taxonNodesInTarax = taraxacumInTaraxTaxon.getTaxonNodes();\r
                        \r
-                       TaxonomicTree treeInTaraxacum = null;\r
+                       Classification treeInTaraxacum = null;\r
                        if (taxonNodesInTarax == null || taxonNodesInTarax.isEmpty()) {\r
                                logger.warn("No taxon nodes found for Taraxacum in taraxacum database");\r
                                success = false;\r
                        }else{\r
                                taxonNodeInTarax = taxonNodesInTarax.iterator().next();\r
-                               treeInTaraxacum = taxonNodeInTarax.getTaxonomicTree();\r
+                               treeInTaraxacum = taxonNodeInTarax.getClassification();\r
                        }\r
        \r
                        //TODO reference\r
-                       ReferenceBase citation = null;\r
+                       Reference citation = null;\r
                        String microcitation = null;\r
                        \r
                        taxonNodeInTarax = parentNodeInCich.addChildNode(taxonNodeInTarax, citation, microcitation, null);\r
-                       //parentNodeInCich.getTaxonomicTree().addParentChild(parentInCich, taraxacumInTaraxTaxon, null, null);\r
+                       //parentNodeInCich.getClassification().addParentChild(parentInCich, taraxacumInTaraxTaxon, null, null);\r
                \r
                        parentNodeInCich.deleteChildNode(taxonNodeInCich);\r
                        \r
                        app.getTaxonService().save(parentInCich);\r
                        app.getTaxonService().delete(taraxacumInCichTaxon);\r
                        try {\r
-//                             app.getTaxonTreeService().delete(treeInTaraxacum); //throws exception\r
+//                             app.getClassificationService().delete(treeInTaraxacum); //throws exception\r
                        } catch (Exception e) {\r
                                e.printStackTrace();\r
                                return false;\r