merge app-import 3.4 branch into trunk

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

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..eb83aef7f9b204c1994728d66c08e996fe9e1686 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
@@ -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.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.app.images.ImageImportConfigurator;\r
 import eu.etaxonomy.cdm.app.tcs.TcsSources;\r
@@ -120,7 +120,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