mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 17:26:01 +02:00
Code Issues Wiki Activity

"Resume At Line" is disabled if the Disassembly view is opened during an active debug session.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2005-02-25 21:00:54 +00:00
parent c698546bba
commit b6bacb6478
2 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debug/org.eclipse.cdt.debug.ui/ChangeLog
View file

@ -1,3 +1,7 @@
2005-02-25 Mikhail Khodjaiants
"Resume At Line" is disabled if the Disassembly view is opened during an active debug session.
* ResumeAtLineActionDelegate.java
2005-02-24 Mikhail Khodjaiants 2005-02-24 Mikhail Khodjaiants
Applied patch from Tracy Miranda (bug 86533: Breakpoint is set on the wrong line in Disassembly view). Applied patch from Tracy Miranda (bug 86533: Breakpoint is set on the wrong line in Disassembly view).
* DisassemblyEditorInput.java * DisassemblyEditorInput.java

40
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineActionDelegate.java
View file

@ -73,23 +73,7 @@ public class ResumeAtLineActionDelegate implements IEditorActionDelegate, IViewA
*/ */
public void setActiveEditor( IAction action, IEditorPart targetEditor ) { public void setActiveEditor( IAction action, IEditorPart targetEditor ) {
init( action ); init( action );
if ( fActivePart != null && !fActivePart.equals( targetEditor ) ) { bindTo( targetEditor );
fActivePart.getSite().getWorkbenchWindow().getSelectionService().removeSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, fSelectionListener );
}
fPartTarget = null;
fActivePart = targetEditor;
if ( targetEditor != null ) {
targetEditor.getSite().getWorkbenchWindow().getSelectionService().addSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, fSelectionListener );
fPartTarget = (IResumeAtLineTarget)targetEditor.getAdapter( IResumeAtLineTarget.class );
if ( fPartTarget == null ) {
IAdapterManager adapterManager = Platform.getAdapterManager();
// TODO: we could restrict loading to cases when the debugging context is on
if ( adapterManager.hasAdapter( targetEditor, IResumeAtLineTarget.class.getName() ) ) {
fPartTarget = (IResumeAtLineTarget)adapterManager.loadAdapter( targetEditor, IResumeAtLineTarget.class.getName() );
}
}
}
update();
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -164,17 +148,27 @@ public class ResumeAtLineActionDelegate implements IEditorActionDelegate, IViewA
* @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
*/ */
public void init( IViewPart view ) { public void init( IViewPart view ) {
fActivePart = view; bindTo( view );
if ( view != null ) { }
view.getSite().getWorkbenchWindow().getSelectionService().addSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, fSelectionListener );
fPartTarget = (IResumeAtLineTarget)view.getAdapter( IResumeAtLineTarget.class ); /**
* Binds this action to operate on the given part's run to line adapter.
*/
private void bindTo( IWorkbenchPart part ) {
fActivePart = part;
if ( part != null ) {
part.getSite().getWorkbenchWindow().getSelectionService().addSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, fSelectionListener );
fPartTarget = (IResumeAtLineTarget)part.getAdapter( IResumeAtLineTarget.class );
if ( fPartTarget == null ) { if ( fPartTarget == null ) {
IAdapterManager adapterManager = Platform.getAdapterManager(); IAdapterManager adapterManager = Platform.getAdapterManager();
// TODO: we could restrict loading to cases when the debugging context is on // TODO: we could restrict loading to cases when the debugging context is on
if ( adapterManager.hasAdapter( view, IResumeAtLineTarget.class.getName() ) ) { if ( adapterManager.hasAdapter( part, IResumeAtLineTarget.class.getName() ) ) {
fPartTarget = (IResumeAtLineTarget)adapterManager.loadAdapter( view, IResumeAtLineTarget.class.getName() ); fPartTarget = (IResumeAtLineTarget)adapterManager.loadAdapter( part, IResumeAtLineTarget.class.getName() );
} }
} }
// Force the selection update
ISelection selection = part.getSite().getWorkbenchWindow().getSelectionService().getSelection( IDebugUIConstants.ID_DEBUG_VIEW );
fSelectionListener.selectionChanged( part, selection );
} }
update(); update();
} }