mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 142860: Breakpoint marker is not shown in the editor's ruler.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2006-05-19 20:56:19 +00:00
parent 9df742ada4
commit 5839b72abe
4 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,9 @@
2006-05-19 Mikhail Khodjaiants
Bug 142860: Breakpoint marker is not shown in the editor's ruler.
* ToggleBreakpointAdapter.java
* plugin.properties
* plugin.xml
2006-05-12 Mikhail Khodjaiants
Bug 118274: Condition is not shown in the tooltip of conditional breakpoint.
Moved the "getBreakpointText" method and related methods to CDebugUtils.

2
debug/org.eclipse.cdt.debug.ui/plugin.properties
View file

@ -93,6 +93,8 @@ DisableVariablesAction.tooltip=Disable Selected Variables
DefaultSourceLocator.name=Default C/C++ Source Locator
OldDefaultSourceLocator.name=Default C/C++ Source Locator (old)
BreakpointMarkerPreference.label=Breakpoints
DisassemblyView.name=Disassembly
DisassemblyCurrentInstructionPointer=Disassembly Current Instruction Pointer
DisassemblySecondaryInstructionPointer=Disassembly Secondary Instruction Pointer

14
debug/org.eclipse.cdt.debug.ui/plugin.xml
View file

@ -1066,8 +1066,18 @@
point="org.eclipse.ui.editors.markerAnnotationSpecification">
<specification
annotationImageProvider="org.eclipse.cdt.debug.internal.ui.BreakpointImageProvider"
annotationType="org.eclipse.cdt.debug.core.breakpoint"
colorPreferenceKey="breakpointIndicationColor"
colorPreferenceValue="0,0,255"
icon="icons/obj16/brkp_obj.gif"
annotationType="org.eclipse.cdt.debug.core.breakpoint">
label="%BreakpointMarkerPreference.label"
overviewRulerPreferenceKey="breakpointIndicationInOverviewRuler"
overviewRulerPreferenceValue="false"
presentationLayer="3"
textPreferenceKey="breakpointIndication"
textPreferenceValue="false"
verticalRulerPreferenceKey="breakpointVerticalRuler"
verticalRulerPreferenceValue="true">
</specification>
<specification
colorPreferenceValue="217,255,226"
@ -1242,4 +1252,4 @@
name="%importCPPCategory.name"/>
</extension>
</plugin>
</plugin>

12
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleBreakpointAdapter.java
View file

@ -31,6 +31,7 @@ import org.eclipse.cdt.debug.internal.ui.views.disassembly.DisassemblyView;
import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@ -50,6 +51,7 @@ import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IPathEditorInput;
import org.eclipse.ui.IStorageEditorInput;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.editors.text.ILocationProvider;
import org.eclipse.ui.texteditor.IEditorStatusLine;
import org.eclipse.ui.texteditor.ITextEditor;
@ -303,13 +305,21 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
}
protected static IResource getResource( IWorkbenchPart part ) {
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
if ( part instanceof IEditorPart ) {
IEditorInput editorInput = ((IEditorPart)part).getEditorInput();
if ( editorInput instanceof IFileEditorInput ) {
return ((IFileEditorInput)editorInput).getFile();
}
ILocationProvider provider = (ILocationProvider)editorInput.getAdapter( ILocationProvider.class );
if ( provider != null ) {
IPath location = provider.getPath( editorInput );
IFile[] files = root.findFilesForLocation( location );
if ( files.length > 0 )
return files[0];
}
}
return ResourcesPlugin.getWorkspace().getRoot();
return root;
}
private String getSourceHandle( IEditorInput input ) throws CoreException {