From: Andreas Müller Date: Mon, 21 Oct 2013 14:05:39 +0000 (+0000) Subject: Remove BerlinModelImport from Editor X-Git-Tag: 3.6.0~936 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/f7ad52093a97800b4bf90ee0e8182b5b6bb7ee2b?ds=sidebyside Remove BerlinModelImport from Editor --- diff --git a/.gitattributes b/.gitattributes index a949d60be..6aa7c7b29 100644 --- 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 584332421..5b0d4fc6f 100644 --- 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 { 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 15b836784..64e097cb3 100644 --- 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 { 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 { } } - /** - *

- * BerlinModelConfigurator - *

- * - * @return a - * {@link eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator} - * object. - */ - public final BerlinModelImportConfigurator BerlinModelConfigurator() { - return (BerlinModelImportConfigurator) getConfigurator(TYPE.BerlinModel); - } /** *

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 index c54ac4ba4..000000000 --- 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; - -/** - *

BerlinModelExportWizard class.

- * - * @author n.hoffmann - * @created 23.06.2009 - * @version 1.0 - */ -public class BerlinModelExportWizard extends AbstractExportWizard { - - 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 index 28f0c1035..000000000 --- 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; - -/** - *

BerlinModelImportWizard class.

- * - * @author n.hoffmann - * @created 24.06.2009 - * @version 1.0 - */ -public class BerlinModelImportWizard extends AbstractImportWizard { - - 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; - } -}