From c561be3c0a035b6d4c2e3641a2653891f5bdf4e1 Mon Sep 17 00:00:00 2001
From: Tobias Schwarz
Date: Thu, 19 Sep 2013 09:33:37 +0200
Subject: Target Explorer: cleanup context menu contributions

---
 .../te/launch/core/bindings/LaunchConfigTypeBindingsManager.java    | 6 +++---
 target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/bindings/LaunchConfigTypeBindingsManager.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/bindings/LaunchConfigTypeBindingsManager.java
index c2263a345..6c9839204 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/bindings/LaunchConfigTypeBindingsManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/bindings/LaunchConfigTypeBindingsManager.java
@@ -102,7 +102,7 @@ public class LaunchConfigTypeBindingsManager {
 		return (launchConfigType != null &&
 						(selection.getLaunchMode() == null || launchConfigType.supportsMode(selection.getLaunchMode())) &&
 						binding != null && binding.validate(selection) == EvaluationResult.TRUE &&
-						(unBinding == null || unBinding.validate(selection) == EvaluationResult.FALSE));
+						(unBinding == null || unBinding.validate(selection) != EvaluationResult.TRUE));
 	}
 
 	/**
@@ -121,8 +121,8 @@ public class LaunchConfigTypeBindingsManager {
 		ILaunchConfigurationType launchConfigType = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(typeId);
 		return (launchConfigType != null &&
 						(mode == null || launchConfigType.supportsMode(mode)) &&
-						binding != null && binding.validate(mode, context) != EvaluationResult.FALSE &&
-						(unBinding == null || unBinding.validate(mode, context) == EvaluationResult.FALSE));
+						binding != null && binding.validate(mode, context) == EvaluationResult.TRUE &&
+						(unBinding == null || unBinding.validate(mode, context) != EvaluationResult.TRUE));
 	}
 
 	/**
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml
index 2a9eab95f..3a4761012 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml
@@ -183,7 +183,7 @@
 <!-- Menu contributions -->
    <extension point="org.eclipse.ui.menus">
    <!-- Project explorer menu contributions -->
-      <menuContribution locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?before=additions">
+      <!--menuContribution locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?before=additions">
          <separator name="org.eclipse.tcf.te.tcf.launch.ui.remote.app.launch" visible="true"/>
          <command
                commandId="org.eclipse.tcf.te.tcf.launch.ui.remote.app.command.run"
@@ -243,10 +243,10 @@
                </with>
             </visibleWhen>
          </command>
-      </menuContribution>
+      </menuContribution -->
       
    <!-- Target explorer menu contributions -->
-      <menuContribution locationURI="popup:org.eclipse.tcf.te.ui.views.View#Popup?before=additions">
+      <menuContribution locationURI="popup:org.eclipse.tcf.te.ui.views.View#Popup?after=group.launch.rundebug">
          <separator name="org.eclipse.tcf.te.tcf.launch.ui.remote.app.launch" visible="true"/>
          <command
                commandId="org.eclipse.tcf.te.tcf.launch.ui.remote.app.command.run"
-- 
cgit v1.2.3