From 2cf9b4dfb164dc530e4f7ca72c6806a448ac18f2 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Mon, 18 Dec 2006 14:50:53 +0000 Subject: [PATCH] Bug 166997 - Patch from Darin Wright. Adjust to changes in internal interfaces for M4. --- .../adapters/CDebugElementAdapterFactory.java | 2 +- .../ui/views/modules/ModuleContentAdapter.java | 2 +- .../ui/views/modules/ModuleProxyFactory.java | 17 ++++++----------- .../internal/ui/views/modules/ModulesView.java | 4 ++-- .../views/modules/ModulesViewEventHandler.java | 5 ++--- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java index da84abfb191..3507796399f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java @@ -16,9 +16,9 @@ import org.eclipse.cdt.debug.core.model.IModuleRetrieval; import org.eclipse.cdt.debug.internal.ui.views.modules.ModuleContentAdapter; import org.eclipse.cdt.debug.internal.ui.views.modules.ModuleProxyFactory; import org.eclipse.core.runtime.IAdapterFactory; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactoryAdapter; import org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousContentAdapter; import org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousLabelAdapter; -import org.eclipse.debug.internal.ui.viewers.provisional.IModelProxyFactoryAdapter; /** * Comment for . diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleContentAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleContentAdapter.java index acfa28488f3..806732a0cbe 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleContentAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleContentAdapter.java @@ -17,8 +17,8 @@ import org.eclipse.cdt.debug.core.model.ICModule; import org.eclipse.cdt.debug.core.model.IModuleRetrieval; import org.eclipse.cdt.debug.ui.ICDebugUIConstants; import org.eclipse.core.runtime.CoreException; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; import org.eclipse.debug.internal.ui.viewers.provisional.AsynchronousContentAdapter; -import org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext; /** * Comment for . diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleProxyFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleProxyFactory.java index cea5d6570e3..b9dc5088e0c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleProxyFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleProxyFactory.java @@ -12,10 +12,9 @@ package org.eclipse.cdt.debug.internal.ui.views.modules; import org.eclipse.cdt.debug.core.model.IModuleRetrieval; import org.eclipse.cdt.debug.ui.ICDebugUIConstants; -import org.eclipse.debug.internal.ui.viewers.provisional.IModelProxy; -import org.eclipse.debug.internal.ui.viewers.provisional.IModelProxyFactoryAdapter; -import org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext; -import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxy; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactoryAdapter; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; public class ModuleProxyFactory implements IModelProxyFactoryAdapter { @@ -23,13 +22,9 @@ public class ModuleProxyFactory implements IModelProxyFactoryAdapter { * @see org.eclipse.debug.internal.ui.viewers.provisional.IModelProxyFactoryAdapter#createModelProxy(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext) */ public IModelProxy createModelProxy( Object element, IPresentationContext context ) { - IWorkbenchPart part = context.getPart(); - if ( part != null ) { - String id = part.getSite().getId(); - if ( ICDebugUIConstants.ID_MODULES_VIEW.equals( id ) ) { - if ( element instanceof IModuleRetrieval ) { - return new ModulesViewModelProxy( (IModuleRetrieval)element ); - } + if ( ICDebugUIConstants.ID_MODULES_VIEW.equals( context.getId() ) ) { + if ( element instanceof IModuleRetrieval ) { + return new ModulesViewModelProxy( (IModuleRetrieval)element ); } } return null; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java index fb585ae0cfb..fe90d9f897b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java @@ -31,7 +31,7 @@ import org.eclipse.core.runtime.ListenerList; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.internal.ui.contexts.DebugContextManager; -import org.eclipse.debug.internal.ui.viewers.PresentationContext; +import org.eclipse.debug.internal.ui.viewers.model.provisional.PresentationContext; import org.eclipse.debug.ui.AbstractDebugView; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.contexts.DebugContextEvent; @@ -222,7 +222,7 @@ public class ModulesView extends AbstractDebugView implements IDebugContextListe */ protected Viewer createViewer( Composite parent ) { ModulesViewer viewer = (ModulesViewer)createTreeViewer( parent ); - viewer.setContext( new PresentationContext( this ) ); + viewer.setContext( new PresentationContext( ICDebugUIConstants.ID_MODULES_VIEW ) ); createDetailsViewer(); getSashForm().setMaximizedControl( viewer.getControl() ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewEventHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewEventHandler.java index 0f46c98de5c..793c792e9fa 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewEventHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewEventHandler.java @@ -13,11 +13,10 @@ package org.eclipse.cdt.debug.internal.ui.views.modules; import org.eclipse.cdt.debug.core.model.ICModule; import org.eclipse.cdt.debug.core.model.IModuleRetrieval; import org.eclipse.debug.core.DebugEvent; -import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.model.IDebugTarget; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; +import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta; import org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy; -import org.eclipse.debug.internal.ui.viewers.provisional.IModelDelta; -import org.eclipse.debug.internal.ui.viewers.provisional.ModelDelta; import org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler; /**