Bug 70938 - Need to be able to turn off "Watch" action for IVariable

2 files changed, 22 insertions, 8 deletions

diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/IExpressionManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/IExpressionManager.java
index 669d63fd0..cf9b14b88 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/IExpressionManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/IExpressionManager.java
@@ -152,6 +152,18 @@ public interface IExpressionManager {
 	 * @see IWatchExpressionDelegate
 	 */
 	public IWatchExpressionDelegate newWatchExpressionDelegate(String id);
+    
+    /**
+     * Returns whether a watch expression delegate has been contributed for
+     * the given debug model.
+     * 
+     * @param id the unique identifier of a debug model
+     * @return whether a watch expression delegate has been contributed for
+     *    the given debug model
+     * @since 3.1
+     * @see IWatchExpressionDelegate
+     */    
+    public boolean hasWatchExpressionDelegate(String id);
 }
 
 
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java
index e957c50eb..7e7c49cc9 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java
@@ -116,14 +116,8 @@ public class ExpressionManager implements IExpressionManager, IDebugEventSetList
 		}
 	}
 	
-	/**
-	 * Returns a watch expression delegate specified for the given debug
-	 * model via extension or <code>null</code> if no delegate is available.
-	 * 
-	 * @param debugModel the unique identifier of a debug model
-	 * @return a watch expression delegate associated with the given model
-	 * 		or <code>null</code> if none
-	 * @since 3.0
+	/* (non-Javadoc)
+	 * @see org.eclipse.debug.core.IExpressionManager#newWatchExpressionDelegate(java.lang.String)
 	 */
 	public IWatchExpressionDelegate newWatchExpressionDelegate(String debugModel) {
 		try {
@@ -138,6 +132,14 @@ public class ExpressionManager implements IExpressionManager, IDebugEventSetList
 		}
 	}
 
+    /* (non-Javadoc)
+     * @see org.eclipse.debug.core.IExpressionManager#hasWatchExpressionDelegate(java.lang.String)
+     */
+    public boolean hasWatchExpressionDelegate(String id) {
+        IConfigurationElement element= (IConfigurationElement) fWatchExpressionDelegates.get(id);
+        return element != null;
+    }
+    
 	/**
 	 * Loads any persisted watch expresions from the preferences.
 	 * NOTE: It's important that no setter methods are called on