mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

Get the modules view compiling on 3.3M3. Bug 163602.

Browse source
This commit is contained in:
Doug Schaefer 2006-11-08 21:36:49 +00:00
parent abb2bcc28b
commit a7ce8026bb
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java
View file

@ -12,6 +12,7 @@ package org.eclipse.cdt.debug.internal.ui.views.modules;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.debug.core.model.ICDebugTarget; import org.eclipse.cdt.debug.core.model.ICDebugTarget;
@ -30,10 +31,11 @@ import org.eclipse.core.runtime.ListenerList;
import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.internal.ui.contexts.DebugContextManager; import org.eclipse.debug.internal.ui.contexts.DebugContextManager;
import org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener;
import org.eclipse.debug.internal.ui.viewers.PresentationContext; import org.eclipse.debug.internal.ui.viewers.PresentationContext;
import org.eclipse.debug.ui.AbstractDebugView; import org.eclipse.debug.ui.AbstractDebugView;
import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.debug.ui.contexts.DebugContextEvent;
import org.eclipse.debug.ui.contexts.IDebugContextListener;
import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IMenuManager;
@ -98,6 +100,7 @@ public class ModulesView extends AbstractDebugView implements IDebugContextListe
interface ICursorListener extends MouseListener, KeyListener { interface ICursorListener extends MouseListener, KeyListener {
} }
/** /**
* The selection provider for the modules view changes depending on whether * The selection provider for the modules view changes depending on whether
* the variables viewer or detail pane source viewer have focus. This "super" * the variables viewer or detail pane source viewer have focus. This "super"
@ -390,7 +393,7 @@ public class ModulesView extends AbstractDebugView implements IDebugContextListe
getSite().setSelectionProvider( getModulesViewSelectionProvider() ); getSite().setSelectionProvider( getModulesViewSelectionProvider() );
// listen to debug context // listen to debug context
DebugContextManager.getDefault().addDebugContextListener( this, getSite().getWorkbenchWindow() ); DebugContextManager.getDefault().addDebugContextListener(this);
return modulesViewer; return modulesViewer;
} }
@ -787,7 +790,7 @@ public class ModulesView extends AbstractDebugView implements IDebugContextListe
*/ */
protected void becomesVisible() { protected void becomesVisible() {
super.becomesVisible(); super.becomesVisible();
ISelection selection = DebugContextManager.getDefault().getActiveContext( getSite().getWorkbenchWindow() ); ISelection selection = DebugContextManager.getDefault().getContextService( getSite().getWorkbenchWindow() ).getActiveContext();
contextActivated( selection, null ); contextActivated( selection, null );
} }
@ -977,8 +980,8 @@ public class ModulesView extends AbstractDebugView implements IDebugContextListe
showViewer(); showViewer();
} }
public void contextChanged( ISelection selection, IWorkbenchPart part ) { public void debugContextChanged(DebugContextEvent event) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
} }

6
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewer.java
View file

@ -14,7 +14,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer;
import org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor; import org.eclipse.debug.ui.commands.IStatusMonitor;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.progress.UIJob; import org.eclipse.ui.progress.UIJob;
@ -45,7 +45,7 @@ public class ModulesViewer extends AsynchronousTreeViewer {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#updateComplete(org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor) * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#updateComplete(org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor)
*/ */
protected void updateComplete( IAsynchronousRequestMonitor update ) { protected void updateComplete( IStatusMonitor update ) {
super.updateComplete( update ); super.updateComplete( update );
if ( fView != null ) { if ( fView != null ) {
fRestoreJob.schedule( 100 ); fRestoreJob.schedule( 100 );
@ -55,7 +55,7 @@ public class ModulesViewer extends AsynchronousTreeViewer {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#handlePresentationFailure(org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor, org.eclipse.core.runtime.IStatus) * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#handlePresentationFailure(org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor, org.eclipse.core.runtime.IStatus)
*/ */
protected void handlePresentationFailure( IAsynchronousRequestMonitor update, IStatus status ) { protected void handlePresentationFailure( IStatusMonitor update, IStatus status ) {
fView.showMessage( status.getMessage() ); fView.showMessage( status.getMessage() );
} }