From 0869e41d2e787a8a8a87273e3f3da4389c1d5ff3 Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Thu, 19 Oct 2017 13:01:02 +0200
Subject: [PATCH] fix #6974: missing io wizards adapted

---
 .../io/e4/in/abcd/AbcdImportWizardE4.java        |  1 +
 .../ExcelDistributionUpdateWizardE4.java         |  5 ++++-
 .../specimen/SpecimenCdmExcelImportWizardE4.java | 16 ++++++++++++++++
 .../ExcelNormalExplicitTaxaImportWizardE4.java   | 15 +++++++++++++++
 .../io/e4/out/sdd/SddExportWizardE4.java         |  3 +--
 .../eu/etaxonomy/taxeditor/l10n/Messages.java    |  6 ++++++
 .../etaxonomy/taxeditor/l10n/messages.properties |  5 ++++-
 .../taxeditor/l10n/messages_de.properties        |  5 ++++-
 8 files changed, 51 insertions(+), 5 deletions(-)

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 651795055..64365a637 100644
--- 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
@@ -88,6 +88,7 @@ public class AbcdImportWizardE4 extends AbstractImportWizardE4<Abcd206ImportConf
 
 		addPage(classificationChooserWizardPage);
 		addPage(dataSourcePage);
+		addConfiguratorPage();
 		super.addPages();
 
 	}
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 141d7e7e7..7f61deccf 100755
--- 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
@@ -56,7 +56,7 @@ public class ExcelDistributionUpdateWizardE4 extends AbstractImportWizardE4<Exce
     /** {@inheritDoc} */
     @Override
     public ExcelDistributionUpdateConfigurator getConfigurator() {
-        return configurator;
+              return configurator;
     }
 
     /** {@inheritDoc} */
@@ -109,6 +109,9 @@ public class ExcelDistributionUpdateWizardE4 extends AbstractImportWizardE4<Exce
         ignoreMethods.add("setIgnoreNull");
         ignoreMethods.add("setInteractWithUser");
         ignoreMethods.add("setUseClassification");
+        ignoreMethods.add("setRegisterAuditing");
+        ignoreMethods.add("setDeduplicateAuthors");
+        ignoreMethods.add("setDeduplicateReferences");
         pageConfiguration = ContextInjectionFactory.make(GenericConfiguratorWizardPageE4.class, context);
         pageConfiguration.initImport(getConfigurator(), ignoreMethods, Messages.ExcelDistributionUpdateWizard_ConfiguratorWizard_label);
         addPage(pageConfiguration);
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 a6c6fc724..25cc4673d 100644
--- 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
@@ -4,6 +4,8 @@
 package eu.etaxonomy.taxeditor.io.e4.in.excel.specimen;
 
 import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.inject.Inject;
 
@@ -14,7 +16,9 @@ import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.io.specimen.excel.in.SpecimenCdmExcelImportConfigurator;
 import eu.etaxonomy.taxeditor.io.e4.in.AbstractImportWizardE4;
+import eu.etaxonomy.taxeditor.io.e4.in.GenericConfiguratorWizardPageE4;
 import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWizardPageE4;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
@@ -69,4 +73,16 @@ public class SpecimenCdmExcelImportWizardE4 extends AbstractImportWizardE4<Speci
 		super.addPages();
 	}
 
+	 @Override
+	 protected void addConfiguratorPage(){
+	     List<String> ignoreMethods = new ArrayList<>();
+         ignoreMethods.add("setIgnoreNull");
+         ignoreMethods.add("setInteractWithUser");
+         ignoreMethods.add("setUseClassification");
+         ignoreMethods.add("setRegisterAuditing");
+         pageConfiguration = ContextInjectionFactory.make(GenericConfiguratorWizardPageE4.class, context);
+         pageConfiguration.initImport(getConfigurator(), ignoreMethods, Messages.ExcelSpecimenUpdateWizard_ConfiguratorWizard_label);
+         addPage(pageConfiguration);
+    }
+
 }
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 82550c061..b42722589 100644
--- 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
@@ -14,6 +14,8 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -34,7 +36,9 @@ import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
 import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.io.e4.in.AbstractImportWizardE4;
+import eu.etaxonomy.taxeditor.io.e4.in.GenericConfiguratorWizardPageE4;
 import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWizardPageE4;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 
@@ -112,4 +116,15 @@ public class ExcelNormalExplicitTaxaImportWizardE4 extends AbstractImportWizardE
 		  super.addPages();
 
 	}
+	 @Override
+     protected void addConfiguratorPage(){
+         List<String> ignoreMethods = new ArrayList<>();
+         ignoreMethods.add("setIgnoreNull");
+         ignoreMethods.add("setInteractWithUser");
+         ignoreMethods.add("setUseClassification");
+         ignoreMethods.add("setRegisterAuditing");
+         pageConfiguration = ContextInjectionFactory.make(GenericConfiguratorWizardPageE4.class, context);
+         pageConfiguration.initImport(getConfigurator(), ignoreMethods, Messages.ExcelSpecimenUpdateWizard_ConfiguratorWizard_label);
+         addPage(pageConfiguration);
+    }
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/sdd/SddExportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/sdd/SddExportWizardE4.java
index 0c563f470..6882726cd 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/sdd/SddExportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/sdd/SddExportWizardE4.java
@@ -63,10 +63,9 @@ public class SddExportWizardE4 extends AbstractExportWizardE4<SDDExportConfigura
 	/** {@inheritDoc} */
 	@Override
 	public void addPages() {
-		super.addPages();
-
 		page = ExportToFileDestinationWizardPage.Sdd(configurator);
 		addPage(page);
+		super.addPages();
 	}
 
 	/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index fa9583c71..4e2a73a95 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -297,6 +297,12 @@ public class Messages extends NLS {
     public static String SetPublishConfiguration_IncludeSynonyms;
 
 
+    public static String ExcelSpecimenUpdateWizard_ConfiguratorWizard_label;
+
+
+    public static String ExcelTaxonUpdateWizard_ConfiguratorWizard_label;
+
+
 
 
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
index 56c64eae1..3d50e39d6 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
@@ -235,4 +235,7 @@ SetPublishConfiguration_Publish_tooltip=With set publish flag, the taxa are publ
 SetPublishConfiguration_Description_Configurator=Configure where the publish flag should be set
 SetPublishConfiguration_IncludeAcceptedTaxa=Accepted taxa
 SetPublishConfiguration_IncludeSharedtaxa=Shared taxa
-SetPublishConfiguration_IncludeSynonyms=Synonyms
\ No newline at end of file
+SetPublishConfiguration_IncludeSynonyms=Synonyms
+
+ExcelSpecimenUpdateWizard_ConfiguratorWizard_label=Configuration of excel specimen import
+ExcelTaxonUpdateWizard_ConfiguratorWizard_label=Configuration of excel taxon import
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
index 427824313..a8024865c 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
@@ -236,4 +236,7 @@ SetPublishConfiguration_Publish_tooltip=Wenn das Publish Flag gesetzt ist, werde
 SetPublishConfiguration_Description_Configurator=Konfigurieren Sie, wie das Setzen des Publish Flags durchgeführt werden soll.
 SetPublishConfiguration_IncludeAcceptedTaxa=Akzeptierte Taxa
 SetPublishConfiguration_IncludeSharedtaxa=Mehrfach verwendete Taxa mit einbeziehen
-SetPublishConfiguration_IncludeSynonyms=Synonyme
\ No newline at end of file
+SetPublishConfiguration_IncludeSynonyms=Synonyme
+
+ExcelSpecimenUpdateWizard_ConfiguratorWizard_label=Konfiguration des Excel Specimen Imports
+ExcelTaxonUpdateWizard_ConfiguratorWizard_label=Konfiguration des Excel Taxon Imports
\ No newline at end of file
-- 
2.34.1