merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / plugin.xml

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index 9c171a2137d2e1a25755a48885d8bf1b87fc6a66..ed687ff8531d18b08f56b8ad3e58cc0ccf77fd65 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -982,7 +982,7 @@
                style="push">
             <visibleWhen>
                <reference
                style="push">
             <visibleWhen>
                <reference

-                     definitionId="isGroup">
+                     definitionId="isGroupEditor">

                </reference>
             </visibleWhen>
          </command>
                </reference>
             </visibleWhen>
          </command>


@@ -1741,11 +1741,11 @@
          </with>
       </definition>
       <definition
          </with>
       </definition>
       <definition

-            id="isGroup">
+            id="isGroupEditor">

          <with
                variable="activeEditor">
             <test
          <with
                variable="activeEditor">
             <test

-                  property="taxeditor-bulkeditor.propertyTester.isGroup">
+                  property="taxeditor-bulkeditor.propertyTester.isGroupEditor">

             </test>
          </with>
       </definition>
             </test>
          </with>
       </definition>


@@ -1797,7 +1797,7 @@
             class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"
             id="taxeditor-bulkeditor.PropertyTester"
             namespace="taxeditor-bulkeditor.propertyTester"
             class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"
             id="taxeditor-bulkeditor.PropertyTester"
             namespace="taxeditor-bulkeditor.propertyTester"

-            properties="isGroup"
+            properties="isGroupEditor"

             type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
       </propertyTester>
       <propertyTester
             type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
       </propertyTester>
       <propertyTester