From 64273084c411ea7b319721f81dc28d108936375e Mon Sep 17 00:00:00 2001
From: Uwe Stieber
Date: Thu, 18 Oct 2012 11:00:18 +0200
Subject: Target Explorer: Fix invalid actionProvider enablement expression

---
 .../org.eclipse.tcf.te.launch.ui/plugin.xml        |  8 +++-
 .../plugins/org.eclipse.tcf.te.ui.views/plugin.xml | 56 ++++++++++------------
 2 files changed, 31 insertions(+), 33 deletions(-)

(limited to 'target_explorer/plugins')

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml
index 3e0080994..8df48a5af 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml
@@ -106,7 +106,13 @@
                id="org.eclipse.tcf.te.launch.ui.actions.open"
                overrides="org.eclipse.ui.navigator.resources.OpenActions">
 	        <enablement>
-               <reference definitionId="launch.expressions.isSingleLaunchConfig"/>
+	           <and>
+                  <instanceof value="org.eclipse.tcf.te.launch.ui.model.LaunchNode"/>
+                  <or>
+	                 <test property="org.eclipse.tcf.te.launch.ui.model.isLaunchConfig"/>
+	                 <test property="org.eclipse.tcf.te.launch.ui.model.isLaunchConfigType"/>
+	              </or>
+	           </and>
             </enablement>
          </actionProvider>
          <dropAssistant
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
index 4553cfd03..e9736b6cf 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
@@ -119,22 +119,18 @@
             class="org.eclipse.tcf.te.ui.views.actions.NewActionProvider"
             id="org.eclipse.tcf.te.ui.views.navigator.actions.NewActionProvider">
          <enablement>
-            <with variable="selection">
-               <iterate operator="and" ifEmpty="false">
-                  <or>
-                     <not>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.eclipse.tcf.te.runtime.services.hasService"
-                              value="org.eclipse.tcf.te.runtime.services.interfaces.IMenuService"/>
-                     </not>
-                     <test
-                           property="org.eclipse.tcf.te.runtime.services.menu.isVisible"
-                           args="org.eclipse.tcf.te.ui.views.navigator.actions.NewActionProvider"
-                           value="true"/>
-                  </or>
-               </iterate>
-            </with>
+            <or>
+               <not>
+                  <test
+                        forcePluginActivation="true"
+                        property="org.eclipse.tcf.te.runtime.services.hasService"
+                        value="org.eclipse.tcf.te.runtime.services.interfaces.IMenuService"/>
+               </not>
+               <test
+                     property="org.eclipse.tcf.te.runtime.services.menu.isVisible"
+                     args="org.eclipse.tcf.te.ui.views.navigator.actions.NewActionProvider"
+                     value="true"/>
+            </or>
          </enablement>
       </actionProvider>
 
@@ -142,22 +138,18 @@
             class="org.eclipse.tcf.te.ui.views.actions.GoIntoActionProvider"
             id="org.eclipse.tcf.te.ui.views.navigator.actions.GoIntoActionProvider">
          <enablement>
-            <with variable="selection">
-               <iterate operator="and" ifEmpty="false">
-                  <or>
-                     <not>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.eclipse.tcf.te.runtime.services.hasService"
-                              value="org.eclipse.tcf.te.runtime.services.interfaces.IMenuService"/>
-                     </not>
-                     <test
-                           property="org.eclipse.tcf.te.runtime.services.menu.isVisible"
-                           args="org.eclipse.tcf.te.ui.views.navigator.actions.GoIntoActionProvider"
-                           value="true"/>
-                  </or>
-               </iterate>
-            </with>
+            <or>
+               <not>
+                  <test
+                        forcePluginActivation="true"
+                        property="org.eclipse.tcf.te.runtime.services.hasService"
+                        value="org.eclipse.tcf.te.runtime.services.interfaces.IMenuService"/>
+               </not>
+               <test
+                     property="org.eclipse.tcf.te.runtime.services.menu.isVisible"
+                     args="org.eclipse.tcf.te.ui.views.navigator.actions.GoIntoActionProvider"
+                     value="true"/>
+            </or>
          </enablement>
       </actionProvider>
       
-- 
cgit v1.2.3