Merge branch 'release/5.11.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / io / e4 / in / abcd / AbcdImportWizardE4.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/abcd/AbcdImportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/abcd/AbcdImportWizardE4.java
index 5edc1b7b2a2256012694e6a5d98751e5415531b6..c3c59bc0a464d7c1f4dfe084ac663b12e4ae1906 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/abcd/AbcdImportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/abcd/AbcdImportWizardE4.java
@@ -23,6 +23,7 @@ import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
 import eu.etaxonomy.taxeditor.io.e4.in.AbstractImportWizardE4;
 import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWithReferenceWizardPage;
+import eu.etaxonomy.taxeditor.io.wizard.AbcdImportConfiguratorWizardPage;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -73,8 +74,8 @@ public class AbcdImportWizardE4 extends AbstractImportWizardE4<Abcd206ImportConf
 
        @Override
        protected void addConfiguratorPage() {
-           AbcdImportConfiguratorWizardPageE4 configuratorWizardPage = ContextInjectionFactory.make(AbcdImportConfiguratorWizardPageE4.class, context);//AbcdImportConfiguratorWizardPage.createPage(configurator);
-           configuratorWizardPage.setConfigurator(configurator);
+           AbcdImportConfiguratorWizardPage configuratorWizardPage = AbcdImportConfiguratorWizardPage.createFileImportPage(configurator);//AbcdImportConfiguratorWizardPage.createPage(configurator);
+           //configuratorWizardPage.setConfigurator(configurator);
                addPage(configuratorWizardPage);
        }
 
@@ -88,8 +89,8 @@ public class AbcdImportWizardE4 extends AbstractImportWizardE4<Abcd206ImportConf
 
                addPage(classificationChooserWizardPage);
                addPage(dataSourcePage);
-
-               super.addPages();
+               addConfiguratorPage();
+               //super.addPages();
 
        }
 }