Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2012-10-18 09:00:18 +0000
committerUwe Stieber2012-10-18 09:00:18 +0000
commit64273084c411ea7b319721f81dc28d108936375e (patch)
tree65e4f31a78e6e96b3f4cd281c8b96a8cae95f4c6 /target_explorer/plugins
parent46d6bef1e99bd6ba14ad21e98524b21162672523 (diff)
downloadorg.eclipse.tcf-64273084c411ea7b319721f81dc28d108936375e.tar.gz
org.eclipse.tcf-64273084c411ea7b319721f81dc28d108936375e.tar.xz
org.eclipse.tcf-64273084c411ea7b319721f81dc28d108936375e.zip
Target Explorer: Fix invalid actionProvider enablement expression
Diffstat (limited to 'target_explorer/plugins')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml8
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml56
2 files changed, 31 insertions, 33 deletions
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>

Back to the top