[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-dev] New integration build
|
It appears that the new Integration build (20040428) has passed testing.
All of the issues appear to have been explained as broken tests or test
machine.
Given the slip in M9, I really would prefer us moving to a newer eclipse
as soon as we can. Please let me know when this would be possible.
In the meantime, I have attached the latest patches that allow us to build
against the new Integration build.
Thanks,
Doug Schaefer, IBM's Eclipse CDT Architect
Ottawa (Palladium), Ontario, Canada
Index: plugin.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/plugin.xml,v
retrieving revision 1.85
diff -u -r1.85 plugin.xml
--- plugin.xml 26 Apr 2004 15:51:29 -0000 1.85
+++ plugin.xml 28 Apr 2004 21:28:50 -0000
@@ -41,19 +41,25 @@
<!-- =========================================================================== -->
<extension-point id="textHovers" name="%textHoversName"/>
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.cdt.internal.ui.CElementAdapterFactory"
+ <extension
+ point="org.eclipse.core.runtime.adapters">
+ <factory
+ class="org.eclipse.cdt.internal.ui.CElementAdapterFactory"
adaptableType="org.eclipse.cdt.core.model.ICElement">
-
- <adapter type="org.eclipse.core.resources.IResource"/>
- <adapter type="org.eclipse.core.resources.IProject"/>
-
- <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
- <adapter type="org.eclipse.ui.views.properties.IPropertySource"/>
- </factory>
- </extension>
-
+ <adapter
+ type="org.eclipse.core.resources.IResource">
+ </adapter>
+ <adapter
+ type="org.eclipse.core.resources.IProject">
+ </adapter>
+ <adapter
+ type="org.eclipse.ui.model.IWorkbenchAdapter">
+ </adapter>
+ <adapter
+ type="org.eclipse.ui.views.properties.IPropertySource">
+ </adapter>
+ </factory>
+ </extension>
<!-- Implement our filters for C-View. -->
<extension
point="org.eclipse.cdt.ui.CElementFilters">
@@ -62,57 +68,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">
@@ -205,7 +211,6 @@
</description>
</wizard>
</extension>
-
<!-- Define the document provider and partitionner for the CEditor -->
<extension
id="org.eclipse.cdt.ui.CDocumentSetupParticipant"
@@ -225,23 +230,22 @@
class="org.eclipse.cdt.internal.ui.editor.CDocumentFactory">
</factory>
</extension>
-
<extension
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, h, hh, hpp"
- 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="%AsmEditor.name"
- icon="icons/full/obj16/s_file_obj.gif"
extensions="s"
+ icon="icons/full/obj16/s_file_obj.gif"
class="org.eclipse.cdt.internal.ui.editor.asm.AsmTextEditor"
id="org.eclipse.cdt.ui.editor.asm.AsmEditor">
</editor>
@@ -310,16 +314,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>
@@ -330,16 +334,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>
@@ -369,24 +373,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>
@@ -427,8 +431,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
@@ -439,8 +443,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
@@ -451,8 +455,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
@@ -463,8 +467,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
@@ -475,8 +479,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>
@@ -487,8 +491,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">
@@ -500,24 +504,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>
@@ -570,13 +574,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>
@@ -610,11 +614,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">
@@ -636,14 +640,16 @@
id="org.eclipse.cdt.ui.preferneces.WorkInProgressPreferencePage">
</page>
</extension>
- <extension
+ <extension
point="org.eclipse.search.searchResultViewPages">
<viewPage
targetClass="org.eclipse.cdt.internal.ui.search.CSearchResult"
class="org.eclipse.cdt.internal.ui.search.CSearchResultPage"
+ searchResultClass="org.eclipse.cdt.internal.ui.search.CSearchResult"
id="org.eclipse.cdt.ui.CSearchResultPage">
</viewPage>
</extension>
+
<!--
<extension
point="org.eclipse.ui.propertyPages">
Index: src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java,v
retrieving revision 1.8
diff -u -r1.8 AsmTextEditor.java
--- src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java 2 Feb 2004 20:53:23 -0000 1.8
+++ src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java 28 Apr 2004 21:28:51 -0000
@@ -7,7 +7,6 @@
import java.lang.reflect.InvocationTargetException;
import java.text.MessageFormat;
-
import org.eclipse.cdt.internal.ui.editor.CEditorMessages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.core.resources.IFile;
@@ -25,8 +24,8 @@
import org.eclipse.ui.actions.WorkspaceModifyOperation;
import org.eclipse.ui.dialogs.SaveAsDialog;
import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor;
import org.eclipse.ui.texteditor.DefaultRangeIndicator;
-import org.eclipse.ui.texteditor.ExtendedTextEditor;
import org.eclipse.ui.texteditor.ITextEditorActionConstants;
@@ -36,7 +35,7 @@
/**
* Assembly text editor
*/
-public class AsmTextEditor extends ExtendedTextEditor {
+public class AsmTextEditor extends AbstractDecoratedTextEditor {
//public class AsmTextEditor extends StatusTextEditor {
// FIXME: Should this editor have a different preference store ?
// For now we are sharing with the CEditor and any changes will in the
Index: src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java,v
retrieving revision 1.29
diff -u -r1.29 CEditorPreferencePage.java
--- src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java 28 Apr 2004 17:03:16 -0000 1.29
+++ src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java 28 Apr 2004 21:28:52 -0000
@@ -12,7 +12,6 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.ICHelpContextIds;
import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
@@ -60,8 +59,8 @@
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
import org.eclipse.ui.texteditor.AnnotationPreference;
-import org.eclipse.ui.texteditor.ExtendedTextEditorPreferenceConstants;
import org.eclipse.ui.texteditor.MarkerAnnotationPreferences;
import org.eclipse.ui.texteditor.WorkbenchChainedTextFontFieldEditor;
@@ -79,13 +78,13 @@
PreferencesMessages.getString("CEditorPreferencePage.cCommentTaskTags"), PreferenceConstants.EDITOR_TASK_TAG_COLOR } //$NON-NLS-1$
};
- protected final String[][] fAppearanceColorListModel = new String[][] { { PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.lineNumberColor"), ExtendedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR }, //$NON-NLS-1$
+ protected final String[][] fAppearanceColorListModel = new String[][] { { PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.lineNumberColor"), AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR }, //$NON-NLS-1$
{
PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.matchingBracketColor"), CEditor.MATCHING_BRACKETS_COLOR }, //$NON-NLS-1$
{
- PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.currentLineHighlightColor"), ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR }, //$NON-NLS-1$
+ PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.currentLineHighlightColor"), AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR }, //$NON-NLS-1$
{
- PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.printMarginColor"), ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR }, //$NON-NLS-1$
+ PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.printMarginColor"), AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR }, //$NON-NLS-1$
{
PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.linkedPositionColor"), CEditor.LINKED_POSITION_COLOR }, //$NON-NLS-1$
};
@@ -184,16 +183,16 @@
overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ICColorConstants.C_DEFAULT + "_bold")); //$NON-NLS-1$
overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, CEditor.MATCHING_BRACKETS_COLOR));
overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, CEditor.MATCHING_BRACKETS));
- overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR));
- overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE));
+ overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR));
+ overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE));
overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, CEditor.SPACES_FOR_TABS));
- overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR));
- overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN));
- overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN));
+ overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR));
+ overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN));
+ overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN));
overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, CEditor.LINKED_POSITION_COLOR));
- overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, ExtendedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR));
- overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ExtendedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER));
- overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ExtendedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER));
+ overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR));
+ overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER));
+ overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER));
overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, ContentAssistPreference.AUTOACTIVATION_DELAY));
overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ContentAssistPreference.AUTOINSERT));
overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, ContentAssistPreference.TIMEOUT_DELAY));
@@ -246,12 +245,12 @@
color = display.getSystemColor(SWT.COLOR_GRAY);
PreferenceConverter.setDefault(store, CEditor.MATCHING_BRACKETS_COLOR, color.getRGB());
- store.setDefault(ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE, true);
- PreferenceConverter.setDefault(store, ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR, new RGB(225, 235, 224));
+ store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE, true);
+ PreferenceConverter.setDefault(store, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR, new RGB(225, 235, 224));
- store.setDefault(ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN, true);
- store.setDefault(ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN, 80);
- PreferenceConverter.setDefault(store, ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, new RGB(176, 180, 185));
+ store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN, true);
+ store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN, 80);
+ PreferenceConverter.setDefault(store, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, new RGB(176, 180, 185));
WorkbenchChainedTextFontFieldEditor.startPropagate(store, JFaceResources.TEXT_FONT);
@@ -287,10 +286,10 @@
PreferenceConverter.setDefault(store, CEditor.LINKED_POSITION_COLOR, new RGB(0, 200, 100));
- store.setDefault(ExtendedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER, false);
- PreferenceConverter.setDefault(store, ExtendedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, new RGB(0, 0, 0));
+ store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER, false);
+ PreferenceConverter.setDefault(store, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, new RGB(0, 0, 0));
- store.setDefault(ExtendedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER, true);
+ store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER, true);
store.setDefault(ContentAssistPreference.CURRENT_FILE_SEARCH_SCOPE, true);
store.setDefault(ContentAssistPreference.PROJECT_SEARCH_SCOPE, false);
@@ -781,7 +780,7 @@
addTextField(behaviorComposite, label, CSourceViewerConfiguration.PREFERENCE_TAB_WIDTH, 2, 0, true);
label = PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.marginColumn"); //$NON-NLS-1$
- addTextField(behaviorComposite, label, ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN, 4, 0, true);
+ addTextField(behaviorComposite, label, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN, 4, 0, true);
label = PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.tabSpace"); //$NON-NLS-1$
addCheckBox(behaviorComposite, label, CEditor.SPACES_FOR_TABS, 0);
@@ -790,16 +789,16 @@
fBracketHighlightButton = addCheckBox(behaviorComposite, label, CEditor.MATCHING_BRACKETS, 0);
label = PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.showLineNumbers"); //$NON-NLS-1$
- addCheckBox(behaviorComposite, label, ExtendedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER, 0);
+ addCheckBox(behaviorComposite, label, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER, 0);
label = PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.highlightLine"); //$NON-NLS-1$
- fLineHighlightButton = addCheckBox(behaviorComposite, label, ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE, 0);
+ fLineHighlightButton = addCheckBox(behaviorComposite, label, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE, 0);
label = PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.showOverviewRuler"); //$NON-NLS-1$
- addCheckBox(behaviorComposite, label, ExtendedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER, 0);
+ addCheckBox(behaviorComposite, label, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER, 0);
label = PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.printMargin"); //$NON-NLS-1$
- addCheckBox(behaviorComposite, label, ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN, 0);
+ addCheckBox(behaviorComposite, label, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN, 0);
Label l = new Label(behaviorComposite, SWT.LEFT);
Index: src/org/eclipse/cdt/internal/ui/search/CSearchResult.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResult.java,v
retrieving revision 1.4
diff -u -r1.4 CSearchResult.java
--- src/org/eclipse/cdt/internal/ui/search/CSearchResult.java 28 Apr 2004 21:04:33 -0000 1.4
+++ src/org/eclipse/cdt/internal/ui/search/CSearchResult.java 28 Apr 2004 21:28:52 -0000
@@ -20,6 +20,8 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.search.ui.ISearchQuery;
import org.eclipse.search.ui.text.AbstractTextSearchResult;
+import org.eclipse.search.ui.text.IEditorMatchAdapter;
+import org.eclipse.search.ui.text.IFileMatchAdapter;
import org.eclipse.search.ui.text.Match;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
@@ -152,5 +154,21 @@
label = cQuery.getPluralLabelPattern();
return MessageFormat.format(label, new Object[]{new Integer(matches)});
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getEditorMatchAdapter()
+ */
+ public IEditorMatchAdapter getEditorMatchAdapter() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getFileMatchAdapter()
+ */
+ public IFileMatchAdapter getFileMatchAdapter() {
+ // TODO Auto-generated method stub
+ return null;
}
}
Index: src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java,v
retrieving revision 1.9
diff -u -r1.9 CCompletionProposal.java
--- src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java 22 Apr 2004 17:32:16 -0000 1.9
+++ src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java 28 Apr 2004 21:28:52 -0000
@@ -35,12 +35,13 @@
import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
import org.eclipse.jface.text.contentassist.ICompletionProposalExtension3;
import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.link.ILinkedListener;
-import org.eclipse.jface.text.link.LinkedEnvironment;
+import org.eclipse.jface.text.link.ILinkedModeListener;
+import org.eclipse.jface.text.link.LinkedModeModel;
+import org.eclipse.jface.text.link.LinkedModeUI;
+import org.eclipse.jface.text.link.LinkedPosition;
import org.eclipse.jface.text.link.LinkedPositionGroup;
-import org.eclipse.jface.text.link.LinkedUIControl;
-import org.eclipse.jface.text.link.LinkedUIControl.ExitFlags;
-import org.eclipse.jface.text.link.LinkedUIControl.IExitPolicy;
+import org.eclipse.jface.text.link.LinkedModeUI.ExitFlags;
+import org.eclipse.jface.text.link.LinkedModeUI.IExitPolicy;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.custom.StyledText;
@@ -49,11 +50,10 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.RGB;
-import org.eclipse.ui.texteditor.link.EditorHistoryUpdater;
-
+import org.eclipse.ui.texteditor.link.EditorLinkedModeUI;
public class CCompletionProposal implements ICCompletionProposal, ICompletionProposalExtension, ICompletionProposalExtension2, ICompletionProposalExtension3 {
-
+
private String fDisplayString;
private String fReplacementString;
private int fReplacementOffset;
@@ -118,7 +118,7 @@
/**
* Sets the context information.
- * @param contentInformation The context information associated with this proposal
+ * @param contextInformation The context information associated with this proposal
*/
public void setContextInformation(IContextInformation contextInformation) {
fContextInformation= contextInformation;
@@ -135,7 +135,7 @@
/**
* Sets the proposal info.
- * @param additionalProposalInfo The additional information associated with this proposal or <code>null</code>
+ * @param proposalInfo The additional information associated with this proposal or <code>null</code>
*/
public void setAdditionalProposalInfo(String proposalInfo) {
fProposalInfo= proposalInfo;
@@ -191,22 +191,22 @@
int index= string.indexOf("()"); //$NON-NLS-1$
if (index != -1 && index + 1 == fCursorPosition) {
IPreferenceStore preferenceStore= CUIPlugin.getDefault().getPreferenceStore();
- //if (preferenceStore.getBoolean(PreferenceConstants.EDITOR_CLOSE_BRACKETS)) {
+// if (preferenceStore.getBoolean(PreferenceConstants.EDITOR_CLOSE_BRACKETS)) {
if(true){
int newOffset= fReplacementOffset + fCursorPosition;
LinkedPositionGroup group= new LinkedPositionGroup();
- group.createPosition(document, newOffset, 0);
+ group.addPosition(new LinkedPosition(document, newOffset, 0, LinkedPositionGroup.NO_STOP));
- LinkedEnvironment env= new LinkedEnvironment();
- env.addGroup(group);
- env.forceInstall();
+ LinkedModeModel model= new LinkedModeModel();
+ model.addGroup(group);
+ model.forceInstall();
- LinkedUIControl ui= new LinkedUIControl(env, fTextViewer);
- ui.setPositionListener(new EditorHistoryUpdater());
+ LinkedModeUI ui= new EditorLinkedModeUI(model, fTextViewer);
+ ui.setSimpleMode(true);
ui.setExitPolicy(new ExitPolicy(')'));
ui.setExitPosition(fTextViewer, newOffset + 1, 0, Integer.MAX_VALUE);
- ui.setCyclingMode(LinkedUIControl.CYCLE_NEVER);
+ ui.setCyclingMode(LinkedModeUI.CYCLE_NEVER);
ui.enter();
}
}
@@ -278,18 +278,18 @@
/*
* @see org.eclipse.jdt.internal.ui.text.link.LinkedPositionUI.ExitPolicy#doExit(org.eclipse.jdt.internal.ui.text.link.LinkedPositionManager, org.eclipse.swt.events.VerifyEvent, int, int)
*/
- public ExitFlags doExit(LinkedEnvironment environment, VerifyEvent event, int offset, int length) {
+ public ExitFlags doExit(LinkedModeModel environment, VerifyEvent event, int offset, int length) {
if (event.character == fExitCharacter) {
if (environment.anyPositionContains(offset))
- return new ExitFlags(ILinkedListener.UPDATE_CARET, false);
+ return new ExitFlags(ILinkedModeListener.UPDATE_CARET, false);
else
- return new ExitFlags(ILinkedListener.UPDATE_CARET, true);
+ return new ExitFlags(ILinkedModeListener.UPDATE_CARET, true);
}
switch (event.character) {
case ';':
- return new ExitFlags(ILinkedListener.NONE, true);
+ return new ExitFlags(ILinkedModeListener.NONE, true);
default:
return null;
@@ -343,10 +343,10 @@
* @see ICompletionProposal#getAdditionalProposalInfo()
*/
public String getAdditionalProposalInfo() {
-// if (fProposalInfo != null) {
-// return fProposalInfo.getInfo();
-// }
- return fProposalInfo;
+ if (fProposalInfo != null) {
+ return fProposalInfo;
+ }
+ return null;
}
/*
@@ -374,7 +374,7 @@
/*
* @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getCompletionOffset()
*/
- public int getCompletionOffset() {
+ public int getPrefixCompletionStart(IDocument document, int completionOffset) {
return getReplacementOffset();
}
@@ -415,7 +415,7 @@
/*
* @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getReplacementText()
*/
- public CharSequence getCompletionText() {
+ public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) {
String string= getReplacementString();
int pos= string.indexOf('(');
if (pos > 0)
Index: src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyView.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyView.java,v
retrieving revision 1.4
diff -u -r1.4 DisassemblyView.java
--- src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyView.java 21 Apr 2004 23:10:49 -0000 1.4
+++ src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyView.java 23 Apr 2004 14:25:04 -0000
@@ -11,7 +11,6 @@
package org.eclipse.cdt.debug.internal.ui.views.disassembly;
import java.util.Iterator;
-
import org.eclipse.cdt.debug.core.model.IAsmInstruction;
import org.eclipse.cdt.debug.core.model.ICDebugTarget;
import org.eclipse.cdt.debug.core.model.ICStackFrame;
@@ -57,10 +56,10 @@
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.internal.editors.text.EditorsPlugin;
+import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
import org.eclipse.ui.texteditor.AnnotationPreference;
import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess;
import org.eclipse.ui.texteditor.DefaultRangeIndicator;
-import org.eclipse.ui.texteditor.ExtendedTextEditorPreferenceConstants;
import org.eclipse.ui.texteditor.MarkerAnnotationPreferences;
import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
@@ -82,12 +81,12 @@
/**
* Preference key for highlighting current line.
*/
- private final static String CURRENT_LINE = ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE;
+ private final static String CURRENT_LINE = AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE;
/**
* Preference key for highlight color of current line.
*/
- private final static String CURRENT_LINE_COLOR = ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR;
+ private final static String CURRENT_LINE_COLOR = AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR;
/**
* The vertical ruler.
Index: src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java,v
retrieving revision 1.15
diff -u -r1.15 MakefileEditor.java
--- src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java 6 Apr 2004 14:24:12 -0000 1.15
+++ src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java 23 Apr 2004 14:25:36 -0000
@@ -197,7 +197,7 @@
if (len > 0) {
var = var.substring(0, len);
}
- IRegion region = getFindRepalceDocumentAdapter().search(start, var, true, true, true, false);
+ IRegion region = getFindRepalceDocumentAdapter().find(start, var, true, true, true, false);
if (region != null) {
len = region.getOffset();
