mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-23 14:42:11 +02:00
Bug 166997 - Patch from Darin Wright. Adjust to changes in internal interfaces for M4.
This commit is contained in:
parent
0974185cb0
commit
2cf9b4dfb1
5 changed files with 12 additions and 18 deletions
|
@ -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 .
|
||||
|
|
|
@ -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 .
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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() );
|
||||
|
|
|
@ -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;
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue