adapted menu and view labels for validation framework, removed menu for problems...

diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
index 8224ccffde6806160e0f5a86c61e245d315edb53..52948142215da5bdb8576fb4b13076811118e938 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
@@ -129,4 +129,14 @@ command.name.37 = Use Existing Image
 command.name.38 = Open Checklist Editor\r
 command.name.39 = New Datasource\r
 wizard.name = Specimen Search/Import\r
-wizard.description = Queries data provider for specimens with specified parameters.\nNote: Query results are currently limited to 100.
\ No newline at end of file
+wizard.description = Queries data provider for specimens with specified parameters.\nNote: Query results are currently limited to 100.\r
+command.name.40 = Validation\r
+view.name.6 = Validation\r
+marker.field.0 = Object Type\r
+marker.field.1 = Object\r
+marker.field.2 = Attribute\r
+marker.field.3 = Problematic Value\r
+marker.field.4 = Problem description\r
+marker.field.5 = Validator\r
+marker.field.6 = Entity Class\r
+marker.field.7 = Entity Id
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
index cde90f57ab9ac3d73bd60eca09090805549d1a99..a44064c3a68ee6025d3e3596016b12f30935769e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
@@ -128,4 +128,14 @@ command.name.37 = Benutze vorhandenes Bild
 command.name.38 = \u00d6ffne Checklist Editor
 command.name.39 = Neue Datenquelle
 wizard.name = Specimen Suche/Import
-wizard.description = Sendet eine Anfrage mit den eingegebenen Parametern an den Datenprovider.\nHinweis: Die Anzahl der Anfrageergebnisse sind auf 100 begrenzt.
\ No newline at end of file
+wizard.description = Sendet eine Anfrage mit den eingegebenen Parametern an den Datenprovider.\nHinweis: Die Anzahl der Anfrageergebnisse sind auf 100 begrenzt.
+command.name.40 = Validierung
+view.name.6 = Validierung
+marker.field.0 = Objekt Typ
+marker.field.1 = Objekt
+marker.field.2 = Attribut
+marker.field.3 = Problematischer Wert
+marker.field.4 = Problem Beschreibung
+marker.field.5 = Validierer
+marker.field.6 = Entitäts Klasse
+marker.field.7 = Entitäts ID
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties
index 552f93a522181099bd0d2c04f36ee6471a3e4bd3..65d48bae536842cd7d76985773f77ae134851e3f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties
@@ -128,4 +128,14 @@ command.name.37 = Use Existing Image
 command.name.38 = Open Checklist Editor\r
 command.name.39 = New Datasource\r
 wizard.name = Specimen Search/Import\r
-wizard.description = Queries data provider for specimens with specified parameters.\nNote: Query results are currently limited to 100.
\ No newline at end of file
+wizard.description = Queries data provider for specimens with specified parameters.\nNote: Query results are currently limited to 100.\r
+command.name.40 = Validation\r
+view.name.6 = Validation\r
+marker.field.0 = Object Type\r
+marker.field.1 = Object\r
+marker.field.2 = Attribute\r
+marker.field.3 = Problematic Value\r
+marker.field.4 = Problem description\r
+marker.field.5 = Validator\r
+marker.field.6 = Entity Class\r
+marker.field.7 = Entity Id
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index 97d74efb4c4717136cc4d3293b3c7f0c249eba3e..f0ff65922f1da3becbff4dd81078b2d8529edc3e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -144,14 +144,26 @@
                id="eu.etaxonomy.taxeditor.editor.view.dataimport.GbifResponseImportView"
                name="%view.name.5">
          </view>
+         <view
+               allowMultiple="false"
+               category="eu.etaxonomy.taxeditor.editor.category"
+               class="eu.etaxonomy.taxeditor.editor.view.validation.ValidationProblemsView"
+               icon="icons/edit_16x16.gif"
+               id="eu.etaxonomy.taxeditor.editor.view.validation.problems"
+               name="%view.name.6">
+         </view>
       </extension>
       
        <!-- VALIDATION RELATED STUFF -->
        <extension point="org.eclipse.ui.menus">
-       <menuContribution locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=org.eclipse.ui.views.showView.problems">
+       <menuContribution locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=org.eclipse.ui.views.showView.supplemental">
+                       <separator
+                  name="eu.etaxonomy.taxeditor.store.showViewMenu.validation.separator"
+                  visible="true">
+            </separator>
                        <command
                              commandId="org.eclipse.ui.views.showView"
-                             label="Validation Problems"
+                             label="%command.name.40"
                              style="push">
                           <parameter
                                 name="org.eclipse.ui.views.showView.viewId"
@@ -159,16 +171,6 @@
                           </parameter>
                        </command>
                </menuContribution>
-       </extension>
-        <extension point="org.eclipse.ui.views">
-               <view
-            allowMultiple="false"
-            category="eu.etaxonomy.taxeditor.editor.category"
-               class="eu.etaxonomy.taxeditor.editor.view.validation.ValidationProblemsView"
-               icon="icons/edit_16x16.gif"
-               id="eu.etaxonomy.taxeditor.editor.view.validation.problems"
-               name="Validation problems">
-           </view>
        </extension>
        <extension point="org.eclipse.core.resources.markers" name="Validation Error" id="eu.etaxonomy.taxeditor.markers.validationerror">
                <super type="org.eclipse.core.resources.problemmarker"/>
@@ -203,42 +205,42 @@
                <markerField
                        class="eu.etaxonomy.taxeditor.editor.view.validation.UserFriendlyTypeNameMarkerField"
                        id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyTypeName"
-                       name="Object Type">
+                       name="%marker.field.0">
                </markerField>
                <markerField
                        class="eu.etaxonomy.taxeditor.editor.view.validation.UserFriendlyDescriptionMarkerField"
                        id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyDescription"
-                       name="Object">
+                       name="%marker.field.1">
                </markerField>
                <markerField
                        class="eu.etaxonomy.taxeditor.editor.view.validation.UserFriendlyFieldNameMarkerField"
                        id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyFieldName"
-                       name="Attribute">
+                       name="%marker.field.2 = Attribute">
                </markerField>
                <markerField
                        class="eu.etaxonomy.taxeditor.editor.view.validation.InvalidValueMarkerField"
                        id="eu.etaxonomy.taxeditor.markers.validation.invalidValue"
-                       name="Problematic Value">
+                       name="%marker.field.3 = Problematic Value">
                </markerField>
                <markerField
                        class="eu.etaxonomy.taxeditor.editor.view.validation.ValidatorMessageMarkerField"
                        id="eu.etaxonomy.taxeditor.markers.validation.validatorMessage"
-                       name="Problem description">
+                       name="%marker.field.4 = Problem description">
                </markerField>
                <markerField
                        class="eu.etaxonomy.taxeditor.editor.view.validation.ValidatorClassMarkerField"
                        id="eu.etaxonomy.taxeditor.markers.validation.validatorClass"
-                       name="Validator">
+                       name="%marker.field.5">
                </markerField>
                <markerField
                        class="eu.etaxonomy.taxeditor.editor.view.validation.EntityClassMarkerField"
                        id="eu.etaxonomy.taxeditor.markers.validation.entityClass"
-                       name="Entity Class">
+                       name="%marker.field.6">
                </markerField>
                <markerField
                        class="eu.etaxonomy.taxeditor.editor.view.validation.EntityIdMarkerField"
                        id="eu.etaxonomy.taxeditor.markers.validation.entityId"
-                       name="Entity Id">
+                       name="%marker.field.7">
                </markerField>
        </extension>
        

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 35df528a69917ea3f08aa1dd2d6fb87048012b57..4f79394c0c4c3f6c43693bffd7edb08f38cefaa3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
@@ -38,7 +38,7 @@ editor.name = Editor f\u00fcr definierte Begriffe
 menu.label = Zeige Ansicht
 command.label = Derivatsuche
 command.label.0 = Details
-command.label.1 = Zusatz
+command.label.1 = Zusatzdaten
 command.label.2 = Datenquelle
 command.label.3 = Fehlermeldungen
 command.label.4 = Berichte

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index df4e937eadc91785948a448c794f0bb765d08c5f..efdf9f78a42c0d1d55c9ed85797b6c495728c1d1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -305,14 +305,16 @@
             </command>
             <command
                   commandId="org.eclipse.ui.views.showView"
-                  label="%command.label.1"
+                  id="org.eclipse.ui.views.showView.supplemental"
+                     label="%command.label.1"
                   style="push">
                <parameter
                      name="org.eclipse.ui.views.showView.viewId"
                      value="eu.etaxonomy.taxeditor.view.supplementalData">
                </parameter>
             </command>
-               <command
+            <!-- Originally used by validation framework, currently not in use -->
+       <!--        <command
                         id="org.eclipse.ui.views.showView.problems"
                     commandId="org.eclipse.ui.views.showView"
                     label="Problems"
@@ -321,7 +323,7 @@
                        name="org.eclipse.ui.views.showView.viewId"
                        value="org.eclipse.ui.views.ProblemView">
                  </parameter>
-              </command>
+              </command>  -->
             <separator
                   name="eu.etaxonomy.taxeditor.store.showViewMenu.internal"
                   visible="true">