Minor debugging fixes
diff --git a/core/plugins/org.eclipse.dltk.debug.ui/plugin.xml b/core/plugins/org.eclipse.dltk.debug.ui/plugin.xml
index 4aa1b94..ac4709c 100644
--- a/core/plugins/org.eclipse.dltk.debug.ui/plugin.xml
+++ b/core/plugins/org.eclipse.dltk.debug.ui/plugin.xml
@@ -95,10 +95,18 @@
label="%RunMenu.label"
path="additions"
id="org.eclipse.ui.run">
- <separator
- name="dltkGroup">
+ <separator
+ name="dltkGroup">
</separator>
- </menu>
+ </menu>
+
+ <action
+ class="org.eclipse.dltk.internal.debug.ui.actions.WatchAction"
+ enablesFor="+"
+ id="org.eclipse.dltk.debug.ui.Watch"
+ label="Watch!!!!"
+ menubarPath="org.eclipse.ui.run/dltkGroup">
+ </action>
</actionSet>
</extension>
<extension
diff --git a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/debug/ui/ScriptDebugModelPresentation.java b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/debug/ui/ScriptDebugModelPresentation.java
index 8169e3b..0350ab5 100644
--- a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/debug/ui/ScriptDebugModelPresentation.java
+++ b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/debug/ui/ScriptDebugModelPresentation.java
@@ -223,9 +223,13 @@
}
public void computeDetail(IValue value, IValueDetailListener listener) {
- String detail = "";
+ String detail = "Can't compute detail";
try {
- detail = value.getValueString();
+ if (value.hasVariables()) {
+ detail = value.getReferenceTypeName();
+ } else {
+ detail = value.getValueString();
+ }
} catch (DebugException e) {
DLTKDebugUIPlugin.log(e);
}
diff --git a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/ScriptDebugOptionsManager.java b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/ScriptDebugOptionsManager.java
index 14409ab..4175397 100644
--- a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/ScriptDebugOptionsManager.java
+++ b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/ScriptDebugOptionsManager.java
@@ -34,7 +34,7 @@
import org.eclipse.jface.viewers.ILabelProvider;
public class ScriptDebugOptionsManager implements IDebugEventSetListener,
- IPropertyChangeListener, IScriptBreakpointListener, ILaunchListener,
+ IPropertyChangeListener, IScriptBreakpointListener , ILaunchListener,
IBreakpointsListener {
private static ScriptDebugOptionsManager fgOptionsManager;
diff --git a/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/actions/WatchAction.java b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/actions/WatchAction.java
new file mode 100644
index 0000000..2338dec
--- /dev/null
+++ b/core/plugins/org.eclipse.dltk.debug.ui/src/org/eclipse/dltk/internal/debug/ui/actions/WatchAction.java
@@ -0,0 +1,30 @@
+package org.eclipse.dltk.internal.debug.ui.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+public class WatchAction implements IWorkbenchWindowActionDelegate {
+
+ public void dispose() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void init(IWorkbenchWindow window) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void run(IAction action) {
+ System.out.println("WatchAction.run()");
+
+ }
+
+ public void selectionChanged(IAction action, ISelection selection) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
