Bug 327263 - Allow multiple debug views and multiple debug context providers

1 files changed, 2 insertions, 2 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java
index bcf9c86f0..984b37ede 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java
@@ -155,7 +155,7 @@ public class ExpressionView extends VariablesView {
      */
     protected void initDragAndDrop(TreeModelViewer viewer) {
         viewer.addDragSupport(DND.DROP_MOVE, new Transfer[] {LocalSelectionTransfer.getTransfer()}, new SelectionDragAdapter(viewer));
-        viewer.addDropSupport(DND.DROP_MOVE|DND.DROP_COPY, new Transfer[] {LocalSelectionTransfer.getTransfer(), TextTransfer.getInstance()}, new ExpressionDropAdapter(viewer));
+        viewer.addDropSupport(DND.DROP_MOVE|DND.DROP_COPY, new Transfer[] {LocalSelectionTransfer.getTransfer(), TextTransfer.getInstance()}, new ExpressionDropAdapter(getSite(), viewer));
     }
     
     /* (non-Javadoc)
@@ -226,7 +226,7 @@ public class ExpressionView extends VariablesView {
     
     // TODO: duplicate code from WatchExpressionAction
     protected IDebugElement getContext() {
-        IAdaptable object = DebugUITools.getDebugContext();
+        IAdaptable object = DebugUITools.getPartDebugContext(getSite());
         IDebugElement context = null;
         if (object instanceof IDebugElement) {
             context = (IDebugElement) object;