Bug 301825 - [breakpoints] Breakpoints view doesn't always link with Debug view any more

2 files changed, 5 insertions, 5 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java
index 3d491d5e2..3c13a0a41 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java
@@ -31,7 +31,7 @@ import org.eclipse.debug.core.model.IVariable;
 import org.eclipse.debug.core.model.IWatchExpression;
 import org.eclipse.debug.internal.ui.breakpoints.provisional.IBreakpointContainer;
 import org.eclipse.debug.internal.ui.elements.adapters.AsynchronousDebugLabelAdapter;
-import org.eclipse.debug.internal.ui.elements.adapters.DefaultBreakpointManagerInput;
+import org.eclipse.debug.internal.ui.elements.adapters.DefaultBreakpointsViewInput;
 import org.eclipse.debug.internal.ui.elements.adapters.DefaultViewerInputProvider;
 import org.eclipse.debug.internal.ui.elements.adapters.MemoryBlockContentAdapter;
 import org.eclipse.debug.internal.ui.elements.adapters.MemoryBlockLabelAdapter;
@@ -193,7 +193,7 @@ public class DebugElementAdapterFactory implements IAdapterFactory {
             if (adaptableObject instanceof IMemoryBlock) {
             	return fgCPMemoryBlock;
             }            
-            if (adaptableObject instanceof DefaultBreakpointManagerInput) {
+            if (adaptableObject instanceof DefaultBreakpointsViewInput) {
             	return fgCPBreakpointManager;
             }
             if (adaptableObject instanceof IBreakpoint) {
@@ -240,7 +240,7 @@ public class DebugElementAdapterFactory implements IAdapterFactory {
         			adaptableObject instanceof IStackFrame || adaptableObject instanceof IExpressionManager ||
         			adaptableObject instanceof IExpression || adaptableObject instanceof IMemoryBlockRetrieval ||
         			adaptableObject instanceof IMemoryBlock ||
-        			adaptableObject instanceof DefaultBreakpointManagerInput ||
+        			adaptableObject instanceof DefaultBreakpointsViewInput ||
         			adaptableObject instanceof IBreakpoint ||
         			adaptableObject instanceof IBreakpointContainer)
         	return fgModelProxyFactoryAdapter;
@@ -289,7 +289,7 @@ public class DebugElementAdapterFactory implements IAdapterFactory {
         	if (adaptableObject instanceof IBreakpointContainer) {
         		return fgMPBreakpointContainer;
         	}
-        	if (adaptableObject instanceof DefaultBreakpointManagerInput) {
+        	if (adaptableObject instanceof DefaultBreakpointsViewInput) {
         		return fgMPBreakpointManagerInput;
         	}
         }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
index adf60b1ee..44de3ddaa 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
@@ -776,7 +776,7 @@ public class LaunchView extends AbstractDebugView implements ISelectionChangedLi
 	 */
 	protected Viewer createViewer(Composite parent) {
 		fPresentation = new DelegatingModelPresentation();
-		fPresentationContext = new DebugModelPresentationContext(IDebugUIConstants.ID_DEBUG_VIEW, fPresentation);
+		fPresentationContext = new DebugModelPresentationContext(IDebugUIConstants.ID_DEBUG_VIEW, this, fPresentation);
 		TreeModelViewer viewer = new TreeModelViewer(parent,
 				SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.VIRTUAL,
 				fPresentationContext);