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

2004-05-21 Alain Magloire

Browse source 
$&#*$(^#&^$(^#
	Eclipse-3.0 change the way things are done
	for the preferences we have, for the CEditor
	merge the Preference settings: the CUIPlugin store
	and the Editor store since now the settings is
	on the TextEditor(see annotation).
This commit is contained in:
Alain Magloire 2004-05-21 05:43:13 +00:00
parent f6719903b6
commit 4ee5d85a60
3 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,12 @@
2004-05-21 Alain Magloire
$&#*$(^#&^$(^#
Eclipse-3.0 change the way things are done
for the preferences we have, for the CEditor
merge the Preference settings: the CUIPlugin store
and the Editor store since now the settings is
on the TextEditor(see annotation).
2004-05-19 Alain Magloire 2004-05-19 Alain Magloire
Contribution from Sam Robb, for PR 52864. Contribution from Sam Robb, for PR 52864.

4
core/org.eclipse.cdt.ui/plugin.xml
View file

@ -731,9 +731,5 @@
markerType="org.eclipse.cdt.core.problem" markerType="org.eclipse.cdt.core.problem"
markerSeverity="0"> markerSeverity="0">
</type> </type>
<type
name="org.eclipse.cdt.ui.occurrences">
</type>
</extension> </extension>
</plugin> </plugin>

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
View file

@ -36,7 +36,6 @@ import org.eclipse.core.runtime.Preferences;
import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IStatusLineManager; import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.DocumentCommand; import org.eclipse.jface.text.DocumentCommand;
@ -75,11 +74,13 @@ import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.actions.ActionGroup;
import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.ui.editors.text.TextEditor; import org.eclipse.ui.editors.text.TextEditor;
import org.eclipse.ui.part.EditorActionBarContributor; import org.eclipse.ui.part.EditorActionBarContributor;
import org.eclipse.ui.part.IShowInSource; import org.eclipse.ui.part.IShowInSource;
import org.eclipse.ui.part.ShowInContext; import org.eclipse.ui.part.ShowInContext;
import org.eclipse.ui.texteditor.AnnotationPreference; import org.eclipse.ui.texteditor.AnnotationPreference;
import org.eclipse.ui.texteditor.ChainedPreferenceStore;
import org.eclipse.ui.texteditor.ContentAssistAction; import org.eclipse.ui.texteditor.ContentAssistAction;
import org.eclipse.ui.texteditor.DefaultRangeIndicator; import org.eclipse.ui.texteditor.DefaultRangeIndicator;
import org.eclipse.ui.texteditor.IEditorStatusLine; import org.eclipse.ui.texteditor.IEditorStatusLine;
@ -162,7 +163,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS
setSourceViewerConfiguration(new CSourceViewerConfiguration(textTools, this)); setSourceViewerConfiguration(new CSourceViewerConfiguration(textTools, this));
setDocumentProvider(CUIPlugin.getDefault().getDocumentProvider()); setDocumentProvider(CUIPlugin.getDefault().getDocumentProvider());
setRangeIndicator(new DefaultRangeIndicator()); setRangeIndicator(new DefaultRangeIndicator());
setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore()); //setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore());
setEditorContextMenuId("#CEditorContext"); //$NON-NLS-1$ setEditorContextMenuId("#CEditorContext"); //$NON-NLS-1$
setRulerContextMenuId("#CEditorRulerContext"); //$NON-NLS-1$ setRulerContextMenuId("#CEditorRulerContext"); //$NON-NLS-1$
@ -171,6 +172,17 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS
fCEditorErrorTickUpdater = new CEditorErrorTickUpdater(this); fCEditorErrorTickUpdater = new CEditorErrorTickUpdater(this);
} }
/*
* @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#initializeEditor()
*/
protected void initializeEditor() {
IPreferenceStore[] stores = new IPreferenceStore[2];
stores[0] = CUIPlugin.getDefault().getPreferenceStore();
stores[1] = EditorsUI.getPreferenceStore();
IPreferenceStore store = new ChainedPreferenceStore(stores);
setPreferenceStore(store);
}
/** /**
* @see AbstractTextEditor#doSetInput(IEditorInput) * @see AbstractTextEditor#doSetInput(IEditorInput)
*/ */