ref #6619: adapt labeling of configuration wizard

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java
index ea31527dda864c149f5e64eeae9a70e2b733215d..313ce1e793c404dab1c93fcec02d31d0b32b17b3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java
@@ -22,6 +22,7 @@ import org.eclipse.ui.IWorkbenchPage;
 
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;
 import eu.etaxonomy.cdm.io.common.IIoConfigurator;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 
 /**
  * @author n.hoffmann
@@ -51,7 +52,7 @@ public abstract class AbstractImportWizard<CONFIG extends IIoConfigurator> exten
        }
 
        protected void addConfiguratorPage(){
-               pageConfiguration = GenericConfiguratorWizardPage.Import(CONFIGURATION_PAGE, getConfigurator(), null);
+               pageConfiguration = GenericConfiguratorWizardPage.Import(CONFIGURATION_PAGE, getConfigurator(), null, Messages.AbstractImportWizard_ConfigurationLabel);
                this.addPage(pageConfiguration);
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelDistributionUpdateWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelDistributionUpdateWizard.java
index a084f9984af811a8bfc22605f6a1bc9f3b31f14e..0c5d3c3b25cc6c4919168ea7356186b94b4015c2 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelDistributionUpdateWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelDistributionUpdateWizard.java
@@ -25,6 +25,7 @@ import org.eclipse.ui.IWorkbench;
 
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.io.distribution.excelupdate.ExcelDistributionUpdateConfigurator;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
@@ -108,7 +109,7 @@ public class ExcelDistributionUpdateWizard extends AbstractImportWizard<ExcelDis
         ignoreMethods.add("setIgnoreNull");
         ignoreMethods.add("setInteractWithUser");
         ignoreMethods.add("setUseClassification");
-        pageConfiguration = GenericConfiguratorWizardPage.Import(CONFIGURATION_PAGE, getConfigurator(), ignoreMethods);
+        pageConfiguration = GenericConfiguratorWizardPage.Import(CONFIGURATION_PAGE, getConfigurator(), ignoreMethods, Messages.ExcelDistributionUpdateWizard_ConfiguratorWizard_label);
         addPage(pageConfiguration);
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/GenericConfiguratorWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/GenericConfiguratorWizardPage.java
index 91035f82b68a7d8a094127ebe8f118d3c64f5c71..cc2c65e49487a9402437b11d80a78c52709ae5af 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/GenericConfiguratorWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/GenericConfiguratorWizardPage.java
@@ -86,9 +86,9 @@ public class GenericConfiguratorWizardPage extends WizardPage {
      *         object.
      */
     public static GenericConfiguratorWizardPage Import(String pageName,
-            IIoConfigurator configurator, List<String> ignoreMethods) {
+            IIoConfigurator configurator, List<String> ignoreMethods, String label) {
         return new GenericConfiguratorWizardPage(pageName, configurator,
-                "Import Configuration", "Configure the import mechanism.", ignoreMethods);
+                "Import Configuration", label, ignoreMethods);
     }
 
     /**

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 6d4d7c435f64540a09640aa2e4ddeae0a06b8e91..cda11a47b1d22340af36363ef531443749dd648b 100644 (file)
--- 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
@@ -193,6 +193,12 @@ public class Messages extends NLS {
 
     public static String ImportFromFileAndChooseVocIdWizardOage_AreaVoc_toolTip;
 
+
+    public static String ExcelDistributionUpdateWizard_ConfiguratorWizard_label;
+
+
+    public static String AbstractImportWizard_ConfigurationLabel;
+
     static {
         // initialize resource bundle
         NLS.initializeMessages(BUNDLE_NAME, Messages.class);

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 4d5484dc9ac7731e13a9859e11d1f28f66ffaf1a..02cec722c91a75a92f19532d3f2f14b49665bbb4 100644 (file)
--- 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
@@ -180,4 +180,5 @@ DatabasePreferencesPage_Specimen_Or_Observation=Specimen or observation configur
 
 ImportFromFileAndChooseVocIdWizardPage_AreaVoc=Area Vocabulary
 ImportFromFileAndChooseVocIdWizardOage_AreaVoc_toolTip=Please choose a vocabulary for the used areas.
-
+ExcelDistributionUpdateWizard_ConfiguratorWizard_label=Configure Excel distribution update
+AbstractImportWizard_ConfigurationLabel=Configure the Import

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 ccac36b218784f9b4fd00fb95f2f0970fb0334bd..8213d6aa2a558990e3185e6c0740fc1a25d6efbf 100644 (file)
--- 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
@@ -180,3 +180,5 @@ DatabasePreferencesPage_Specimen_Or_Observation=Konfiguration von Specimen und O
 
 ImportFromFileAndChooseVocIdWizardPage_AreaVoc=Area Vokabular
 ImportFromFileAndChooseVocIdWizardOage_AreaVoc_toolTip=Bitte wählen Sie ein Vokabular für die genutzten Areas aus.
+ExcelDistributionUpdateWizard_ConfiguratorWizard_label=Konfiguration des Excel Distribution Updates
+AbstractImportWizard_ConfigurationLabel=Konfiguration des Imports