cdmlib classes that were programmed against CdmApplicationController now accept ICdmA...

diff --git a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
index d674201b0e1735be564e701f10709bfe0f516898..75184c9f772468c8e2a7af66190523f756d89fc2 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
+++ b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
@@ -55,7 +55,7 @@ public class GeneratePdfHandler extends AbstractHandler {
                        return null;
                }
                
                        return null;
                }
                

-               configurator = PublishConfigurator.NewLocalInstance(CdmStore.getCurrentApplicationController());
+               configurator = PublishConfigurator.NewLocalInstance(CdmStore.getCurrentApplicationConfiguration());

                
                Element taxonNodeElement = getTaxonNodeElement((TaxonEditorInput) input);
                configurator.addSelectedTaxonNodeElements(taxonNodeElement);
                
                Element taxonNodeElement = getTaxonNodeElement((TaxonEditorInput) input);
                configurator.addSelectedTaxonNodeElements(taxonNodeElement);

diff --git a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java
index 10643417aba98555509e127bab2d8293bd2e99ca..542d2e0878c05119486ebf609f051b436ca21b37 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java
+++ b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java
@@ -148,7 +148,7 @@ public class SelectServiceWizardPage extends AbstractPublishWizardPage {
                label_serviceUrl.setEnabled(false);
                text_serviceUrl.setEnabled(false);
                
                label_serviceUrl.setEnabled(false);
                text_serviceUrl.setEnabled(false);
                

-               setConfigurator(PublishConfigurator.NewLocalInstance(CdmStore.getCurrentApplicationController()));
+               setConfigurator(PublishConfigurator.NewLocalInstance(CdmStore.getCurrentApplicationConfiguration()));

                getConfigurator().addOutputModule(getOutputModule());
        }
        
                getConfigurator().addOutputModule(getOutputModule());
        }
        

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java
index 2c552df0c2447f6754695c1447bdee6e493f0846..c28e5bd132ebc8355e9b7be79b3e7441e0303722 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java
@@ -13,7 +13,7 @@ package eu.etaxonomy.taxeditor.io;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.ui.progress.IProgressConstants;
 
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.ui.progress.IProgressConstants;
 

-import eu.etaxonomy.cdm.api.application.CdmApplicationController;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;

 import eu.etaxonomy.cdm.io.common.IIoConfigurator;
 
 /**
 import eu.etaxonomy.cdm.io.common.IIoConfigurator;
 
 /**


@@ -27,7 +27,7 @@ import eu.etaxonomy.cdm.io.common.IIoConfigurator;
  */
 public abstract class AbstractIOManager<CONFIGURATOR extends IIoConfigurator> {
 
  */
 public abstract class AbstractIOManager<CONFIGURATOR extends IIoConfigurator> {
 

-       protected CdmApplicationController applicationController;
+       protected ICdmApplicationConfiguration applicationConfiguration;

 
        public static enum TYPE {
                BerlinModel, Jaxb, Tcs, Excel_Taxa, Endnote, Sdd, Abcd
 
        public static enum TYPE {
                BerlinModel, Jaxb, Tcs, Excel_Taxa, Endnote, Sdd, Abcd


@@ -45,8 +45,9 @@ public abstract class AbstractIOManager<CONFIGURATOR extends IIoConfigurator> {
         * @param <CONFIGURATOR>
         *            a CONFIGURATOR object.
         */
         * @param <CONFIGURATOR>
         *            a CONFIGURATOR object.
         */

-       protected AbstractIOManager(CdmApplicationController applicationController) {
-               this.applicationController = applicationController;
+       protected AbstractIOManager(
+                       ICdmApplicationConfiguration applicationConfiguration) {
+               this.applicationConfiguration = applicationConfiguration;

        }
 
        /**
        }
 
        /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
index 88093316ea251254506b3a3adc20a50bbe85c87c..1c8ae90b2c610557543d9613beca9ed22cb5220d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
 
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
 

-import eu.etaxonomy.cdm.api.application.CdmApplicationController;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;

 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.io.common.CdmDefaultExport;
 import eu.etaxonomy.cdm.io.common.IExportConfigurator;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.io.common.CdmDefaultExport;
 import eu.etaxonomy.cdm.io.common.IExportConfigurator;


@@ -40,10 +40,10 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> {
 
        /**
         * 
 
        /**
         * 

-        * @param applicationController
+        * @param applicationConfiguration

         */
         */

-       private ExportManager(CdmApplicationController applicationController) {
-               super(applicationController);
+       private ExportManager(ICdmApplicationConfiguration applicationConfiguration) {
+               super(applicationConfiguration);

        }
 
        /**
        }
 
        /**


@@ -51,15 +51,15 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> {
         * NewInstance
         * </p>
         * 
         * NewInstance
         * </p>
         * 

-        * @param applicationController
+        * @param applicationConfiguration

         *            a
         *            {@link eu.etaxonomy.cdm.api.application.CdmApplicationController}
         *            object.
         * @return a {@link eu.etaxonomy.taxeditor.io.ExportManager} object.
         */
        public static ExportManager NewInstance(
         *            a
         *            {@link eu.etaxonomy.cdm.api.application.CdmApplicationController}
         *            object.
         * @return a {@link eu.etaxonomy.taxeditor.io.ExportManager} object.
         */
        public static ExportManager NewInstance(

-                       CdmApplicationController applicationController) {
-               return new ExportManager(applicationController);
+                       ICdmApplicationConfiguration applicationConfiguration) {
+               return new ExportManager(applicationConfiguration);

        }
 
        /**
        }
 
        /**


@@ -102,7 +102,7 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> {
                                CdmDefaultExport<IExportConfigurator> exporter = new CdmDefaultExport<IExportConfigurator>();
                                configurator.setProgressMonitor(CdmProgressMonitorAdapter
                                                .CreateSubMonitor(monitor, 80));
                                CdmDefaultExport<IExportConfigurator> exporter = new CdmDefaultExport<IExportConfigurator>();
                                configurator.setProgressMonitor(CdmProgressMonitorAdapter
                                                .CreateSubMonitor(monitor, 80));

-                               exporter.setCdmAppController(applicationController);
+                               exporter.setCdmAppController(applicationConfiguration);

                                monitor.worked(10);
 
                                try {
                                monitor.worked(10);
 
                                try {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
index d73ab1ae25098fa993330b37cbba0db82817336c..35b4e07313fd3fb2145fa02f724ccb4eb68143e3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
@@ -1,12 +1,12 @@
 // $Id$
 /**
 // $Id$
 /**

-* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
+ * Copyright (C) 2007 EDIT
+ * European Distributed Institute of Taxonomy 
+ * http://www.e-taxonomy.eu
+ * 
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */

 
 package eu.etaxonomy.taxeditor.io;
 
 
 package eu.etaxonomy.taxeditor.io;
 


@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
 
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
 

-import eu.etaxonomy.cdm.api.application.CdmApplicationController;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;

 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.berlinModel.in.BerlinModelImportConfigurator;
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;


@@ -32,8 +32,10 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**

- * <p>ImportHandler class.</p>
- *
+ * <p>
+ * ImportHandler class.
+ * </p>
+ * 

  * @author n.hoffmann
  * @created Sep 11, 2009
  * @version 1.0
  * @author n.hoffmann
  * @created Sep 11, 2009
  * @version 1.0


@@ -41,141 +43,199 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
 public class ImportManager extends AbstractIOManager<IImportConfigurator> {
 
        /**
 public class ImportManager extends AbstractIOManager<IImportConfigurator> {
 
        /**

-        * @param applicationController
+        * @param applicationConfiguration

         */
         */

-       private ImportManager(
-                       CdmApplicationController applicationController) {
-               super(applicationController);
+       private ImportManager(ICdmApplicationConfiguration applicationConfiguration) {
+               super(applicationConfiguration);

        }
        }

-       
+

        /**
        /**

-        * <p>NewInstance</p>
-        *
-        * @param applicationController a {@link eu.etaxonomy.cdm.api.application.CdmApplicationController} object.
+        * <p>
+        * NewInstance
+        * </p>
+        * 
+        * @param applicationConfiguration
+        *            a
+        *            {@link eu.etaxonomy.cdm.api.application.CdmApplicationController}
+        *            object.

         * @return a {@link eu.etaxonomy.taxeditor.io.ImportManager} object.
         */
         * @return a {@link eu.etaxonomy.taxeditor.io.ImportManager} object.
         */

-       public static ImportManager NewInstance(CdmApplicationController applicationController){
-               return new ImportManager(applicationController);
+       public static ImportManager NewInstance(
+                       ICdmApplicationConfiguration applicationConfiguration) {
+               return new ImportManager(applicationConfiguration);

        }
        }

-       
+

        /**
         * Use when importing data into the current application context
        /**
         * Use when importing data into the current application context

-        *
-        * @param configurator a {@link eu.etaxonomy.cdm.io.common.IImportConfigurator} object.
+        * 
+        * @param configurator
+        *            a {@link eu.etaxonomy.cdm.io.common.IImportConfigurator}
+        *            object.

         * @return a {@link org.eclipse.core.runtime.jobs.Job} object.
         */
         * @return a {@link org.eclipse.core.runtime.jobs.Job} object.
         */

-       protected Job createIOJob(final IImportConfigurator configurator){
+       @Override
+       protected Job createIOJob(final IImportConfigurator configurator) {

                Assert.isNotNull(configurator, "Configuration may not be null");
                Assert.isNotNull(configurator, "Configuration may not be null");

-               
+

                final Display display = Display.getDefault();
                final Display display = Display.getDefault();

-               
-               Job job = new Job("Import: " + configurator.getClass().getSimpleName()){
-               
+
+               Job job = new Job("Import: " + configurator.getClass().getSimpleName()) {
+

                        @Override
                        protected IStatus run(IProgressMonitor monitor) {
                                monitor.beginTask("Importing data", 100);
                        @Override
                        protected IStatus run(IProgressMonitor monitor) {
                                monitor.beginTask("Importing data", 100);

-                               configurator.setProgressMonitor(CdmProgressMonitorAdapter.CreateSubMonitor(monitor, 70));
-                               
+                               configurator.setProgressMonitor(CdmProgressMonitorAdapter
+                                               .CreateSubMonitor(monitor, 70));
+

                                monitor.worked(10);
                                monitor.worked(10);

-                               
+

                                CdmDefaultImport<IImportConfigurator> importer = new CdmDefaultImport<IImportConfigurator>();
                                CdmDefaultImport<IImportConfigurator> importer = new CdmDefaultImport<IImportConfigurator>();

-                               importer.setCdmAppController(applicationController);
-                               monitor.worked(10);             
-                               
-                               try{
+                               importer.setCdmAppController(applicationConfiguration);
+                               monitor.worked(10);
+
+                               try {

                                        importer.invoke(configurator);
                                        monitor.worked(60);
                                        importer.invoke(configurator);
                                        monitor.worked(60);

-                               }catch(RuntimeException e){
-                                       StoreUtil.errorDialog("Error importing data", this, "An error occured while" +
-                                                       "importing from source '" + configurator.getSourceNameString() + "'.\n" +
-                                                                       "Please check error log for details.", e);
+                               } catch (RuntimeException e) {
+                                       StoreUtil.errorDialog(
+                                                       "Error importing data",
+                                                       this,
+                                                       "An error occured while"
+                                                                       + "importing from source '"
+                                                                       + configurator.getSourceNameString()
+                                                                       + "'.\n"
+                                                                       + "Please check error log for details.", e);

                                }
                                }

-                               
+

                                monitor.worked(10);
                                monitor.done();
                                monitor.worked(10);
                                monitor.done();

-                               
+

                                display.asyncExec(new Runnable() {
                                display.asyncExec(new Runnable() {

-                                       
+

                                        @Override
                                        public void run() {
                                                CdmStore.getContextManager().notifyContextRefresh();
                                        }
                                });
                                        @Override
                                        public void run() {
                                                CdmStore.getContextManager().notifyContextRefresh();
                                        }
                                });

-                               
+

                                return Status.OK_STATUS;
                        }
                };
                                return Status.OK_STATUS;
                        }
                };

-               
+

                return job;
                return job;

-               
+

        }
 
        }
 

-       private IImportConfigurator getConfigurator(TYPE type){
+       private IImportConfigurator getConfigurator(TYPE type) {

                Assert.isNotNull(type, "Type should not be null");
                Assert.isNotNull(type, "Type should not be null");

-               
-               switch(type){
-                       case BerlinModel:
-                               return BerlinModelImportConfigurator.NewInstance(null, null);   
-                       case Jaxb:
-                               return JaxbImportConfigurator.NewInstance(null, null);
-                       case Tcs:
-                               return TcsXmlImportConfigurator.NewInstance(null, null);
-                       case Endnote:
-                               return EndnoteImportConfigurator.NewInstance(null, null);
-                       case Excel_Taxa:
-                               return NormalExplicitImportConfigurator.NewInstance(null, null, null);
-                       case Abcd:
-                               return Abcd206ImportConfigurator.NewInstance(null, null);
-                       case Sdd:
-                               return SDDImportConfigurator.NewInstance(null, null);
-                       default:
-                               StoreUtil.notImplementedMessage(this);
-                               throw new IllegalArgumentException("Import not supported yet");
+
+               switch (type) {
+               case BerlinModel:
+                       return BerlinModelImportConfigurator.NewInstance(null, null);
+               case Jaxb:
+                       return JaxbImportConfigurator.NewInstance(null, null);
+               case Tcs:
+                       return TcsXmlImportConfigurator.NewInstance(null, null);
+               case Endnote:
+                       return EndnoteImportConfigurator.NewInstance(null, null);
+               case Excel_Taxa:
+                       return NormalExplicitImportConfigurator.NewInstance(null, null,
+                                       null);
+               case Abcd:
+                       return Abcd206ImportConfigurator.NewInstance(null, null);
+               case Sdd:
+                       return SDDImportConfigurator.NewInstance(null, null);
+               default:
+                       StoreUtil.notImplementedMessage(this);
+                       throw new IllegalArgumentException("Import not supported yet");

                }
        }
                }
        }

-       
+

        /**
        /**

-        * <p>BerlinModelConfigurator</p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator} object.
+        * <p>
+        * BerlinModelConfigurator
+        * </p>
+        * 
+        * @return a
+        *         {@link eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator}
+        *         object.

         */
         */

-       public final BerlinModelImportConfigurator BerlinModelConfigurator() { return (BerlinModelImportConfigurator) getConfigurator(TYPE.BerlinModel);        }
+       public final BerlinModelImportConfigurator BerlinModelConfigurator() {
+               return (BerlinModelImportConfigurator) getConfigurator(TYPE.BerlinModel);
+       }
+

        /**
        /**

-        * <p>JaxbConfigurator</p>
-        *
+        * <p>
+        * JaxbConfigurator
+        * </p>
+        * 

         * @return a {@link eu.etaxonomy.cdm.io.jaxb.JaxbImportConfigurator} object.
         */
         * @return a {@link eu.etaxonomy.cdm.io.jaxb.JaxbImportConfigurator} object.
         */

-       public final JaxbImportConfigurator JaxbConfigurator() { return (JaxbImportConfigurator) getConfigurator(TYPE.Jaxb);    }
+       public final JaxbImportConfigurator JaxbConfigurator() {
+               return (JaxbImportConfigurator) getConfigurator(TYPE.Jaxb);
+       }
+

        /**
        /**

-        * <p>TcsConfigurator</p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.io.tcsxml.in.TcsXmlImportConfigurator} object.
+        * <p>
+        * TcsConfigurator
+        * </p>
+        * 
+        * @return a {@link eu.etaxonomy.cdm.io.tcsxml.in.TcsXmlImportConfigurator}
+        *         object.

         */
         */

-       public final TcsXmlImportConfigurator TcsConfigurator() { return (TcsXmlImportConfigurator) getConfigurator(TYPE.Tcs);  }
+       public final TcsXmlImportConfigurator TcsConfigurator() {
+               return (TcsXmlImportConfigurator) getConfigurator(TYPE.Tcs);
+       }
+

        /**
        /**

-        * <p>EndnoteConfigurator</p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.io.reference.endnote.in.EndnoteImportConfigurator} object.
+        * <p>
+        * EndnoteConfigurator
+        * </p>
+        * 
+        * @return a
+        *         {@link eu.etaxonomy.cdm.io.reference.endnote.in.EndnoteImportConfigurator}
+        *         object.

         */
         */

-       public final EndnoteImportConfigurator EndnoteConfigurator() { return (EndnoteImportConfigurator) getConfigurator(TYPE.Endnote);   }
+       public final EndnoteImportConfigurator EndnoteConfigurator() {
+               return (EndnoteImportConfigurator) getConfigurator(TYPE.Endnote);
+       }
+

        /**
        /**

-        * <p>NormalExplicitConfigurator</p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator} object.
+        * <p>
+        * NormalExplicitConfigurator
+        * </p>
+        * 
+        * @return a
+        *         {@link eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator}
+        *         object.

         */
         */

-       public final NormalExplicitImportConfigurator NormalExplicitConfigurator() { return (NormalExplicitImportConfigurator) getConfigurator(TYPE.Excel_Taxa); }
+       public final NormalExplicitImportConfigurator NormalExplicitConfigurator() {
+               return (NormalExplicitImportConfigurator) getConfigurator(TYPE.Excel_Taxa);
+       }
+

        /**
        /**

-        * <p>SddConfigurator</p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.io.sdd.in.SDDImportConfigurator} object.
+        * <p>
+        * SddConfigurator
+        * </p>
+        * 
+        * @return a {@link eu.etaxonomy.cdm.io.sdd.in.SDDImportConfigurator}
+        *         object.

         */
         */

-       public final SDDImportConfigurator SddConfigurator() { return (SDDImportConfigurator) getConfigurator(TYPE.Sdd); }
+       public final SDDImportConfigurator SddConfigurator() {
+               return (SDDImportConfigurator) getConfigurator(TYPE.Sdd);
+       }
+

        /**
        /**

-        * <p>AbcdConfigurator</p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator} object.
+        * <p>
+        * AbcdConfigurator
+        * </p>
+        * 
+        * @return a
+        *         {@link eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator}
+        *         object.

         */
         */

-       public final Abcd206ImportConfigurator AbcdConfigurator() { return (Abcd206ImportConfigurator) getConfigurator(TYPE.Abcd); }
-       
-       
+       public final Abcd206ImportConfigurator AbcdConfigurator() {
+               return (Abcd206ImportConfigurator) getConfigurator(TYPE.Abcd);
+       }
+

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
index d50975265722fd80ad37853aa615eece72bcad7c..0e92c436d41db5ce256ec23913854faea37184ae 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
@@ -130,7 +130,7 @@ public class ExternalReferenceServiceWizardPage extends WizardPage implements Se
        @Override
        public void widgetSelected(SelectionEvent e) {
                String query = text_query.getText();
        @Override
        public void widgetSelected(SelectionEvent e) {
                String query = text_query.getText();

-               List<Reference> publications = ipniService.getPublications(query, null, (ICdmApplicationConfiguration) CdmStore.getCurrentApplicationController(), null);
+               List<Reference> publications = ipniService.getPublications(query, null, (ICdmApplicationConfiguration) CdmStore.getCurrentApplicationConfiguration(), null);

                viewer.setInput(publications);
        }
 
                viewer.setInput(publications);
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index b0492bf8453503fb106d28521f83a29f4fe8e181..bc9b11d928337d6089b56f4c293112a960a9f00e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -56,7 +56,7 @@ public class CdmStore {
 
        private static CdmStore instance;
 
 
        private static CdmStore instance;
 

-       private final CdmApplicationController applicationController;
+       private final ICdmApplicationConfiguration applicationConfiguration;

 
        private static LoginManager loginManager = new LoginManager();
 
 
        private static LoginManager loginManager = new LoginManager();
 


@@ -166,9 +166,6 @@ public class CdmStore {
                                getContextManager().notifyContextAboutToStop(monitor);
                                if ((monitor == null || (!monitor.isCanceled()) && isActive())) {
                                        getContextManager().notifyContextStop(monitor);
                                getContextManager().notifyContextAboutToStop(monitor);
                                if ((monitor == null || (!monitor.isCanceled()) && isActive())) {
                                        getContextManager().notifyContextStop(monitor);

-                                       if (instance.getApplicationController() != null) {
-                                               instance.getApplicationController().close();
-                                       }

                                        instance.close();
                                }
                        }
                                        instance.close();
                                }
                        }


@@ -187,7 +184,7 @@ public class CdmStore {
 
        private CdmStore(CdmApplicationController applicationController,
                        ICdmDataSource dataSource) {
 
        private CdmStore(CdmApplicationController applicationController,
                        ICdmDataSource dataSource) {

-               this.applicationController = applicationController;
+               this.applicationConfiguration = applicationController;

                this.cdmDatasource = dataSource;
                isConnected = true;
        }
                this.cdmDatasource = dataSource;
                isConnected = true;
        }


@@ -197,9 +194,9 @@ public class CdmStore {
         * 
         * @return
         */
         * 
         * @return
         */

-       private CdmApplicationController getApplicationController() {
+       private ICdmApplicationConfiguration getApplicationConfiguration() {

                try {
                try {

-                       return applicationController;
+                       return applicationConfiguration;

                } catch (Exception e) {
                        StoreUtil.error(CdmStore.class, e);
                }
                } catch (Exception e) {
                        StoreUtil.error(CdmStore.class, e);
                }


@@ -215,9 +212,9 @@ public class CdmStore {
         *         {@link eu.etaxonomy.cdm.api.application.CdmApplicationController}
         *         object.
         */
         *         {@link eu.etaxonomy.cdm.api.application.CdmApplicationController}
         *         object.
         */

-       public static CdmApplicationController getCurrentApplicationController() {
+       public static ICdmApplicationConfiguration getCurrentApplicationConfiguration() {

                if (getDefault() != null) {
                if (getDefault() != null) {

-                       return getDefault().getApplicationController();
+                       return getDefault().getApplicationConfiguration();

                }
                return null;
        }
                }
                return null;
        }


@@ -234,7 +231,7 @@ public class CdmStore {
         *         object.
         */
        public static ConversationHolder createConversation() {
         *         object.
         */
        public static ConversationHolder createConversation() {

-               ConversationHolder conversation = getCurrentApplicationController()
+               ConversationHolder conversation = getCurrentApplicationConfiguration()

                                .NewConversation();
 
                conversation.startTransaction();
                                .NewConversation();
 
                conversation.startTransaction();


@@ -250,7 +247,7 @@ public class CdmStore {
         * @return
         */
        public static <T extends IService> T getService(Class<T> serviceClass) {
         * @return
         */
        public static <T extends IService> T getService(Class<T> serviceClass) {

-               ICdmApplicationConfiguration configuration = getCurrentApplicationController();
+               ICdmApplicationConfiguration configuration = getCurrentApplicationConfiguration();

 
                Method[] methods = ICdmApplicationConfiguration.class
                                .getDeclaredMethods();
 
                Method[] methods = ICdmApplicationConfiguration.class
                                .getDeclaredMethods();


@@ -287,7 +284,7 @@ public class CdmStore {
         *         object.
         */
        public static ProviderManager getAuthenticationManager() {
         *         object.
         */
        public static ProviderManager getAuthenticationManager() {

-               return getCurrentApplicationController().getAuthenticationManager();
+               return getCurrentApplicationConfiguration().getAuthenticationManager();

        }
 
        /**
        }
 
        /**


@@ -298,7 +295,7 @@ public class CdmStore {
         * @return a {@link eu.etaxonomy.cdm.ext.geo.IEditGeoService} object.
         */
        public static IEditGeoService getGeoService() {
         * @return a {@link eu.etaxonomy.cdm.ext.geo.IEditGeoService} object.
         */
        public static IEditGeoService getGeoService() {

-               return (IEditGeoService) getCurrentApplicationController().getBean(
+               return (IEditGeoService) getCurrentApplicationConfiguration().getBean(

                                "editGeoService");
        }
 
                                "editGeoService");
        }
 


@@ -397,7 +394,7 @@ public class CdmStore {
         * @return a {@link eu.etaxonomy.taxeditor.io.ImportManager} object.
         */
        public static ImportManager getImportManager() {
         * @return a {@link eu.etaxonomy.taxeditor.io.ImportManager} object.
         */
        public static ImportManager getImportManager() {

-               return ImportManager.NewInstance(getCurrentApplicationController());
+               return ImportManager.NewInstance(getCurrentApplicationConfiguration());

        }
 
        /**
        }
 
        /**


@@ -408,7 +405,7 @@ public class CdmStore {
         * @return a {@link eu.etaxonomy.taxeditor.io.ExportManager} object.
         */
        public static ExportManager getExportManager() {
         * @return a {@link eu.etaxonomy.taxeditor.io.ExportManager} object.
         */
        public static ExportManager getExportManager() {

-               return ExportManager.NewInstance(getCurrentApplicationController());
+               return ExportManager.NewInstance(getCurrentApplicationConfiguration());

        }
 
        /**
        }
 
        /**