Remove BerlinModelImport from Editor

diff --git a/.gitattributes b/.gitattributes
index a949d60be1ebad14be9e8fd1781472285b9cb39d..6aa7c7b2961ce29532d5808fa93bee5ec5746e48 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1096,8 +1096,6 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/Abst
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelImportWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExportWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/BerlinModelExportWizard.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/BerlinModelImportWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/DarwinCoreArchiveExportWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/EndnoteImportWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelNormalExplicitTaxaImportWizard.java -text

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 584332421babc535f26c0ebd192e83d9cb56c277..5b0d4fc6f1e2a33805ca03c3c93bab1f6fc58fb7 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
@@ -30,7 +30,7 @@ public abstract class AbstractIOManager<CONFIGURATOR extends IIoConfigurator> {
        protected ICdmApplicationConfiguration applicationConfiguration;
 
        public static enum TYPE {
-               BerlinModel, Jaxb, Tcs, Excel_Taxa, Endnote, Sdd, Abcd, SpecimenCdmExcel
+               Jaxb, Tcs, Excel_Taxa, Endnote, Sdd, Abcd, SpecimenCdmExcel
        }
 
        /**

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 15b8367849c21f55d5946e141d1e307387e58dbf..64e097cb349bda65d44fca07e5c0f1d378f50cf0 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
@@ -18,7 +18,6 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
 
 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.excel.taxa.NormalExplicitImportConfigurator;
@@ -131,8 +130,6 @@ public class ImportManager extends AbstractIOManager<IImportConfigurator> {
                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:
@@ -154,18 +151,6 @@ public class ImportManager extends AbstractIOManager<IImportConfigurator> {
                }
        }
 
-       /**
-        * <p>
-        * BerlinModelConfigurator
-        * </p>
-        * 
-        * @return a
-        *         {@link eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator}
-        *         object.
-        */
-       public final BerlinModelImportConfigurator BerlinModelConfigurator() {
-               return (BerlinModelImportConfigurator) getConfigurator(TYPE.BerlinModel);
-       }
 
        /**
         * <p>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/BerlinModelExportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/BerlinModelExportWizard.java
deleted file mode 100644 (file)
index c54ac4b..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/BerlinModelExportWizard.java
+++ /dev/null
@@ -1,92 +0,0 @@
-// $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.
-*/
-
-package eu.etaxonomy.taxeditor.io.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-
-import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.cdm.io.berlinModel.out.BerlinModelExportConfigurator;
-import eu.etaxonomy.cdm.io.common.Source;
-import eu.etaxonomy.taxeditor.datasource.wizard.CdmDataSourceSQLServerWizardPage;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-
-/**
- * <p>BerlinModelExportWizard class.</p>
- *
- * @author n.hoffmann
- * @created 23.06.2009
- * @version 1.0
- */
-public class BerlinModelExportWizard extends AbstractExportWizard<BerlinModelExportConfigurator> {
-       
-       private CdmDataSourceSQLServerWizardPage pageDataSource;
-
-
-       private BerlinModelExportConfigurator configurator;
-       
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-        */
-       /** {@inheritDoc} */
-       public void init(IWorkbench workbench, IStructuredSelection selection) {
-               this.setWindowTitle("Berlin Model Export");
-               configurator = BerlinModelExportConfigurator.NewInstance(null, null);
-       }
-       
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.wizard.Wizard#addPages()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public void addPages() {
-               super.addPages();
-               
-               pageDataSource = new CdmDataSourceSQLServerWizardPage(null);
-               this.addPage(pageDataSource);
-               
-
-               
-       }
-       
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.wizard.Wizard#performFinish()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public boolean performFinish() {
-               
-               ICdmDataSource dataSource = pageDataSource.getDataSource();
-               
-               // FIXME use new constructor Source(ICdmDataSource)
-               Source destination = new Source(Source.SQL_SERVER_2005, 
-                                                               dataSource.getServer(),
-                                                               dataSource.getDatabase(),
-                                                               dataSource.getPort());
-               destination.setUserAndPwd(dataSource.getUsername(), dataSource.getPassword());
-               
-               configurator.setDestination(destination);               
-               
-               CdmStore.getExportManager().run(configurator);
-               
-               return true;
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.io.AbstractExportWizard#getConfigurator()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public BerlinModelExportConfigurator getConfigurator() {
-               return configurator;
-       }
-
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/BerlinModelImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/BerlinModelImportWizard.java
deleted file mode 100644 (file)
index 28f0c10..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/BerlinModelImportWizard.java
+++ /dev/null
@@ -1,92 +0,0 @@
-// $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.
-*/
-
-package eu.etaxonomy.taxeditor.io.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-
-import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator;
-import eu.etaxonomy.cdm.io.common.Source;
-import eu.etaxonomy.taxeditor.datasource.wizard.CdmDataSourceSQLServerWizardPage;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-
-/**
- * <p>BerlinModelImportWizard class.</p>
- *
- * @author n.hoffmann
- * @created 24.06.2009
- * @version 1.0
- */
-public class BerlinModelImportWizard extends AbstractImportWizard<BerlinModelImportConfigurator> {
-
-       CdmDataSourceSQLServerWizardPage dataSourcePage;
-       
-       BerlinModelImportConfigurator configurator;
-       
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-        */
-       /** {@inheritDoc} */
-       public void init(IWorkbench workbench, IStructuredSelection selection) {
-               super.init(workbench, selection);
-               configurator =  CdmStore.getImportManager().BerlinModelConfigurator();
-       }
-
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.wizard.Wizard#performFinish()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public boolean performFinish() {
-
-               ICdmDataSource dataSource =null;
-               if(dataSourcePage != null){
-                       dataSource = dataSourcePage.getDataSource();
-               }else{
-                       throw new IllegalStateException("Expected a datasource credentials page to exist");
-               }
-               
-               Source source = new Source(Source.SQL_SERVER_2005, 
-                               dataSource.getServer(),
-                               dataSource.getDatabase(),
-                               dataSource.getPort());
-               source.setUserAndPwd(dataSource.getUsername(), dataSource.getPassword());
-               
-               configurator.setSource(source);
-               
-               CdmStore.getImportManager().run(configurator);
-               
-               return true;
-       }
-
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#addPages()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public void addPages() {
-               super.addPages();
-               
-               dataSourcePage = new CdmDataSourceSQLServerWizardPage(null);
-               addPage(dataSourcePage);
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#getConfigurator()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public BerlinModelImportConfigurator getConfigurator() {
-               return configurator;
-       }
-}