ref #8562: ui issues in preferences

diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
index 579878321e37fdd9dfa300c3bc05bd42ee77ebb4..b8674e7efd696f704694b937d32d1a527164b110 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
@@ -10,7 +10,7 @@ page.name.6 = Nomenclatural Status
 page.name.7 = Name Relationships\r
 page.name.8 = Concept Relationships\r
 page.name.9 = Type Designation (Specimen)\r
-page.name.10 = Available Languages\r
+page.name.10 = Multi-Language Support\r
 page.name.11 = Marker\r
 page.name.12 = Extension Types\r
 page.name.13 = Type Designation (Name)\r
@@ -22,7 +22,7 @@ page.name.18 = Team or Person Matching Strategy
 page.name.19 = Stage\r
 page.name.20 = Preservation Method\r
 page.name.22 = Default Feature Trees\r
-page.name.23 = Multi-Language Support\r
+page.name.23 = Application\r
 page.name.24 = Mobot Open Url\r
 page.name.25 = Type Designations\r
 page.name.36 = Details View\r
@@ -200,7 +200,7 @@ extension-point.name.0 = Preference Page
 extension-point.name.1 = Admin Preference Page\r
 page.name.45 = Specimen\r
 page.name.46 = Publish Flag\r
-page.name.47 = Common Names\r
+page.name.47 = Areas for Common Names\r
 page.name.48 = Search Dialogs\r
 command.name.111 = Open Admin Distributionstatus-Wizard\r
 command.name.112 = Open Admin CommonNameArea-Wizard\r
@@ -254,7 +254,7 @@ page.name.54 = External Services
 page.name.55 = Supplemental Data\r
 page.name.56 = Search\r
 page.name.57 = Taxon Search\r
-page.name.58 = Common Names\r
+page.name.58 = Common Name Languages\r
 handledmenuitem.label.15 = Move term\r
 partdescriptor.label.2 = Term Search\r
 partdescriptor.label.3 = Occurrence Search\r

diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
index 993dcc1da673ecefa2c783a84e930c76fedf8669..1b6c9027c8e355229b8638435734ac406ff2bfe9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
@@ -10,7 +10,7 @@ page.name.6 = Nomenklatorischer Status
 page.name.7 = Namensbeziehungen
 page.name.8 = Konzeptbeziehungen
 page.name.9 = Typusarten (Belege)
-page.name.10 = Verf\u00fcgbare Sprachen
+page.name.10 = Mehrsprachigkeit
 page.name.11 = Marker
 page.name.12 = Erweiterungen
 page.name.13 = Typusarten (Namen)
@@ -22,7 +22,7 @@ page.name.18 = Team oder Personen Matching-Strategie
 page.name.19 = Stadium
 page.name.20 = Konservierungsmethoden
 page.name.22 = Standard Merkmalsbaum
-page.name.23 = Mehrsprachigkeit
+page.name.23 = Anwendung
 page.name.24 = Mobot Open Url
 page.name.25 = Typus
 page.name.36 = Details View
@@ -200,7 +200,7 @@ extension-point.name.0 = Pr
 extension-point.name.1 = Admin Präferenzen
 page.name.45 = Specimen
 page.name.46 = Publish Flag
-page.name.47 = Trivialnamen
+page.name.47 = Areale für Trivialnamen
 page.name.48 = Auswahldialoge
 command.name.111 = \u00d6ffne Admin Verbreitungsstatus-Wizard
 command.name.112 = \u00d6ffne Admin Common Name Area-Wizard
@@ -254,7 +254,7 @@ page.name.54 = Externe Services
 page.name.55 = Zusatzdaten
 page.name.56 = Suche
 page.name.57 = Taxonsuche
-page.name.58 = Trivialnamen
+page.name.58 = Sprachen für Trivialnamen
 handledmenuitem.label.15 = Verschiebe Term
 partdescriptor.label.2 = Term Suche
 partdescriptor.label.3 = Occurrence Suche

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index 1603dcf345400a228b22b3222f718c28fbcf1923..b695950f13dc4af177c44fa640e0adfe9144291c 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -604,13 +604,13 @@
          name="%page.name.27">
    </page>
     <page
-         category="eu.etaxonomy.taxeditor.preference.UIPreferences"
+         category="eu.etaxonomy.taxeditor.preferences.description"
          class="eu.etaxonomy.taxeditor.preference.DistributionGeneralPreference"
          id="eu.etaxonomy.taxeditor.preference.DistributionGeneralPreference"
          name="%page.name.104">
    </page>
    <page
-         category="eu.etaxonomy.taxeditor.preference.DistributionGeneralPreference"
+         category="eu.etaxonomy.taxeditor.preference.UIPreferences"
          class="eu.etaxonomy.taxeditor.preference.ChecklistEditorGeneralPreference"
          id="eu.etaxonomy.taxeditor.preference.ChecklistEditorGeneralPreferencePage"
          name="%page.name.28">
@@ -783,7 +783,7 @@
             name="%page.name.22">
       </page>
       <page 
-            category="eu.etaxonomy.taxeditor.store.UIAdminPreference"
+            category="eu.etaxonomy.taxeditor.preferences.description"
             class="eu.etaxonomy.taxeditor.preference.DistributionGeneralPreference"
             id="eu.etaxonomy.taxeditor.store.Distribution"
             name="%page.name.104">
@@ -807,7 +807,7 @@
             name="%page.name.51">
       </page>
       <page 
-            category="eu.etaxonomy.taxeditor.store.Distribution"
+            category="eu.etaxonomy.taxeditor.store.UIAdminPreference"
             class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.ChecklistEditorGeneralAdminPreference"
             id="eu.etaxonomy.taxeditor.store.checklist"
             name="%page.name.21">

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/CommonNameVocabularyAdminPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/CommonNameVocabularyAdminPreferencePage.java
index cc21f7e29b28fc262021264d98387ba2bb847576..97953bc2c89551e9cfb56a36bb35b80bb6ab6cb4 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/CommonNameVocabularyAdminPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/CommonNameVocabularyAdminPreferencePage.java
@@ -8,8 +8,6 @@
 */
 package eu.etaxonomy.taxeditor.databaseAdmin.preferencePage;
 
-import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
-import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.taxeditor.preference.CommonNameVocabularyPreferencePage;
 
 /**
@@ -21,9 +19,8 @@ public class CommonNameVocabularyAdminPreferencePage extends CommonNameVocabular
 
 
     public CommonNameVocabularyAdminPreferencePage(){
+        super();
         isAdminPreference = true;
-        setPredicate(PreferencePredicate.CommonNameAreaVocabularies);
-        type = TermType.NamedArea;
 
     }
 

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 a4fc7ee55ca77938c2556c49e1c0a6869a2068a4..ff4f287a068c86b3b3a64c69b7e000255fd67585 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
@@ -736,6 +736,10 @@ public class Messages extends NLS {
     public static String CommonNameLanguages_Title;
 
 
+    public static String CommonNameVocabularyPreferencePage_description;
+    public static String CommonNameLanguagePreferencePage_description;
+
+
     public static String AggregationWizardPage_WITHOUT_CHILDREN;
 
 

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 2c1bf8d33d9418cb709dd344b3a32e20f949baad..1148fa70cffc5be224267df715bf60a59374aaf7 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
@@ -567,4 +567,6 @@ AggregationWizardPage_WITHOUT_CHILDREN= (without children)
 SetAggregationConfiguration_Title=Aggregation configuration;
 StructuredDescriptionAggregationWizardPage_SELECT_SUBTREE=Select subtree(s) for aggregation
 StructuredDescriptionAggregationWizardPage_TOOLTIP_SELECT_SUBTREE=If not all subtrees included in the descriptive data set should be aggregated, select the subtrees for the aggregation
-CommonNameLanguages_Title=Common Name Languages
\ No newline at end of file
+CommonNameLanguages_Title=Common Name Languages
+CommonNameVocabularyPreferencePage_description=Select the vocabularies for common name area selection.
+CommonNameLanguagePreferencePage_description=Choose the languages available for common names.
\ 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 cab6fc2519094408742ef8586ebef0c98649705d..6e4a6451da1d9c027b07a69ae5d1fdb7e7568ec1 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
@@ -565,4 +565,6 @@ AggregationWizardPage_SINGLE_TAXON=Aggregation nur f
 SetAggregationConfiguration_Title=Aggregationskonfiguration
 StructuredDescriptionAggregationWizardPage_SELECT_SUBTREE=Auswahl des Teilbaums für die Aggregation
 StructuredDescriptionAggregationWizardPage_TOOLTIP_SELECT_SUBTREE=Wenn nicht alle Teilbäume des Descriptive Data Sets in die Aggregation einfließen sollen, dann wählen Sie die zu verwendenden Teilbäume aus.
-CommonNameLanguages_Title=Sprachen für Trivialnamen
\ No newline at end of file
+CommonNameLanguages_Title=Sprachen für Trivialnamen
+CommonNameVocabularyPreferencePage_description=Wählen Sie die Vokabulare, für die Area-Auswahl bei Trivialnamen.
+CommonNameLanguagePreferencePage_description=Wählen Sie die für Trivialnamen verfügbaren Sprachen.
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CommonNameVocabularyPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CommonNameVocabularyPreferencePage.java
index 1fb18f913101c335486c0b414e6c03962874f12c..a3455f3d4660fff273dcd3cb1ad816517174a753 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CommonNameVocabularyPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CommonNameVocabularyPreferencePage.java
@@ -10,6 +10,7 @@ package eu.etaxonomy.taxeditor.preference;
 
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.preference.wizard.GeneralVocabularyPreferencePage;
 
 /**
@@ -23,6 +24,7 @@ public class CommonNameVocabularyPreferencePage extends GeneralVocabularyPrefere
     public CommonNameVocabularyPreferencePage(){
         isAdminPreference = false;
         setPredicate(PreferencePredicate.CommonNameAreaVocabularies);
+        setDescription(Messages.CommonNameVocabularyPreferencePage_description);
         type = TermType.NamedArea;
 
     }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CommonNameLanguagePreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CommonNameLanguagePreferences.java
index 4b135047561431912ea177a5d227522e02c9b862..c3822a511f730dbce234d4e8fae0c7e6e909f656 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CommonNameLanguagePreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CommonNameLanguagePreferences.java
@@ -34,6 +34,7 @@ public class CommonNameLanguagePreferences extends GeneralTermPreferencePage {
 
         isAdminPreference = false;
         setPredicate(PreferencePredicate.CommonNameLanguages);
+        setDescription(Messages.CommonNameLanguagePreferencePage_description);
         type = TermType.Language;
 
        }