ref #6974: move the configurator page behind the file selection page

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/distribution/ExcelDistributionUpdateWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/distribution/ExcelDistributionUpdateWizardE4.java
index b9153a48e0ac750b97e5e5baddaa55828e265544..141d7e7e7662eb6fecc782a6ecc96ed7f0753505 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/distribution/ExcelDistributionUpdateWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/distribution/ExcelDistributionUpdateWizardE4.java
@@ -99,9 +99,8 @@ public class ExcelDistributionUpdateWizardE4 extends AbstractImportWizardE4<Exce
     /** {@inheritDoc} */
     @Override
     public void addPages() {
-        addConfiguratorPage();
         addDataSourcePage();
-
+        addConfiguratorPage();
 
     }
     @Override

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/specimen/SpecimenCdmExcelImportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/specimen/SpecimenCdmExcelImportWizardE4.java
index 7ef3ec97bbb7c62b8f2b8cc6c257b16e3f90259a..a6c6fc7242bc0e3d5389a1eb870489133febe1a7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/specimen/SpecimenCdmExcelImportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/specimen/SpecimenCdmExcelImportWizardE4.java
@@ -60,13 +60,13 @@ public class SpecimenCdmExcelImportWizardE4 extends AbstractImportWizardE4<Speci
        /** {@inheritDoc} */
        @Override
        public void addPages() {
-               super.addPages();
                dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
         dataSourcePage.setTitle("Choose Specimen CDM Excel");
         dataSourcePage.setDescription("Please choose an xls file in the SpecimenCdmExcel format.");
         dataSourcePage.setExtensions(new String[]{"*.xlsx", "*.xls", "*.*"});
 
                addPage(dataSourcePage);
+               super.addPages();
        }
 
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
index 8f415e2fe78392045bb80044e081920d648d0385..82550c0610675f9f7c3a62a62ed96acb61cbf5de 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
@@ -104,12 +104,12 @@ public class ExcelNormalExplicitTaxaImportWizardE4 extends AbstractImportWizardE
        /** {@inheritDoc} */
        @Override
        public void addPages() {
-               super.addPages();
-
-               dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
+           dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
                dataSourcePage.setTitle("Choose NormalExplicit");
                dataSourcePage.setDescription("Please choose an xls file in the NormalExplicit format.");
                dataSourcePage.setExtensions(new String[]{"*.xlsx", "*.xls", "*.*"});
                addPage(dataSourcePage);
+                 super.addPages();
+
        }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/sdd/SddImportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/sdd/SddImportWizardE4.java
index 1990e57101ba5e353c3d2faf631936337fa6e6d3..f9d33a1a01811ae45ff4b676989e83b819ea62d6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/sdd/SddImportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/sdd/SddImportWizardE4.java
@@ -52,13 +52,14 @@ public class SddImportWizardE4 extends AbstractImportWizardE4<SDDImportConfigura
 
        @Override
        public void addPages() {
-               super.addPages();
+
                dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
         dataSourcePage.setTitle("Choose File");
         dataSourcePage.setDescription("Please choose an XML file in the SDD format.");
         dataSourcePage.setExtensions(new String[]{"*.xml", "*.sdd"});
 
                addPage(dataSourcePage);
+               super.addPages();
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/tcs/TcsImportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/tcs/TcsImportWizardE4.java
index 1b262bf5d03bc3d0e444a669a29139c5687eb2ad..e28cc5b8191f00e794ca188e8d602a4d3e98c650 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/tcs/TcsImportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/tcs/TcsImportWizardE4.java
@@ -72,8 +72,8 @@ public class TcsImportWizardE4 extends AbstractImportWizardE4<TcsXmlImportConfig
        /** {@inheritDoc} */
        @Override
        public void addPages() {
-               super.addPages();
                dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
                addPage(dataSourcePage);
+               super.addPages();
        }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/jaxb/JaxbExportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/jaxb/JaxbExportWizardE4.java
index c50850411c7653788505123842c7312cfcdbf7cb..8c15f0ac78f065f775a0dd4021e17334dea4553c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/jaxb/JaxbExportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/jaxb/JaxbExportWizardE4.java
@@ -70,10 +70,9 @@ public class JaxbExportWizardE4 extends AbstractExportWizardE4<JaxbExportConfigu
        /** {@inheritDoc} */
        @Override
        public void addPages() {
-               super.addPages();
-
                page = ExportToFileDestinationWizardPage.Jaxb(configurator);
                addPage(page);
+               super.addPages();
        }
 
        /** {@inheritDoc} */