Fixed properties tester for ObjectTools. issue #723

diff --git a/src/java/netxms-eclipse/ObjectTools/plugin.xml b/src/java/netxms-eclipse/ObjectTools/plugin.xml
index 576ff6d..61deca9 100644 (file)
--- a/src/java/netxms-eclipse/ObjectTools/plugin.xml
+++ b/src/java/netxms-eclipse/ObjectTools/plugin.xml
@@ -194,10 +194,14 @@
             id="org.netxms.ui.eclipse.objecttools.propertypages.Columns#4"
             name="%page.name.Columns">
          <enabledWhen>
-            <test
-                  forcePluginActivation="true"
-                  property="org.netxms.ui.eclipse.objecttools.hasType">
-            </test>
+            <and>
+               <instanceof
+                     value="org.netxms.client.objecttools.ObjectTool">
+               </instanceof>
+               <test
+                     property="org.netxms.ui.eclipse.objecttools.hasObjectToolsType">
+               </test>
+            </and>
          </enabledWhen>
       </page>
       <page
@@ -271,7 +275,7 @@
             class="org.netxms.ui.eclipse.objecttools.ObjectToolsPopertyTester"
             id="org.netxms.ui.eclipse.objecttools.ObjectToolsPropertyTester"
             namespace="org.netxms.ui.eclipse.objecttools"
-            properties="hasType"
+            properties="hasObjectToolsType"
             type="org.netxms.client.objecttools.ObjectTool">
       </propertyTester>
    </extension>

diff --git a/src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsPopertyTester.java b/src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsPopertyTester.java
index 8f50f97..ff53062 100644 (file)
--- a/src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsPopertyTester.java
+++ b/src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsPopertyTester.java
@@ -30,7 +30,7 @@ public class ObjectToolsPopertyTester extends PropertyTester
    @Override
    public boolean test(Object receiver, String property, Object[] args, Object expectedValue)
    {
-      if (!(receiver instanceof ObjectTool))
+      if (!(receiver instanceof ObjectTool) || !property.equals("hasObjectToolsType"))
          return false;
 
       ObjectTool objectTool = (ObjectTool)receiver;

diff --git a/webui/webapp/ObjectTools/plugin.xml b/webui/webapp/ObjectTools/plugin.xml
index 249e387..66a1799 100644 (file)
--- a/webui/webapp/ObjectTools/plugin.xml
+++ b/webui/webapp/ObjectTools/plugin.xml
@@ -178,10 +178,14 @@
             id="org.netxms.ui.eclipse.objecttools.propertypages.Columns#4"
             name="%page.name.Columns">
          <enabledWhen>
-            <test
-                  forcePluginActivation="true"
-                  property="org.netxms.ui.eclipse.objecttools.hasType">
-            </test>
+            <and>
+               <instanceof
+                     value="org.netxms.client.objecttools.ObjectTool">
+               </instanceof>
+               <test
+                     property="org.netxms.ui.eclipse.objecttools.hasObjectToolsType">
+               </test>
+            </and>
          </enabledWhen>
       </page>
       <page
@@ -255,7 +259,7 @@
             class="org.netxms.ui.eclipse.objecttools.ObjectToolsPopertyTester"
             id="org.netxms.ui.eclipse.objecttools.ObjectToolsPropertyTester"
             namespace="org.netxms.ui.eclipse.objecttools"
-            properties="hasType"
+            properties="hasObjectToolsType"
             type="org.netxms.client.objecttools.ObjectTool">
       </propertyTester>
    </extension>

diff --git a/webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsPopertyTester.java b/webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsPopertyTester.java
index 8f50f97..ff53062 100644 (file)
--- a/webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsPopertyTester.java
+++ b/webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsPopertyTester.java
@@ -30,7 +30,7 @@ public class ObjectToolsPopertyTester extends PropertyTester
    @Override
    public boolean test(Object receiver, String property, Object[] args, Object expectedValue)
    {
-      if (!(receiver instanceof ObjectTool))
+      if (!(receiver instanceof ObjectTool) || !property.equals("hasObjectToolsType"))
          return false;
 
       ObjectTool objectTool = (ObjectTool)receiver;