From 549acd3469484c51c53fa1dc7ebe5b5c6a1d434a Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Wed, 23 Sep 2009 09:16:58 +0000 Subject: [PATCH] endnote and excel import added. fixes #779 --- .gitattributes | 16 -- .../io/AbstractExcelExportWizard.java | 44 ----- .../io/AbstractExcelImportWizard.java | 44 ----- .../taxeditor/io/AbstractExportWizard.java | 67 ------- .../taxeditor/io/AbstractIOHandler.java | 2 +- .../taxeditor/io/AbstractImportWizard.java | 175 ----------------- .../taxeditor/io/BerlinModelExportWizard.java | 89 --------- .../taxeditor/io/BerlinModelImportWizard.java | 91 --------- .../taxeditor/io/EndnoteImportWizard.java | 80 -------- .../io/ExportToFileDestinationWizardPage.java | 159 --------------- .../io/GenericConfiguratorWizardPage.java | 184 ------------------ .../ImportFromFileDataSourceWizardPage.java | 113 ----------- .../etaxonomy/taxeditor/io/ImportHandler.java | 37 ++-- .../taxeditor/io/JaxbExportWizard.java | 77 -------- .../io/JaxbImportSourceWizardPage.java | 41 ---- .../taxeditor/io/JaxbImportWizard.java | 44 ----- .../io/NomenclaturalCodeWizardPage.java | 91 --------- .../taxeditor/io/TcsExportWizard.java | 74 ------- .../taxeditor/io/TcsImportWizard.java | 79 -------- 19 files changed, 22 insertions(+), 1485 deletions(-) delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExcelExportWizard.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExcelImportWizard.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExportWizard.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractImportWizard.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelExportWizard.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelImportWizard.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/EndnoteImportWizard.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ExportToFileDestinationWizardPage.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/GenericConfiguratorWizardPage.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportFromFileDataSourceWizardPage.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbExportWizard.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbImportSourceWizardPage.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbImportWizard.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/NomenclaturalCodeWizardPage.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/TcsExportWizard.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/TcsImportWizard.java diff --git a/.gitattributes b/.gitattributes index 082637398..beb8d0062 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1053,25 +1053,9 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/UriDialog.java -tex taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowDataSourceViewHandler.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowLoginWindowHandler.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowUserManagerViewHandler.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExcelExportWizard.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExcelImportWizard.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExportWizard.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOHandler.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractImportWizard.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelExportWizard.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelImportWizard.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/EndnoteImportWizard.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ExportHandler.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ExportToFileDestinationWizardPage.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/GenericConfiguratorWizardPage.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportFromFileDataSourceWizardPage.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportHandler.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbExportWizard.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbImportSourceWizardPage.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbImportWizard.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/NomenclaturalCodeWizardPage.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/TcsExportWizard.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/TcsImportWizard.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelExportWizard.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelImportWizard.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExportWizard.java -text diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExcelExportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExcelExportWizard.java deleted file mode 100644 index 55c47921b..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExcelExportWizard.java +++ /dev/null @@ -1,44 +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; - -import org.apache.log4j.Logger; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.ui.IExportWizard; -import org.eclipse.ui.IWorkbench; - -/** - * @author n.hoffmann - * @created 15.06.2009 - * @version 1.0 - */ -public class AbstractExcelExportWizard extends Wizard implements IExportWizard { - private static final Logger logger = Logger - .getLogger(AbstractExcelExportWizard.class); - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @Override - public boolean performFinish() { - // TODO Auto-generated method stub - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ - public void init(IWorkbench workbench, IStructuredSelection selection) { - // TODO Auto-generated method stub - - } -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExcelImportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExcelImportWizard.java deleted file mode 100644 index bae6c2485..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExcelImportWizard.java +++ /dev/null @@ -1,44 +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; - -import org.apache.log4j.Logger; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.ui.IImportWizard; -import org.eclipse.ui.IWorkbench; - -/** - * @author n.hoffmann - * @created 15.06.2009 - * @version 1.0 - */ -public class AbstractExcelImportWizard extends Wizard implements IImportWizard { - private static final Logger logger = Logger - .getLogger(AbstractExcelImportWizard.class); - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @Override - public boolean performFinish() { - // TODO Auto-generated method stub - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ - public void init(IWorkbench workbench, IStructuredSelection selection) { - // TODO Auto-generated method stub - - } -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExportWizard.java deleted file mode 100644 index ed06186e0..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractExportWizard.java +++ /dev/null @@ -1,67 +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; - -import org.apache.log4j.Logger; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.ui.IExportWizard; - -import eu.etaxonomy.cdm.io.common.CdmDefaultExport; -import eu.etaxonomy.cdm.io.common.IExportConfigurator; -import eu.etaxonomy.cdm.io.common.IIoConfigurator; - -/** - * @author n.hoffmann - * @created 24.06.2009 - * @version 1.0 - */ -public abstract class AbstractExportWizard extends Wizard implements IExportWizard{ - private static final Logger logger = Logger - .getLogger(AbstractExportWizard.class); - - protected final String CONFIGURATION_PAGE = "CONFIGURATION_PAGE"; - - private GenericConfiguratorWizardPage pageConfiguration; - - private CdmDefaultExport export; - - public boolean doExport(final IExportConfigurator configurator){ - export = new CdmDefaultExport(); - - Job exportJob = new Job("Export"){ - @Override - protected IStatus run(IProgressMonitor monitor) { - return export.invoke(configurator) ? Status.OK_STATUS : Status.CANCEL_STATUS; - } - }; - - exportJob.schedule(); - - return true; - } - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#addPages() - */ - @Override - public void addPages() { - super.addPages(); - - pageConfiguration = GenericConfiguratorWizardPage.Export(CONFIGURATION_PAGE, getConfigurator()); - this.addPage(pageConfiguration); - } - - public abstract CONFIG getConfigurator(); -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOHandler.java index 2196ced51..79be116c6 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOHandler.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOHandler.java @@ -26,7 +26,7 @@ public abstract class AbstractIOHandler { protected CdmApplicationController applicationController; public static enum TYPE { - BerlinModel, Jaxb, Tcs, Excel, Endnote + BerlinModel, Jaxb, Tcs, Excel_Taxa, Endnote } protected AbstractIOHandler(CdmApplicationController applicationController){ diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractImportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractImportWizard.java deleted file mode 100644 index 4ae4e769c..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractImportWizard.java +++ /dev/null @@ -1,175 +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; - -import org.apache.log4j.Logger; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.ui.IImportWizard; - -import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; -import eu.etaxonomy.cdm.io.common.CdmDefaultImport; -import eu.etaxonomy.cdm.io.common.IImportConfigurator; -import eu.etaxonomy.cdm.io.common.IIoConfigurator; -import eu.etaxonomy.taxeditor.store.StoreUtil; - -/** - * @author n.hoffmann - * @created 24.06.2009 - * @version 1.0 - */ -public abstract class AbstractImportWizard extends Wizard implements IImportWizard { - private static final Logger logger = Logger - .getLogger(AbstractImportWizard.class); - - protected final String CONFIGURATION_PAGE = "CONFIGURATION_PAGE"; - - private GenericConfiguratorWizardPage pageConfiguration; - private NomenclaturalCodeWizardPage pageNomenclaturalCode; - - private CdmDefaultImport importer; - - /** - * Performs an import into a new database. The application context has to be changed - * @param configurator - * @return - */ - public boolean doImportExternal(IImportConfigurator configurator){ - - -// try { -// ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager(); -// ILaunchConfigurationType type = manager.getLaunchConfigurationType(ID_JAVA_APPLICATION); -// ILaunchConfiguration[] configurations = manager.getLaunchConfigurations(type); -// -// // delete possible prior launch configurations -// for (ILaunchConfiguration configuration : configurations) { -// if (configuration.getName().equals("NewInstance")) { -// configuration.delete(); -// break; -// } -// } -// -// ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, "NewInstance"); -// -// workingCopy.setAttribute(ATTR_MAIN_TYPE_NAME, "eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin"); -// -// -// workingCopy.setAttribute(ATTR_VM_INSTALL_NAME, JavaRuntime.getDefaultVMInstall().getName()); -// workingCopy.setAttribute(ATTR_VM_INSTALL_TYPE, JavaRuntime.getDefaultVMInstall().getVMInstallType().getId()); -// -// -// workingCopy.launch(ILaunchManager.RUN_MODE, null); - - -// IVMInstall vm = JavaRuntime.getDefaultVMInstall();//VMInstall(proj); -// if (vm == null) vm = JavaRuntime.getDefaultVMInstall(); -// IVMRunner vmr = vm.getVMRunner(ILaunchManager.RUN_MODE); -// String[] cp = JavaRuntime.computeDefaultRuntimeClassPath(proj); -// VMRunnerConfiguration config = new VMRunnerConfiguration(main, cp); -// ILaunch launch = new Launch(null, -// ILaunchManager.RUN_MODE, null); -// vmr.run(config, launch, null); - -// IVMInstallType[] types = JavaRuntime.getVMInstallTypes(); -// -// IVMInstall install = null; -// for(IVMInstallType type : types){ -// install = type.createVMInstall(type.getId()); -// break; -// } -// -// -// IPath path = JavaRuntime.newJREContainerPath(install); -// String jrePath = path.toPortableString(); - - -// -// ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager(); -// ILaunchConfigurationType type = manager.getLaunchConfigurationType(ID_JAVA_APPLICATION); -// ILaunchConfigurationWorkingCopy wc = type.newInstance(null, "NewInstance"); -// wc.setAttribute(ATTR_JRE_CONTAINER_PATH, jrePath); -// wc.setAttribute(ATTR_MAIN_TYPE_NAME, "eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin"); -// ILaunchConfiguration config = wc.doSave(); -// config.launch(ILaunchManager.RUN_MODE, null); -// -// -// Process p = Runtime.getRuntime().exec(cmdarray); -// -// -// } catch (CoreException e) { -// logger.error("Error launching import", e); -// } - - StoreUtil.notImplementedMessage(); - - return true; - } - - /** - * Use when importing data into the current application context - * - * @param configurator - * @return - */ - public boolean doImportInternal(final IImportConfigurator configurator){ - - if(configurator == null){ - throw new IllegalArgumentException("Configuration may not be null"); - } - - // terminate any open transactions - IConversationEnabled activePart = (IConversationEnabled) StoreUtil.getActivePage().getActivePart(); - activePart.getConversationHolder().commit(false); - - - -// ConversationHolder conversation = CdmStore.NewTransactionalConversation(); - - importer = new CdmDefaultImport(); -// -// Job importJob = new Job("Import"){ -// @Override -// protected IStatus run(IProgressMonitor monitor) { -// return importer.invoke(configurator) ? Status.OK_STATUS : Status.CANCEL_STATUS; -// } -// }; -// -// importJob.schedule(); - - importer.setCdmAppController(configurator.getCdmAppController()); - - boolean result = importer.invoke(configurator); - - // restarting transaction and committing it to trigger change listener - // TODO verify correct behaviour - activePart.getConversationHolder().startTransaction(); - activePart.getConversationHolder().commit(); - - - return result; - } - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#addPages() - */ - @Override - public void addPages() { - super.addPages(); - - pageConfiguration = GenericConfiguratorWizardPage.Import(CONFIGURATION_PAGE, getConfigurator()); - this.addPage(pageConfiguration); - - pageNomenclaturalCode = new NomenclaturalCodeWizardPage((IImportConfigurator)getConfigurator()); - this.addPage(pageNomenclaturalCode); - } - - public abstract CONFIG getConfigurator(); -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelExportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelExportWizard.java deleted file mode 100644 index 767c5dfe9..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelExportWizard.java +++ /dev/null @@ -1,89 +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; - -import org.apache.log4j.Logger; -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; - -/** - * @author n.hoffmann - * @created 23.06.2009 - * @version 1.0 - */ -public class BerlinModelExportWizard extends AbstractExportWizard { - private static final Logger logger = Logger - .getLogger(BerlinModelExportWizard.class); - - private CdmDataSourceSQLServerWizardPage pageDataSource; - - - private BerlinModelExportConfigurator configurator; - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ - 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() - */ - @Override - public void addPages() { - super.addPages(); - - pageDataSource = new CdmDataSourceSQLServerWizardPage(null); - this.addPage(pageDataSource); - - - - } - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @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); - configurator.setCdmAppController(CdmStore.getApplicationControllerWillBeObsolete()); - - - return doExport(configurator); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.io.AbstractExportWizard#getConfigurator() - */ - @Override - public BerlinModelExportConfigurator getConfigurator() { - return configurator; - } - -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelImportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelImportWizard.java deleted file mode 100644 index 01317a2ee..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/BerlinModelImportWizard.java +++ /dev/null @@ -1,91 +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; - -import org.apache.log4j.Logger; -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.CdmDataSourceRepository; -import eu.etaxonomy.taxeditor.datasource.wizard.CdmDataSourceSQLServerWizardPage; -import eu.etaxonomy.taxeditor.store.CdmStore; - -/** - * @author n.hoffmann - * @created 24.06.2009 - * @version 1.0 - */ -public class BerlinModelImportWizard extends AbstractImportWizard { - private static final Logger logger = Logger - .getLogger(BerlinModelImportWizard.class); - - CdmDataSourceSQLServerWizardPage dataSourcePage; - - BerlinModelImportConfigurator configurator; - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ - public void init(IWorkbench workbench, IStructuredSelection selection) { - configurator = CdmStore.getImportHandler().BerlinModelConfigurator(); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @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); - // TODO should be obsolete because we want to pass application context but is not at the moment (throws NPE when not given) - configurator.setDestination(CdmDataSourceRepository.getDefault().getCurrentDataSource()); - - CdmStore.getImportHandler().doImport(configurator); - - return true; - } - - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#addPages() - */ - @Override - public void addPages() { - super.addPages(); - - dataSourcePage = new CdmDataSourceSQLServerWizardPage(null); - addPage(dataSourcePage); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#getConfigurator() - */ - @Override - public BerlinModelImportConfigurator getConfigurator() { - return configurator; - } -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/EndnoteImportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/EndnoteImportWizard.java deleted file mode 100644 index 6349512e9..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/EndnoteImportWizard.java +++ /dev/null @@ -1,80 +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; - -import org.apache.log4j.Logger; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IImportWizard; -import org.eclipse.ui.IWorkbench; - -import eu.etaxonomy.cdm.io.reference.endnote.in.EndnoteImportConfigurator; -import eu.etaxonomy.taxeditor.store.CdmStore; - -/** - * @author n.hoffmann - * @created Sep 18, 2009 - * @version 1.0 - */ -public class EndnoteImportWizard extends AbstractImportWizard implements IImportWizard { - private static final Logger logger = Logger - .getLogger(EndnoteImportWizard.class); - - private EndnoteImportConfigurator configurator; - - private ImportFromFileDataSourceWizardPage dataSourcePage; - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @Override - public boolean performFinish() { - - String file = dataSourcePage.getFile(); - - // TcsXmlImport expects a string that can be used to instantiate a URL instance - // TODO consolidate import and exports regarding what may be passed in as source - // will construct a url string for now - - file = "file://" + file; - - configurator.setSource(file); - - CdmStore.getImportHandler().doImport(configurator); - - return false; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#addPages() - */ - @Override - public void addPages() { - super.addPages(); - - dataSourcePage = ImportFromFileDataSourceWizardPage.XML(); - addPage(dataSourcePage); - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ - public void init(IWorkbench workbench, IStructuredSelection selection) { - configurator = CdmStore.getImportHandler().EndnoteImportConfigurator(); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#getConfigurator() - */ - @Override - public EndnoteImportConfigurator getConfigurator() { - return configurator; - } -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ExportToFileDestinationWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ExportToFileDestinationWizardPage.java deleted file mode 100644 index c48192c18..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ExportToFileDestinationWizardPage.java +++ /dev/null @@ -1,159 +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; - -import java.text.SimpleDateFormat; -import java.util.Calendar; - -import org.apache.log4j.Logger; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.MouseAdapter; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.DirectoryDialog; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; - -import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository; - -/** - * @author n.hoffmann - * @created 15.06.2009 - * @version 1.0 - */ -public class ExportToFileDestinationWizardPage extends WizardPage{ - - public static final String DATE_FORMAT_NOW = "yyyyMMddHHmm"; - - public static final String JAXB_EXPORT = "JAXB_EXPORT"; - - public static final String TCS_EXPORT = "TCS_EXPORT"; - - private static final Logger logger = Logger - .getLogger(ExportToFileDestinationWizardPage.class); - private DirectoryDialog folderDialog; - private Text text_exportFileName; - - private Text text_folder; - - private String type; - - - /** - * @param pageName - * @param selection - */ - private ExportToFileDestinationWizardPage(String pageName, String type, String title, String description) { - super(pageName); - - this.type = type; - - this.setTitle(title); - this.setDescription("Exports the contents of the currently selected database into the cdm jaxb format."); - } - - public static ExportToFileDestinationWizardPage Jaxb(){ - return new ExportToFileDestinationWizardPage(JAXB_EXPORT, "jaxb", "JAXB Export", "Exports the contents of the currently selected database into the cdm jaxb format."); - } - - public static ExportToFileDestinationWizardPage Tcs(){ - return new ExportToFileDestinationWizardPage(TCS_EXPORT, "tcs", "Tcs Export", "Export the contents of the currently selected database into TCS format."); - } - - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - - setPageComplete(false); - - Composite composite = new Composite(parent, SWT.NONE); - GridLayout gridLayout = new GridLayout(); - gridLayout.numColumns = 3; - composite.setLayout(gridLayout); - - Label fileLabel = new Label(composite, SWT.NONE); - fileLabel.setText("File"); - - text_exportFileName = new Text(composite, SWT.BORDER); - text_exportFileName.setText(generateFilename()); - text_exportFileName.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); - - - Label folderLabel = new Label(composite, SWT.NONE); - folderLabel.setText("Folder"); - - folderDialog = new DirectoryDialog(parent.getShell()); - - text_folder = new Text(composite, SWT.BORDER); - text_folder.setEditable(false); - text_folder.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - - - Button button = new Button(composite, SWT.PUSH); - button.setText("Browse..."); - - button.addMouseListener(new MouseAdapter(){ - - /* (non-Javadoc) - * @see org.eclipse.swt.events.MouseAdapter#mouseUp(org.eclipse.swt.events.MouseEvent) - */ - @Override - public void mouseUp(MouseEvent e) { - String path = folderDialog.open(); - text_folder.setText(path); - setPageComplete(true); - } - - }); - - // make the composite the wizard pages control - setControl(composite); - } - - private String generateFilename(){ - StringBuffer buffer = new StringBuffer(); - - Calendar cal = Calendar.getInstance(); - SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_NOW); - buffer.append(sdf.format(cal.getTime())); - - buffer.append("-"); - - buffer.append(type + "_export-"); - buffer.append(CdmDataSourceRepository.getDefault().getCurrentDataSource()); - - buffer.append(".xml"); - - return buffer.toString(); - } - - - /** - * @return the exportFileName - */ - public String getExportFileName() { - return text_exportFileName.getText(); - } - - - /** - * @return the folderText - */ - public String getFolderText() { - return text_folder.getText(); - } -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/GenericConfiguratorWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/GenericConfiguratorWizardPage.java deleted file mode 100644 index a9aa26724..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/GenericConfiguratorWizardPage.java +++ /dev/null @@ -1,184 +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; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -import org.apache.log4j.Logger; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.CLabel; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; - -import eu.etaxonomy.cdm.io.common.IIoConfigurator; - -/** - * @author n.hoffmann - * @created 23.06.2009 - * @version 1.0 - */ -public class GenericConfiguratorWizardPage extends WizardPage { - - - private static final Logger logger = Logger - .getLogger(GenericConfiguratorWizardPage.class); - - private IIoConfigurator configurator; - - /** - * @param pageName - * @param configurator - */ - private GenericConfiguratorWizardPage(String pageName, IIoConfigurator configurator, String title, String description) { - super(pageName); - this.setTitle(title); - - this.setDescription(description); - - this.configurator = configurator; - } - - public static GenericConfiguratorWizardPage Import(String pageName, IIoConfigurator configurator){ - return new GenericConfiguratorWizardPage(pageName, configurator, "Import Configuration", "Configure the import mechanism."); - } - - public static GenericConfiguratorWizardPage Export(String pageName, IIoConfigurator configurator){ - return new GenericConfiguratorWizardPage(pageName, configurator, "Export Configuration", "Configure the export mechanism."); - } - - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - - Composite composite = new Composite(parent, SWT.NULL); - GridLayout gridLayout = new GridLayout(); - gridLayout.numColumns = 2; - composite.setLayout(gridLayout); - - List methods = getConfiguratorsBooleanSetMethods(configurator); - - for(Method method : methods){ - createCheckbox(composite, method, configurator); - } - - setControl(composite); - } - - private void createCheckbox(Composite parent, Method method, final IIoConfigurator configurator){ - - String methodName = method.getName(); - - final String methodNameValue = methodName.substring(3); - - CLabel label = new CLabel(parent, SWT.NULL); - label.setText(methodNameValue); - - final Button checkBox = new Button(parent, SWT.CHECK); - checkBox.setSelection(executeBooleanGetMethod(configurator,"is" + methodNameValue)); - checkBox.addSelectionListener(new SelectionAdapter(){ - - /* (non-Javadoc) - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ - @Override - public void widgetSelected(SelectionEvent e) { - executeBooleanSetMethod(configurator, "set" + methodNameValue, checkBox.getSelection()); - } - - }); - - } - - - private boolean executeBooleanGetMethod(IIoConfigurator configurator, String methodName){ - - Class configuratorClass = configurator.getClass(); - - boolean result = false; - - Method[] methods = configuratorClass.getMethods(); - - for(Method method : methods){ - if(!method.getName().equals(methodName)){ - continue; - } - - try { - Object returnType = method.invoke(configurator, null); - if(returnType.getClass().equals(Boolean.class)){ - result = ((Boolean) returnType).booleanValue(); - } - - break; - } catch (Exception e) { - logger.warn("Could not invoke method"); - } - } - - - return result; - } - - private void executeBooleanSetMethod(IIoConfigurator configurator, String methodName, boolean selected){ - - Class configuratorClass = configurator.getClass(); - - - Method[] methods = configuratorClass.getMethods(); - - for(Method method : methods){ - if(!method.getName().equals(methodName)){ - continue; - } - - try { - method.invoke(configurator, selected); - - break; - } catch (Exception e) { - logger.warn("Could not invoke method"); - } - } - } - - private List getConfiguratorsBooleanSetMethods(IIoConfigurator configurator){ - List booleanMethods = new ArrayList(); - - Class configuratorClass = configurator.getClass(); - - Method[] allMethods = configuratorClass.getMethods(); - - for(Method method : allMethods){ - if(method.getName().startsWith("set")){ - - Class[] typeList = method.getParameterTypes(); - - if(typeList.length > 1){ - new IllegalStateException("Found a setter with parameter count > 1"); - } - - if(typeList[0].getName().equals("boolean")){ - booleanMethods.add(method); - } - } - } - - return booleanMethods; - } -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportFromFileDataSourceWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportFromFileDataSourceWizardPage.java deleted file mode 100644 index 835521c74..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportFromFileDataSourceWizardPage.java +++ /dev/null @@ -1,113 +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; - -import org.apache.log4j.Logger; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.MouseAdapter; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.FileDialog; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; - -/** - * @author n.hoffmann - * @created 04.08.2009 - * @version 1.0 - */ -public class ImportFromFileDataSourceWizardPage extends WizardPage { - private static final Logger logger = Logger - .getLogger(ImportFromFileDataSourceWizardPage.class); - - public static final String PAGE_NAME = "CdmXmlDataSourceWizardPage"; - - private String[] extensions = {"*.xml"}; - - private FileDialog fileDialog; - - private Text text_file; - - - /** - * @param pageName - */ - protected ImportFromFileDataSourceWizardPage(String title, String description, String[] extensions) { - super(PAGE_NAME); - - setTitle(title); - - setDescription(description); - - this.extensions = extensions; - } - - protected static ImportFromFileDataSourceWizardPage XML(){ - return new ImportFromFileDataSourceWizardPage("Xml File", "Select XML file.", new String[]{"*.xml"}); - } - - - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - final Composite composite = new Composite(parent, SWT.NULL); - - setPageComplete(false); - - GridLayout gridLayout = new GridLayout(); - gridLayout.numColumns = 3; - composite.setLayout(gridLayout); - - Label folderLabel = new Label(composite, SWT.NONE); - folderLabel.setText("File"); - - fileDialog = new FileDialog(parent.getShell()); - - fileDialog.setFilterExtensions(extensions); - - text_file = new Text(composite, SWT.BORDER); - text_file.setEditable(false); - text_file.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - - - Button button = new Button(composite, SWT.PUSH); - button.setText("Browse..."); - - button.addMouseListener(new MouseAdapter(){ - - /* (non-Javadoc) - * @see org.eclipse.swt.events.MouseAdapter#mouseUp(org.eclipse.swt.events.MouseEvent) - */ - @Override - public void mouseUp(MouseEvent e) { - String path = fileDialog.open(); - text_file.setText(path); - setPageComplete(true); - } - - }); - - setControl(composite); - } - - /** - * @return - */ - public String getFile() { - return text_file.getText(); - } -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportHandler.java index ff2fe197a..624ecf18e 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportHandler.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportHandler.java @@ -18,6 +18,7 @@ import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; 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; import eu.etaxonomy.cdm.io.jaxb.JaxbImportConfigurator; import eu.etaxonomy.cdm.io.reference.endnote.in.EndnoteImportConfigurator; import eu.etaxonomy.cdm.io.tcsxml.in.TcsXmlImportConfigurator; @@ -32,7 +33,6 @@ public class ImportHandler extends AbstractIOHandler { private static final Logger logger = Logger .getLogger(ImportHandler.class); - private CdmDefaultImport importer; /** * @param applicationController @@ -83,28 +83,33 @@ public class ImportHandler extends AbstractIOHandler { private IImportConfigurator getConfigurator(TYPE type){ Assert.isNotNull(type, "Type should not be null"); - if(type == TYPE.BerlinModel){ - return BerlinModelImportConfigurator.NewInstance(null, null); - }else if(type == TYPE.Jaxb){ - return JaxbImportConfigurator.NewInstance(null, null); - }else if(type == TYPE.Tcs){ - return TcsXmlImportConfigurator.NewInstance(null, null); - }else if(type == TYPE.Endnote){ - return EndnoteImportConfigurator.NewInstance(null, null); - }else{ - 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); + default: + StoreUtil.notImplementedMessage(); + throw new IllegalArgumentException("Import not supported yet"); } } /** @return a BerlinModelImportConfigurator*/ - public BerlinModelImportConfigurator BerlinModelConfigurator() { return (BerlinModelImportConfigurator) getConfigurator(TYPE.BerlinModel); } + public final BerlinModelImportConfigurator BerlinModelConfigurator() { return (BerlinModelImportConfigurator) getConfigurator(TYPE.BerlinModel); } /** @return a JaxbImportConfigurator*/ - public JaxbImportConfigurator JaxbConfigurator() { return (JaxbImportConfigurator) getConfigurator(TYPE.Jaxb); } + public final JaxbImportConfigurator JaxbConfigurator() { return (JaxbImportConfigurator) getConfigurator(TYPE.Jaxb); } /** @return a TcsXmlImportConfigurator*/ - public TcsXmlImportConfigurator TcsConfigurator() { return (TcsXmlImportConfigurator) getConfigurator(TYPE.Tcs); } + public final TcsXmlImportConfigurator TcsConfigurator() { return (TcsXmlImportConfigurator) getConfigurator(TYPE.Tcs); } /** @return an EndnoteImportConfigurator */ - public EndnoteImportConfigurator EndnoteImportConfigurator() { return (EndnoteImportConfigurator) getConfigurator(TYPE.Endnote); - } + public final EndnoteImportConfigurator EndnoteImportConfigurator() { return (EndnoteImportConfigurator) getConfigurator(TYPE.Endnote); } + /** @return a NormalExplicitImportConfigurator*/ + public final NormalExplicitImportConfigurator NormalExplicitImportConfigurator() { return (NormalExplicitImportConfigurator) getConfigurator(TYPE.Excel_Taxa); } } diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbExportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbExportWizard.java deleted file mode 100644 index 2b7364abd..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbExportWizard.java +++ /dev/null @@ -1,77 +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; - -import java.io.File; - -import org.apache.log4j.Logger; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IWorkbench; - -import eu.etaxonomy.cdm.io.jaxb.JaxbExportConfigurator; -import eu.etaxonomy.taxeditor.store.CdmStore; - -/** - * @author n.hoffmann - * @created 15.06.2009 - * @version 1.0 - */ -public class JaxbExportWizard extends AbstractExportWizard { - private static final Logger logger = Logger - .getLogger(JaxbExportWizard.class); - - private ExportToFileDestinationWizardPage page; - - private JaxbExportConfigurator configurator; - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ - public void init(IWorkbench workbench, IStructuredSelection selection) { - this.setWindowTitle("JAXB Export"); - this.configurator = JaxbExportConfigurator.NewInstance(null, null); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @Override - public boolean performFinish() { - - String urlString = page.getFolderText() + File.pathSeparator + page.getExportFileName(); - - configurator.setDestination(urlString); - configurator.setCdmAppController(CdmStore.getApplicationControllerWillBeObsolete()); - - return doExport(configurator); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#addPages() - */ - @Override - public void addPages() { - super.addPages(); - - page = ExportToFileDestinationWizardPage.Jaxb(); - addPage(page); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.io.AbstractExportWizard#getConfigurator() - */ - @Override - public JaxbExportConfigurator getConfigurator() { - return configurator; - } - - -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbImportSourceWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbImportSourceWizardPage.java deleted file mode 100644 index 6cd9448f1..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbImportSourceWizardPage.java +++ /dev/null @@ -1,41 +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; - -import org.apache.log4j.Logger; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.widgets.Composite; - -/** - * @author n.hoffmann - * @created 24.06.2009 - * @version 1.0 - */ -public class JaxbImportSourceWizardPage extends WizardPage { - /** - * @param pageName - */ - protected JaxbImportSourceWizardPage(String pageName) { - super(pageName); - // TODO Auto-generated constructor stub - } - - private static final Logger logger = Logger - .getLogger(JaxbImportSourceWizardPage.class); - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - // TODO Auto-generated method stub - - } -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbImportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbImportWizard.java deleted file mode 100644 index 4d4441212..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/JaxbImportWizard.java +++ /dev/null @@ -1,44 +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; - -import org.apache.log4j.Logger; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.ui.IImportWizard; -import org.eclipse.ui.IWorkbench; - -/** - * @author n.hoffmann - * @created 15.06.2009 - * @version 1.0 - */ -public class JaxbImportWizard extends Wizard implements IImportWizard { - private static final Logger logger = Logger - .getLogger(JaxbImportWizard.class); - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @Override - public boolean performFinish() { - // TODO Auto-generated method stub - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ - public void init(IWorkbench workbench, IStructuredSelection selection) { - // TODO Auto-generated method stub - - } -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/NomenclaturalCodeWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/NomenclaturalCodeWizardPage.java deleted file mode 100644 index ce15b2008..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/NomenclaturalCodeWizardPage.java +++ /dev/null @@ -1,91 +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; - -import org.apache.log4j.Logger; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; - -import eu.etaxonomy.cdm.io.common.IImportConfigurator; -import eu.etaxonomy.cdm.model.name.NomenclaturalCode; -import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper; -import eu.etaxonomy.taxeditor.preference.PreferencesUtil; - -/** - * @author p.ciardelli - * @created 11.09.2009 - * @version 1.0 - */ -public class NomenclaturalCodeWizardPage extends WizardPage { - - - - private IImportConfigurator configurator; - - /** - * - */ - public NomenclaturalCodeWizardPage() { - super("Choose nomenclatural code"); - - this.setTitle("Choose nomenclatural code"); - - this.setDescription("Choose which code to use for imported names."); - } - - /** - * @param configurator - */ - public NomenclaturalCodeWizardPage(IImportConfigurator configurator) { - this(); - this.configurator = configurator; - } - - private static final Logger logger = Logger - .getLogger(NomenclaturalCodeWizardPage.class); - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - Composite container = new Composite(parent, SWT.NULL); - container.setLayout(new FillLayout()); - - final Group group = new Group(container, SWT.NONE); - group.setLayout(new GridLayout()); - - NomenclaturalCode preferredCode = PreferencesUtil.getPreferredNomenclaturalCode(); - - // set preferred code as default - configurator.setNomenclaturalCode(preferredCode); - - for (final NomenclaturalCode code : NomenclaturalCodeHelper.getImplementedCodes()) { - Button button = new Button(group, SWT.RADIO); - button.setText(NomenclaturalCodeHelper.getDescription(code)); - button.setData(code); - button.setSelection(preferredCode.equals(code)); - button.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - configurator.setNomenclaturalCode((NomenclaturalCode) e.widget.getData()); - } - }); - } - - setControl(container); - } -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/TcsExportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/TcsExportWizard.java deleted file mode 100644 index 19acf5291..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/TcsExportWizard.java +++ /dev/null @@ -1,74 +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; - -import java.io.File; - -import org.apache.log4j.Logger; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IWorkbench; - -import eu.etaxonomy.cdm.io.tcsxml.out.TcsXmlExportConfigurator; -import eu.etaxonomy.taxeditor.store.CdmStore; - -/** - * @author n.hoffmann - * @created 15.06.2009 - * @version 1.0 - */ -public class TcsExportWizard extends AbstractExportWizard { - private static final Logger logger = Logger - .getLogger(TcsExportWizard.class); - private static final String TCS_EXPORT = "TCS_EXPORT"; - private TcsXmlExportConfigurator configurator; - private ExportToFileDestinationWizardPage page; - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @Override - public boolean performFinish() { - String urlString = page.getFolderText() + File.separator + page.getExportFileName(); - - configurator.setDestination(new File(urlString)); - configurator.setCdmAppController(CdmStore.getApplicationControllerWillBeObsolete()); - - return doExport(configurator); - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ - public void init(IWorkbench workbench, IStructuredSelection selection) { - configurator = TcsXmlExportConfigurator.NewInstance(null, null); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.io.AbstractExportWizard#getConfigurator() - */ - @Override - public TcsXmlExportConfigurator getConfigurator() { - return configurator; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.io.AbstractExportWizard#addPages() - */ - @Override - public void addPages() { - super.addPages(); - - page = ExportToFileDestinationWizardPage.Tcs(); - addPage(page); - } - - -} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/TcsImportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/TcsImportWizard.java deleted file mode 100644 index ce748b57c..000000000 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/TcsImportWizard.java +++ /dev/null @@ -1,79 +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; - -import org.apache.log4j.Logger; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IWorkbench; - -import eu.etaxonomy.cdm.database.DbSchemaValidation; -import eu.etaxonomy.cdm.io.tcsxml.in.TcsXmlImportConfigurator; -import eu.etaxonomy.taxeditor.store.CdmStore; - -/** - * @author n.hoffmann - * @created 15.06.2009 - * @version 1.0 - */ -public class TcsImportWizard extends AbstractImportWizard{ - private static final Logger logger = Logger.getLogger(TcsImportWizard.class); - - private TcsXmlImportConfigurator configurator; - - private ImportFromFileDataSourceWizardPage dataSourcePage; - - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @Override - public boolean performFinish() { - - String file = dataSourcePage.getFile(); - - // TcsXmlImport expects a string that can be used to instantiate a URL instance - // TODO consolidate import and exports regarding what may be passed in as source - // will construct a url string for now - - file = "file://" + file; - - configurator.setSource(file); - configurator.setDbSchemaValidation(DbSchemaValidation.CREATE); - configurator.setCdmAppController(CdmStore.getApplicationControllerWillBeObsolete()); - - return doImportInternal(configurator); - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ - public void init(IWorkbench workbench, IStructuredSelection selection) { - configurator = CdmStore.getImportHandler().TcsConfigurator(); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#getConfigurator() - */ - @Override - public TcsXmlImportConfigurator getConfigurator() { - return configurator; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#addPages() - */ - @Override - public void addPages() { - super.addPages(); - - dataSourcePage = ImportFromFileDataSourceWizardPage.XML(); - addPage(dataSourcePage); - } -} -- 2.34.1