ref #6619: small changes in importFromFileAndChooseVocIdWizard

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileAndChooseVocIdWizardOage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileAndChooseVocIdWizardOage.java
index db086ab2e582b5ad9a6d96929bc8a2dce94cc900..d229c4696dc3b36bcf2afe552981184b229940ea 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileAndChooseVocIdWizardOage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileAndChooseVocIdWizardOage.java
@@ -14,14 +14,17 @@ import java.util.UUID;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
 
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
@@ -49,7 +52,11 @@ public class ImportFromFileAndChooseVocIdWizardOage extends ImportFromFileDataSo
         super.createControl(parent);
         Composite composite = (Composite)getControl();
       //  final Composite composite = new Composite(parent, SWT.NULL);
-
+        GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false);
+        composite.setLayoutData(gridData);
+        Label label = new Label(composite, SWT.NONE);
+        label.setText(Messages.ImportFromFileAndChooseVocIdWizardPage_AreaVoc);
+        label.setToolTipText(Messages.ImportFromFileAndChooseVocIdWizardOage_AreaVoc_toolTip);
         vocabularyCombo = new Combo(composite, SWT.DROP_DOWN);
         List<TermVocabulary<DefinedTermBase>> vocs = CdmStore.getService(IVocabularyService.class).findByTermType(TermType.NamedArea);
         for(TermVocabulary voc: vocs){

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 288d030f09793d0076cc04680a644ce55698ec23..6d4d7c435f64540a09640aa2e4ddeae0a06b8e91 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
@@ -189,6 +189,10 @@ public class Messages extends NLS {
     public static String DatabasePreferencesPage_UseLocalPreferences;
     public static String DatabasePreferencesPage_Specimen_Or_Observation;
 
+    public static String ImportFromFileAndChooseVocIdWizardPage_AreaVoc;
+
+    public static String ImportFromFileAndChooseVocIdWizardOage_AreaVoc_toolTip;
+
     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 509e226ced78ec11f9cc0781d7e65b1e402d0931..4d5484dc9ac7731e13a9859e11d1f28f66ffaf1a 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
@@ -177,3 +177,7 @@ DatabasePreferencesPage_Show_NameRelations=Show name relations
 DatabasePreferencesPage_Define_Default_NomenclaturalCode=Define default nomenclatural code
 DatabasePreferencesPage_UseLocalPreferences=Allow to use local preference
 DatabasePreferencesPage_Specimen_Or_Observation=Specimen or observation configuration
+
+ImportFromFileAndChooseVocIdWizardPage_AreaVoc=Area Vocabulary
+ImportFromFileAndChooseVocIdWizardOage_AreaVoc_toolTip=Please choose a vocabulary for the used areas.
+

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 4296451a871146d78c091b0cec9b873326408b8b..ccac36b218784f9b4fd00fb95f2f0970fb0334bd 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
@@ -177,3 +177,6 @@ DatabasePreferencesPage_Show_NameRelations=Zeige Namensrelationen
 DatabasePreferencesPage_Define_Default_NomenclaturalCode=Festlegen des default Nomenklatorischen Codes
 DatabasePreferencesPage_UseLocalPreferences=Erlaube das lokale Überschreiben
 DatabasePreferencesPage_Specimen_Or_Observation=Konfiguration von Specimen und Observationen
+
+ImportFromFileAndChooseVocIdWizardPage_AreaVoc=Area Vokabular
+ImportFromFileAndChooseVocIdWizardOage_AreaVoc_toolTip=Bitte wählen Sie ein Vokabular für die genutzten Areas aus.