[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] Removed dependencies to framework debug plugins from cdt ui.
|
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.358
diff -u -r1.358 ChangeLog
--- ChangeLog 8 Apr 2004 00:32:12 -0000 1.358
+++ ChangeLog 8 Apr 2004 20:00:24 -0000
@@ -1,3 +1,10 @@
+2004-04-08 Mikhail Khodjaiants
+
+ Removed dependencies to 'org.eclipse.debug.core' and 'org.eclipse.debug.ui'.
+
+ * plugin.xml
+ * src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java
+
2004-04-07 John Camelon
Updated CompletionEngine to use the extended IASTCompletionNode interface for FUNCTION_REFERENCE.
Index: plugin.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/plugin.xml,v
retrieving revision 1.75
diff -u -r1.75 plugin.xml
--- plugin.xml 2 Apr 2004 19:07:41 -0000 1.75
+++ plugin.xml 8 Apr 2004 20:00:24 -0000
@@ -22,8 +22,6 @@
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.search"/>
<import plugin="org.eclipse.compare"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.debug.core"/>
<import plugin="org.eclipse.cdt.core"/>
<import plugin="org.eclipse.core.runtime.compatibility"/>
<import plugin="org.eclipse.ui.console"/>
@@ -48,57 +46,57 @@
pattern=".*">
</filter>
<filter
- enabled="false"
- name="%HideExecutableFiles.label"
targetId="org.eclipse.cdt.ui.CView"
+ name="%HideExecutableFiles.label"
+ enabled="false"
description="%HideExecutableFiles.description"
class="org.eclipse.cdt.internal.ui.filters.ExecutableFilter"
id="org.eclipse.cdt.internal.ui.CView.ExecutableFilter">
</filter>
<filter
- enabled="false"
- name="%HideSharedFiles.label"
targetId="org.eclipse.cdt.ui.CView"
+ name="%HideSharedFiles.label"
+ enabled="false"
description="%HideSharedFiles.description"
class="org.eclipse.cdt.internal.ui.filters.SharedFilter"
id="org.eclipse.cdt.internal.ui.CView.SharedFilter">
</filter>
<filter
- enabled="false"
- name="%HideObjectFiles.label"
targetId="org.eclipse.cdt.ui.CView"
+ name="%HideObjectFiles.label"
+ enabled="false"
description="%HideObjectFiles.description"
class="org.eclipse.cdt.internal.ui.filters.ObjectFilter"
id="org.eclipse.cdt.internal.ui.CView.ObjectFilter">
</filter>
<filter
- enabled="false"
- name="%HideArchiveFiles.label"
targetId="org.eclipse.cdt.ui.CView"
+ name="%HideArchiveFiles.label"
+ enabled="false"
description="%HideArchiveFiles.description"
class="org.eclipse.cdt.internal.ui.filters.ArchiveFilter"
id="org.eclipse.cdt.internal.ui.CView.ArchiveFilter">
</filter>
<filter
- enabled="false"
- name="%HideClosedProjects.label"
targetId="org.eclipse.cdt.ui.CView"
+ name="%HideClosedProjects.label"
+ enabled="false"
description="%HideClosedProjects.description"
class="org.eclipse.cdt.internal.ui.filters.ClosedProjectFilter"
id="org.eclipse.cdt.internal.ui.CView.ClosedProjectFilter">
</filter>
<filter
- enabled="false"
- name="%HideNonCProjects.label"
targetId="org.eclipse.cdt.ui.CView"
+ name="%HideNonCProjects.label"
+ enabled="false"
description="%HideNonCProjects.description"
class="org.eclipse.cdt.internal.ui.filters.NonCProjectsFilter"
id="org.eclipse.cdt.internal.ui.CView.NonCProjectsFilter">
</filter>
<filter
- enabled="false"
- name="%HideNonCElements.label"
targetId="org.eclipse.cdt.ui.CView"
+ name="%HideNonCElements.label"
+ enabled="false"
description="%HideNonCElements.description"
class="org.eclipse.cdt.internal.ui.filters.NonCElementFilter"
id="org.eclipse.cdt.internal.ui.CView.NonCElementFilter">
@@ -195,35 +193,35 @@
id="org.eclipse.cdt.ui.ceditor"
point="org.eclipse.ui.editors">
<editor
- name="%CEditor.name"
default="true"
- icon="icons/full/obj16/c_file_obj.gif"
+ name="%CEditor.name"
extensions="c, cc, cpp, cxx"
- contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
+ icon="icons/full/obj16/c_file_obj.gif"
class="org.eclipse.cdt.internal.ui.editor.CEditor"
+ contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
id="org.eclipse.cdt.ui.editor.CEditor">
</editor>
<editor
- name="%CEditor.name"
default="true"
- icon="icons/full/obj16/h_file_obj.gif"
+ name="%CEditor.name"
extensions="h, hh, hpp"
- contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
+ icon="icons/full/obj16/h_file_obj.gif"
class="org.eclipse.cdt.internal.ui.editor.CEditor"
+ contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
id="org.eclipse.cdt.ui.editor.CEditor">
</editor>
<editor
name="%Editors.DefaultTextEditor"
- icon="icons/full/obj16/file_obj.gif"
extensions="mk"
- contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
+ icon="icons/full/obj16/file_obj.gif"
class="org.eclipse.ui.editors.text.TextEditor"
+ contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
id="org.eclipse.ui.DefaultTextEditor">
</editor>
<editor
name="%AsmEditor.name"
- icon="icons/full/obj16/c_file_obj.gif"
extensions="s"
+ icon="icons/full/obj16/c_file_obj.gif"
class="org.eclipse.cdt.internal.ui.editor.asm.AsmTextEditor"
id="org.eclipse.cdt.ui.editor.asm.AsmEditor">
</editor>
@@ -292,16 +290,16 @@
<action
label="%AddTask.label"
helpContextId="org.eclipse.ui.AddTask_action_context"
- tooltip="%AddTask.tooltip"
class="org.eclipse.ui.texteditor.TaskRulerAction"
+ tooltip="%AddTask.tooltip"
menubarPath="add"
id="org.eclipse.ui.texteditor.TaskRulerAction">
</action>
<action
label="%AddBookmark.label"
helpContextId="org.eclipse.ui.bookmark_action_context"
- tooltip="%AddBookmark.tooltip"
class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+ tooltip="%AddBookmark.tooltip"
menubarPath="add"
id="org.eclipse.ui.texteditor.BookmarkRulerAction">
</action>
@@ -312,16 +310,16 @@
<action
label="%AddTask.label"
helpContextId="org.eclipse.ui.AddTask_action_context"
- tooltip="%AddTask.tooltip"
class="org.eclipse.ui.texteditor.TaskRulerAction"
+ tooltip="%AddTask.tooltip"
menubarPath="add"
id="org.eclipse.ui.texteditor.TaskRulerAction">
</action>
<action
label="%AddBookmark.label"
helpContextId="org.eclipse.ui.bookmark_action_context"
- tooltip="%AddBookmark.tooltip"
class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+ tooltip="%AddBookmark.tooltip"
menubarPath="add"
id="org.eclipse.ui.texteditor.BookmarkRulerAction">
</action>
@@ -351,24 +349,24 @@
<action
label="%OpenNewFileWizardAction.label"
icon="icons/full/ctool16/newfile_wiz.gif"
- tooltip="%OpenNewFileWizardAction.tooltip"
class="org.eclipse.cdt.internal.ui.wizards.OpenNewFileWizardAction"
+ tooltip="%OpenNewFileWizardAction.tooltip"
toolbarPath="Normal/FolderWizards"
id="org.eclipse.cdt.ui.actions.OpenNewFileWizardAction">
</action>
<action
label="%OpenNewFolderWizardAction.label"
icon="icons/full/ctool16/newfolder_wiz.gif"
- tooltip="%OpenNewFolderWizardAction.tooltip"
class="org.eclipse.cdt.internal.ui.wizards.OpenNewFolderWizardAction"
+ tooltip="%OpenNewFolderWizardAction.tooltip"
toolbarPath="Normal/FolderWizards"
id="org.eclipse.cdt.ui.actions.OpenNewFolderWizardAction">
</action>
<action
label="%OpenClassWizardAction.label"
icon="icons/full/ctool16/newclass_wiz.gif"
- tooltip="%OpenClassWizardAction.tooltip"
class="org.eclipse.cdt.ui.actions.OpenClassWizardAction"
+ tooltip="%OpenClassWizardAction.tooltip"
toolbarPath="Normal/FolderWizards"
id="org.eclipse.cdt.ui.actions.OpenClassWizardAction">
<enablement>
@@ -409,8 +407,8 @@
</category>
<command
name="%ActionDefinition.comment.name"
- description="%ActionDefinition.comment.description"
category="org.eclipse.cdt.ui.category.source"
+ description="%ActionDefinition.comment.description"
id="org.eclipse.cdt.ui.edit.text.c.comment">
</command>
<keyBinding
@@ -421,8 +419,8 @@
</keyBinding>
<command
name="%ActionDefinition.uncomment.name"
- description="%ActionDefinition.uncomment.description"
category="org.eclipse.cdt.ui.category.source"
+ description="%ActionDefinition.uncomment.description"
id="org.eclipse.cdt.ui.edit.text.c.uncomment">
</command>
<keyBinding
@@ -433,8 +431,8 @@
</keyBinding>
<command
name="%ActionDefinition.opendecl.name"
- description="%ActionDefinition.opendecl.description"
category="org.eclipse.cdt.ui.category.source"
+ description="%ActionDefinition.opendecl.description"
id="org.eclipse.cdt.ui.edit.opendecl">
</command>
<keyBinding
@@ -445,8 +443,8 @@
</keyBinding>
<command
name="%ActionDefinition.openType.name"
- description="%ActionDefinition.openType.description"
category="org.eclipse.cdt.ui.category.source"
+ description="%ActionDefinition.openType.description"
id="org.eclipse.cdt.ui.navigate.opentype">
</command>
<keyBinding
@@ -457,8 +455,8 @@
</keyBinding>
<command
name="%ActionDefinition.opencview.name"
- category="org.eclipse.cdt.ui.category.source"
description="%ActionDefinition.opencview.description"
+ category="org.eclipse.cdt.ui.category.source"
id="org.eclipse.cdt.ui.edit.opencview">
</command>
</extension>
@@ -469,8 +467,8 @@
<page
showScopeSection="true"
label="%CSearchPage.label"
- icon="icons/full/obj16/csearch_obj.gif"
extensions="c:90,cpp:90, cxx:90, cc:90,C:90, h:90, hh:90, hpp:90, H:90"
+ icon="icons/full/obj16/csearch_obj.gif"
class="org.eclipse.cdt.internal.ui.search.CSearchPage"
sizeHint="460, 160"
id="org.eclipse.cdt.ui.CSearchPage">
@@ -482,24 +480,24 @@
pageId="org.eclipse.cdt.ui.CSearchPage"
label="%ElementNameSorter.label"
icon="icons/full/clcl16/search_sortmatch.gif"
- tooltip="%ElementNameSorter.tooltip"
class="org.eclipse.cdt.internal.ui.search.ElementNameSorter"
+ tooltip="%ElementNameSorter.tooltip"
id="org.eclipse.cdt.search.internal.ui.ElementNameSorter">
</sorter>
<sorter
pageId="org.eclipse.cdt.ui.CSearchPage"
label="%ParentNameSorter.label"
icon="icons/full/clcl16/search_sortmatch.gif"
- tooltip="%ParentNameSorter.tooltip"
class="org.eclipse.cdt.internal.ui.search.ParentNameSorter"
+ tooltip="%ParentNameSorter.tooltip"
id="org.eclipse.cdt.search.internal.ui.ParentNameSorter">
</sorter>
<sorter
pageId="org.eclipse.cdt.ui.CSearchPage"
label="%PathNameSorter.label"
icon="icons/full/clcl16/search_sortmatch.gif"
- tooltip="%PathNameSorter.tooltip"
class="org.eclipse.cdt.internal.ui.search.PathNameSorter"
+ tooltip="%PathNameSorter.tooltip"
id="org.eclipse.cdt.search.internal.ui.PathNameSorter">
</sorter>
</extension>
@@ -552,13 +550,13 @@
<extension
point="org.eclipse.cdt.ui.BinaryParserPage">
<parserPage
- parserID="org.eclipse.cdt.core.GNU_ELF"
class="org.eclipse.cdt.ui.dialogs.GNUElfBinaryParserPage"
+ parserID="org.eclipse.cdt.core.GNU_ELF"
id="ElfBinaryParserPage">
</parserPage>
<parserPage
- parserID="org.eclipse.cdt.core.Cygwin_PE"
class="org.eclipse.cdt.ui.dialogs.CygwinPEBinaryParserPage"
+ parserID="org.eclipse.cdt.core.Cygwin_PE"
id="PEBinaryParserPage">
</parserPage>
</extension>
@@ -592,11 +590,11 @@
contributesToHeader="false"
overviewRulerPreferenceValue="false"
presentationLayer="3"
- symbolicIcon="warning"
textStylePreferenceValue="NONE"
+ symbolicIcon="warning"
icon="icons/full/obj16/unknown_obj.gif"
- textPreferenceValue="false"
label="Index Markers"
+ textPreferenceValue="false"
textPreferenceKey="indexResultIndication"
verticalRulerPreferenceKey="indexResultIndicationInVerticalRuler"
overviewRulerPreferenceKey="indexResultIndicationInOverviewRuler">
@@ -618,6 +616,7 @@
id="org.eclipse.cdt.ui.preferneces.WorkInProgressPreferencePage">
</page>
</extension>
+
<!--
<extension
point="org.eclipse.ui.propertyPages">
Index: src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java,v
retrieving revision 1.4
diff -u -r1.4 CMarkerAnnotation.java
--- src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java 26 Feb 2004 19:30:35 -0000 1.4
+++ src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java 8 Apr 2004 20:00:36 -0000
@@ -8,19 +8,15 @@
import java.util.Map;
import java.util.StringTokenizer;
+import org.eclipse.cdt.core.model.ICModelMarker;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugModelPresentation;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.search.ui.SearchUI;
import org.eclipse.ui.texteditor.MarkerAnnotation;
import org.eclipse.ui.texteditor.MarkerUtilities;
-import org.eclipse.cdt.core.model.ICModelMarker;
-
public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnotation {
@@ -28,7 +24,6 @@
private IDocument fDocument;
private int error_start = -1;
private int error_length = 0;
- private IDebugModelPresentation fPresentation;
public CMarkerAnnotation(IMarker marker, IDocument document) {
super(marker);
@@ -148,16 +143,6 @@
if (MarkerUtilities.isMarkerType(marker, SearchUI.SEARCH_MARKER)) {
setLayer(2);
setImage(SearchUI.getSearchMarkerImage());
- fIsProblemMarker= false;
- return;
- }
- else if (MarkerUtilities.isMarkerType(marker, IBreakpoint.LINE_BREAKPOINT_MARKER)) {
- if (fPresentation == null)
- fPresentation= DebugUITools.newDebugModelPresentation();
-
- setLayer(4);
- setImage(fPresentation.getImage(marker));
-
fIsProblemMarker= false;
return;
} else if (MarkerUtilities.isMarkerType(getMarker(), ICModelMarker.C_MODEL_PROBLEM_MARKER)) {
