Merge branch 'release/4.7.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / io / wizard / AbcdImportWizard.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java
index d6f3236ea638ddb1463fbdb70c4b48a185008dfc..d1a488cad49c829bdbb0d9d54f68275f62f53240 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2007 EDIT
 * European Distributed Institute of Taxonomy
@@ -11,8 +10,6 @@
 package eu.etaxonomy.taxeditor.io.wizard;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.net.URI;
 
 import org.apache.log4j.Logger;
@@ -22,9 +19,8 @@ import org.eclipse.ui.IWorkbench;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
 /**
  *
@@ -56,20 +52,8 @@ public class AbcdImportWizard extends AbstractImportWizard<Abcd206ImportConfigur
                configurator.setClassificationUuid(classificationChooserWizardPage.getClassification().getUuid());
            }
 
-           if(CdmStore.getCurrentSessionManager().isRemoting()) {
-               //Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.INPUTSTREAM);
-               //CdmStore.getImportManager().run(job);
-               CdmStore.getImportManager().runMoniteredOperation(configurator, new File(source), SOURCE_TYPE.INPUTSTREAM);
-           } else {
-               try {
-                   configurator.setSource(new FileInputStream(new File(source)));
-               } catch (FileNotFoundException e) {
-                   MessagingUtils.errorDialog("File not found.", this, "Import file was not found.", TaxeditorStorePlugin.PLUGIN_ID, e, false);
-                   logger.error("File not found!", e);
-                   return false;
-               }
-               CdmStore.getImportManager().run(configurator);
-           }
+           CdmStore.getImportManager().runMoniteredOperation(configurator, new File(source), SOURCE_TYPE.INPUTSTREAM);
+
            return true;
 
        }
@@ -78,7 +62,13 @@ public class AbcdImportWizard extends AbstractImportWizard<Abcd206ImportConfigur
        @Override
     public void init(IWorkbench workbench, IStructuredSelection selection) {
                super.init(workbench, selection);
-               configurator =  CdmStore.getImportManager().AbcdConfigurator();
+               configurator =  PreferencesUtil.getAbcdImportConfigurationPreference(true);
+       }
+
+       @Override
+       protected void addConfiguratorPage() {
+               AbcdImportConfiguratorWizardPage configuratorWizardPage = AbcdImportConfiguratorWizardPage.createPage(configurator);
+               addPage(configuratorWizardPage);
        }
 
        /** {@inheritDoc} */