Attachment 55158 Details for Bug 166997 – patch

[patch] patch

cdt-debug-updates.patch (text/plain), 7.17 KB, created by Darin Wright

on 2006-12-06 15:50:17 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2006-12-06 15:50:17 EST

Size: 7.17 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.debug.ui
>Index: src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleProxyFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleProxyFactory.java,v
>retrieving revision 1.3
>diff -u -r1.3 ModuleProxyFactory.java
>--- src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleProxyFactory.java	23 Jun 2006 17:26:20 -0000	1.3
>+++ src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleProxyFactory.java	4 Dec 2006 18:55:35 -0000
>@@ -12,10 +12,9 @@
> 
> 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 @@
> 	 * @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;
>Index: src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java,v
>retrieving revision 1.17
>diff -u -r1.17 ModulesView.java
>--- src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java	8 Nov 2006 21:36:49 -0000	1.17
>+++ src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java	4 Dec 2006 18:55:35 -0000
>@@ -31,7 +31,7 @@
> 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 @@
> 	 */
> 	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() );
>Index: src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewEventHandler.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewEventHandler.java,v
>retrieving revision 1.9
>diff -u -r1.9 ModulesViewEventHandler.java
>--- src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewEventHandler.java	23 Jun 2006 17:26:20 -0000	1.9
>+++ src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewEventHandler.java	4 Dec 2006 18:55:35 -0000
>@@ -13,11 +13,10 @@
> 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;
>  
> /**
>Index: src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleContentAdapter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleContentAdapter.java,v
>retrieving revision 1.2
>diff -u -r1.2 ModuleContentAdapter.java
>--- src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleContentAdapter.java	23 Jun 2006 17:26:20 -0000	1.2
>+++ src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleContentAdapter.java	4 Dec 2006 18:55:35 -0000
>@@ -17,8 +17,8 @@
> 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 .
>Index: src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java,v
>retrieving revision 1.3
>diff -u -r1.3 CDebugElementAdapterFactory.java
>--- src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java	23 Jun 2006 17:26:20 -0000	1.3
>+++ src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java	4 Dec 2006 18:55:35 -0000
>@@ -16,9 +16,9 @@
> 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 .

Flags:

bjorn.freeman-benson: iplog+

Actions: View | Diff

Attachments on bug 166997: 55158