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

Added the overview ruler to the Disassembly view.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2004-04-28 18:49:37 +00:00
parent 02d14a80c9
commit 2a0432dada
3 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,8 @@
2004-04-28 Mikhail Khodjaiants
Added the overview ruler to the Disassembly view.
* DisassemblyView.java
* DisassemblyViewer.java
2004-04-27 Mikhail Khodjaiants 2004-04-27 Mikhail Khodjaiants
Breakpoints presentation in the Disassembly view. Breakpoints presentation in the Disassembly view.
* HTML2TextReader.java: new * HTML2TextReader.java: new

38
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyView.java
View file

@ -36,9 +36,11 @@ import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Position; import org.eclipse.jface.text.Position;
import org.eclipse.jface.text.source.IAnnotationAccess; import org.eclipse.jface.text.source.IAnnotationAccess;
import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.jface.text.source.IAnnotationModel;
import org.eclipse.jface.text.source.IOverviewRuler;
import org.eclipse.jface.text.source.ISharedTextColors; import org.eclipse.jface.text.source.ISharedTextColors;
import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.IVerticalRuler; import org.eclipse.jface.text.source.IVerticalRuler;
import org.eclipse.jface.text.source.OverviewRuler;
import org.eclipse.jface.text.source.SourceViewer; import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.text.source.VerticalRuler; import org.eclipse.jface.text.source.VerticalRuler;
import org.eclipse.jface.util.Assert; import org.eclipse.jface.util.Assert;
@ -95,6 +97,11 @@ public class DisassemblyView extends AbstractDebugEventHandlerView
*/ */
private IVerticalRuler fVerticalRuler; private IVerticalRuler fVerticalRuler;
/**
* The overview ruler.
*/
private IOverviewRuler fOverviewRuler;
/** /**
* The last stack frame for which the disassembly storage has * The last stack frame for which the disassembly storage has
* been requested. * been requested.
@ -139,8 +146,9 @@ public class DisassemblyView extends AbstractDebugEventHandlerView
*/ */
protected Viewer createViewer( Composite parent ) { protected Viewer createViewer( Composite parent ) {
fVerticalRuler = createVerticalRuler(); fVerticalRuler = createVerticalRuler();
fOverviewRuler = createOverviewRuler( getSharedColors() );
SourceViewer viewer = createSourceViewer( parent, fVerticalRuler ); SourceViewer viewer = createSourceViewer( parent, fVerticalRuler, getOverviewRuler() );
viewer.configure( new DisassemblyViewerConfiguration() ); viewer.configure( new DisassemblyViewerConfiguration() );
getSourceViewerDecorationSupport( viewer ); getSourceViewerDecorationSupport( viewer );
@ -223,6 +231,17 @@ public class DisassemblyView extends AbstractDebugEventHandlerView
return ruler; return ruler;
} }
private IOverviewRuler createOverviewRuler( ISharedTextColors sharedColors ) {
IOverviewRuler ruler = new OverviewRuler( getAnnotationAccess(), VERTICAL_RULER_WIDTH, sharedColors );
Iterator e = fAnnotationPreferences.getAnnotationPreferences().iterator();
while( e.hasNext() ) {
AnnotationPreference preference = (AnnotationPreference)e.next();
if ( preference.contributesToHeader() )
ruler.addHeaderAnnotationType( preference.getAnnotationType() );
}
return ruler;
}
/** /**
* Creates the source viewer to be used by this view. * Creates the source viewer to be used by this view.
* *
@ -231,8 +250,8 @@ public class DisassemblyView extends AbstractDebugEventHandlerView
* @param styles style bits * @param styles style bits
* @return the source viewer * @return the source viewer
*/ */
private SourceViewer createSourceViewer( Composite parent, IVerticalRuler ruler ) { private SourceViewer createSourceViewer( Composite parent, IVerticalRuler vertRuler, IOverviewRuler ovRuler ) {
DisassemblyViewer viewer = new DisassemblyViewer( parent, ruler ); DisassemblyViewer viewer = new DisassemblyViewer( parent, vertRuler, ovRuler );
viewer.setRangeIndicator( new DefaultRangeIndicator() ); viewer.setRangeIndicator( new DefaultRangeIndicator() );
return viewer; return viewer;
} }
@ -445,7 +464,7 @@ public class DisassemblyView extends AbstractDebugEventHandlerView
*/ */
protected SourceViewerDecorationSupport getSourceViewerDecorationSupport( ISourceViewer viewer ) { protected SourceViewerDecorationSupport getSourceViewerDecorationSupport( ISourceViewer viewer ) {
if ( fSourceViewerDecorationSupport == null ) { if ( fSourceViewerDecorationSupport == null ) {
fSourceViewerDecorationSupport = new SourceViewerDecorationSupport( viewer, null, getAnnotationAccess(), getSharedColors() ); fSourceViewerDecorationSupport = new SourceViewerDecorationSupport( viewer, getOverviewRuler(), getAnnotationAccess(), getSharedColors() );
configureSourceViewerDecorationSupport( fSourceViewerDecorationSupport ); configureSourceViewerDecorationSupport( fSourceViewerDecorationSupport );
} }
return fSourceViewerDecorationSupport; return fSourceViewerDecorationSupport;
@ -570,4 +589,15 @@ public class DisassemblyView extends AbstractDebugEventHandlerView
selectionChanged( part, selection ); selectionChanged( part, selection );
} }
} }
/**
* Returns the overview ruler.
*
* @return the overview ruler
*/
private IOverviewRuler getOverviewRuler() {
if ( fOverviewRuler == null )
fOverviewRuler = createOverviewRuler( getSharedColors() );
return fOverviewRuler;
}
} }

5
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyViewer.java
View file

@ -12,6 +12,7 @@ package org.eclipse.cdt.debug.internal.ui.views.disassembly;
import org.eclipse.cdt.debug.internal.ui.IInternalCDebugUIConstants; import org.eclipse.cdt.debug.internal.ui.IInternalCDebugUIConstants;
import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.source.IOverviewRuler;
import org.eclipse.jface.text.source.IVerticalRuler; import org.eclipse.jface.text.source.IVerticalRuler;
import org.eclipse.jface.text.source.SourceViewer; import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
@ -35,8 +36,8 @@ public class DisassemblyViewer extends SourceViewer {
* @param ruler * @param ruler
* @param styles * @param styles
*/ */
public DisassemblyViewer( Composite parent, IVerticalRuler ruler ) { public DisassemblyViewer( Composite parent, IVerticalRuler vertRuler, IOverviewRuler ovRuler ) {
super( parent, ruler, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION ); super( parent, vertRuler, ovRuler, true, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION );
getTextWidget().setFont( JFaceResources.getFont( IInternalCDebugUIConstants.DISASSEMBLY_FONT ) ); getTextWidget().setFont( JFaceResources.getFont( IInternalCDebugUIConstants.DISASSEMBLY_FONT ) );
setEditable( false ); setEditable( false );
GridData gd = new GridData( GridData.FILL_BOTH ); GridData gd = new GridData( GridData.FILL_BOTH );