diff options
author | Andrew Ferrazzutti | 2014-05-14 13:41:11 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2014-07-08 16:59:59 +0000 |
commit | cefc0dc25d30d8d7902a7e59ebfc50dc96c417a9 (patch) | |
tree | 8dc4d27f7581aae62b5eb103e8231e22b014ef58 | |
parent | d9eacd098280530d862ab9e876c5236a65ee4463 (diff) | |
download | org.eclipse.linuxtools-cefc0dc25d30d8d7902a7e59ebfc50dc96c417a9.tar.gz org.eclipse.linuxtools-cefc0dc25d30d8d7902a7e59ebfc50dc96c417a9.tar.xz org.eclipse.linuxtools-cefc0dc25d30d8d7902a7e59ebfc50dc96c417a9.zip |
Systemtap: Remove unused Editor preferences.
Remove all Editor preference options (which includes
Code Assist, Conditional Filters, and Syntax Coloring),
since none of them are currently in use.
Change-Id: Iaf03eb9acffbfbbc67ef474e0cd4b51e237af37d
Signed-off-by: Andrew Ferrazzutti <aferrazz@redhat.com>
Reviewed-on: https://git.eclipse.org/r/26692
Tested-by: Hudson CI
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
Tested-by: Alexander Kurtakov <akurtako@redhat.com>
9 files changed, 0 insertions, 390 deletions
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties index 83e6bc165d..96cb75d3d9 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties @@ -10,10 +10,6 @@ editor.stp.name=SystemTap STP Editor editor.simple.name=Simple Editor preference.ide.name=IDE -preference.editor.name=Editor -preference.codeAssist.name=Code Assist -preference.conditionalFilter.name=Conditional Filters -preference.syntaxColor.name=Syntax Coloring preference.path.name=Kernel Source Path preference.tapsets.name=Tapsets preference.envVars.name=Environment Variables diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml index c9deb14649..38066a094c 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml @@ -213,30 +213,6 @@ category="org.eclipse.linuxtools.systemtap.prefs.view"> </page> <page - name="%preference.editor.name" - id="org.eclipse.linuxtools.systemtap.prefs.ide.editor" - class="org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences.EditorPreferencePage" - category="org.eclipse.linuxtools.systemtap.prefs.ide"> - </page> - <page - name="%preference.codeAssist.name" - id="org.eclipse.linuxtools.systemtap.prefs.ide.codeassist" - class="org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences.CodeAssistPreferencePage" - category="org.eclipse.linuxtools.systemtap.prefs.ide.editor"> - </page> - <page - name="%preference.conditionalFilter.name" - id="org.eclipse.linuxtools.systemtap.prefs.ide.conditionalfilters" - class="org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences.ConditionalFilterPreferencePage" - category="org.eclipse.linuxtools.systemtap.prefs.ide.editor"> - </page> - <page - name="%preference.syntaxColor.name" - id="org.eclipse.linuxtools.systemtap.prefs.ide.syntaxcoloring" - class="org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences.SyntaxColoringPreferencePage" - category="org.eclipse.linuxtools.systemtap.prefs.ide.editor"> - </page> - <page name="%preference.path.name" id="org.eclipse.linuxtools.systemtap.prefs.ide.path" class="org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences.PathPreferencePage" diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties index ac40b9e232..6465c3921c 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties @@ -41,17 +41,6 @@ TapsetsPreferencePage.TapsetDirectory=Tapset Directory TapsetBrowserView.WhereDefaultTapset=Where are the default tapsets? -SyntaxColoringPreferencePage.SyntaxColoringOptions=Syntax Coloring Options -SyntaxColoringPreferencePage.DefaultColor=&Default Color: -SyntaxColoringPreferencePage.KeywordColor=&Keyword Color: -SyntaxColoringPreferencePage.EmbeddedCColor=&Embedded C Color: -SyntaxColoringPreferencePage.EmbeddedColor=&Embedded Color: -SyntaxColoringPreferencePage.CommentColor=&Comment Color: -SyntaxColoringPreferencePage.TypeColor=&Type Color: -SyntaxColoringPreferencePage.StringColor=&String Color: -SyntaxColoringPreferencePage.CEditor=c Editor -SyntaxColoringPreferencePage.PreprocessorColor=&Preprocessor Color: - PathPreferencePage.KernelSourceDirectory=&Kernel source directory: PathPreferencePage.ExcludedSourceFolders=&Excluded source folders: PathPreferencePage.ExcludedDirectory=Excluded Directory @@ -59,27 +48,11 @@ PathPreferencePage.RemoteOrLocalRadio=Kernel Source Location PathPreferencePage.LocalMachine=Local Machine PathPreferencePage.RemoteMachine=Remote Machine -ConditionalFilterPreferencePage.ConditiionalFilterSelector=Conditinal filters to be used with code completion -ConditionalFilterPreferencePage.ConditionalFilters=&Conditional Filters: -ConditionalFilterPreferencePage.NewFilter=New Filter - IDEPreferencePage.UseStoredTapsetTree=Use stored tapset trees IDEPreferencePage.RemoteProbes=Use remote connection to load SystemTap probes and functions StapOptionsPreferencePage.StapOptions=Options for running stap -CodeAssistPreferencePage.CodeAssistPreferenceDescription=Preferences controling options for code assist in the editor -CodeAssistPreferencePage.UseCodeAssist=&Use Code Assist -CodeAssistPreferencePage.HowCodeAdded=How code assist adds code: -CodeAssistPreferencePage.Insert=&Insert -CodeAssistPreferencePage.Overwrite=&Overwrite -CodeAssistPreferencePage.ActivationDelay=Activation &Delay (requires restart): -CodeAssistPreferencePage.ActivationTrigger=Activation &Trigger: - -EditorPreferencePage.EditorPreferenceDescription=This is for basic properties of the editors. -EditorPreferencePage.BackgroundColor=&Editor Background Color: -EditorPreferencePage.ShowLineNumbers=Show Line &Numbers - StapSettingsDialog.StapOptions=Stap Options KernelBrowserView.RefreshingKernelSource=Refreshing Kernel Source diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/CodeAssistPreferencePage.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/CodeAssistPreferencePage.java deleted file mode 100644 index 127174bac9..0000000000 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/CodeAssistPreferencePage.java +++ /dev/null @@ -1,69 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse - *******************************************************************************/ - -package org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences; - -import org.eclipse.jface.preference.BooleanFieldEditor; -import org.eclipse.jface.preference.FieldEditorPreferencePage; -import org.eclipse.jface.preference.IntegerFieldEditor; -import org.eclipse.jface.preference.RadioGroupFieldEditor; -import org.eclipse.jface.preference.StringFieldEditor; -import org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin; -import org.eclipse.linuxtools.internal.systemtap.ui.ide.Localization; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; - - -public class CodeAssistPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { - public CodeAssistPreferencePage() { - super(GRID); - setPreferenceStore(IDEPlugin.getDefault().getPreferenceStore()); - setDescription(Localization.getString("CodeAssistPreferencePage.CodeAssistPreferenceDescription")); //$NON-NLS-1$ - } - - /** - * Creates the field editors. Field editors are abstractions of - * the common GUI blocks needed to manipulate various types - * of preferences. Each field editor knows how to save and - * restore itself. - */ - @Override - public void createFieldEditors() { - addField( - new BooleanFieldEditor( - IDEPreferenceConstants.P_USE_CODE_ASSIST, - Localization.getString("CodeAssistPreferencePage.UseCodeAssist"), //$NON-NLS-1$ - getFieldEditorParent())); - addField(new RadioGroupFieldEditor( - IDEPreferenceConstants.P_COMPLETION, - Localization.getString("CodeAssistPreferencePage.HowCodeAdded"), //$NON-NLS-1$ - 1, - new String[][] { - {Localization.getString("CodeAssistPreferencePage.Insert"), IDEPreferenceConstants.P_COMPLETION_INSERT }, //$NON-NLS-1$ - {Localization.getString("CodeAssistPreferencePage.Overwrite"), IDEPreferenceConstants.P_COMPLETION_OVERWRITE }}, //$NON-NLS-1$ - getFieldEditorParent())); - addField( - new IntegerFieldEditor( - IDEPreferenceConstants.P_ACTIVATION_DELAY, - Localization.getString("CodeAssistPreferencePage.ActivationDelay"), //$NON-NLS-1$ - getFieldEditorParent())); - addField( - new StringFieldEditor( - IDEPreferenceConstants.P_ACTIVATION_TRIGGER, - Localization.getString("CodeAssistPreferencePage.ActivationTrigger"), //$NON-NLS-1$ - getFieldEditorParent())); - } - - @Override - public void init(IWorkbench workbench) { - } - -} diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/ConditionalFilterPreferencePage.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/ConditionalFilterPreferencePage.java deleted file mode 100644 index 47d1f53a4e..0000000000 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/ConditionalFilterPreferencePage.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse - *******************************************************************************/ - -package org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences; - -import org.eclipse.jface.preference.FieldEditorPreferencePage; -import org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin; -import org.eclipse.linuxtools.internal.systemtap.ui.ide.Localization; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; - - - -public class ConditionalFilterPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { - public ConditionalFilterPreferencePage() { - super(GRID); - setPreferenceStore(IDEPlugin.getDefault().getPreferenceStore()); - setDescription(Localization.getString("ConditionalFilterPreferencePage.ConditiionalFilterSelector")); //$NON-NLS-1$ - } - - @Override - public void createFieldEditors() { - addField(new ListEditor(IDEPreferenceConstants.P_CONDITIONAL_FILTERS, - Localization.getString("ConditionalFilterPreferencePage.ConditionalFilters"), Localization.getString("ConditionalFilterPreferencePage.NewFilter"), "if()", new ConditionalExpressionValidator(), getFieldEditorParent())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - @Override - public void init(IWorkbench workbench) { - } -} diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/EditorPreferencePage.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/EditorPreferencePage.java deleted file mode 100644 index 1d14b17359..0000000000 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/EditorPreferencePage.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse - *******************************************************************************/ - -package org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences; - -import org.eclipse.jface.preference.BooleanFieldEditor; -import org.eclipse.jface.preference.ColorFieldEditor; -import org.eclipse.jface.preference.FieldEditorPreferencePage; -import org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin; -import org.eclipse.linuxtools.internal.systemtap.ui.ide.Localization; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; - - -public class EditorPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { - public EditorPreferencePage() { - super(GRID); - setPreferenceStore(IDEPlugin.getDefault().getPreferenceStore()); - setDescription(Localization.getString("EditorPreferencePage.EditorPreferenceDescription")); //$NON-NLS-1$ - } - - @Override - public void createFieldEditors() { - addField(new ColorFieldEditor( - IDEPreferenceConstants.P_EDITOR_BACKGROUND, - Localization.getString("EditorPreferencePage.BackgroundColor"), getFieldEditorParent())); //$NON-NLS-1$ - - addField(new BooleanFieldEditor( - IDEPreferenceConstants.P_SHOW_LINE_NUMBERS, - Localization.getString("EditorPreferencePage.ShowLineNumbers"), //$NON-NLS-1$ - getFieldEditorParent())); - } - - @Override - public void init(IWorkbench workbench) { - } -} diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/IDEPreferenceConstants.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/IDEPreferenceConstants.java index 285f1d100f..7cfb206bf3 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/IDEPreferenceConstants.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/IDEPreferenceConstants.java @@ -24,21 +24,6 @@ public class IDEPreferenceConstants { //ide.stap.tapsets public static final String P_TAPSETS = "TapsetPreference"; //$NON-NLS-1$ - //ide.editor - public static final String P_EDITOR_BACKGROUND = "EditorBackgroundPreference"; //$NON-NLS-1$ - public static final String P_SHOW_LINE_NUMBERS = "ShowLineNumbers"; //$NON-NLS-1$ - - //ide.editor.codeassist - public static final String P_USE_CODE_ASSIST = "UseCodeAssistPreference"; //$NON-NLS-1$ - public static final String P_COMPLETION = "CompletionPreference"; //$NON-NLS-1$ - public static final String P_COMPLETION_INSERT = "CompletionInsertPreference"; //$NON-NLS-1$ - public static final String P_COMPLETION_OVERWRITE = "CompletionOverwritePreference"; //$NON-NLS-1$ - public static final String P_ACTIVATION_DELAY = "ActivationDelayPreference"; //$NON-NLS-1$ - public static final String P_ACTIVATION_TRIGGER = "ActivationTriggerPreference"; //$NON-NLS-1$ - - //ide.editor.preferenceconstants - public static final String P_CONDITIONAL_FILTERS = "ConditionalFilters"; //$NON-NLS-1$ - public static final int FLAG = 0; public static final int LABEL = 1; public static final int KEY = 2; @@ -62,19 +47,4 @@ public class IDEPreferenceConstants { public static final String[] STAP_CMD_OPTION = new String[] {"-c", "CMD run CMD under systemtap", "cStapPreference", "start the probes, run CMD, and exit when it finishes"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - //ide.editor.syntaxcoloring - public static final String P_STP_DEFAULT_COLOR = "stpDefaultColorPreference"; //$NON-NLS-1$ - public static final String P_STP_KEYWORD_COLOR = "stpKeywordColorPreference"; //$NON-NLS-1$ - public static final String P_STP_EMBEDDED_C_COLOR = "stpEmbeddedCColorPreference"; //$NON-NLS-1$ - public static final String P_STP_EMBEDDED_COLOR = "stpEmbeddedColorPreference"; //$NON-NLS-1$ - public static final String P_STP_COMMENT_COLOR = "stpCommentColorPreference"; //$NON-NLS-1$ - public static final String P_STP_TYPE_COLOR = "stpTypeColorPreference"; //$NON-NLS-1$ - public static final String P_STP_STRING_COLOR = "stpStringColorPreference"; //$NON-NLS-1$ - public static final String P_C_DEFAULT_COLOR = "cDefaultColorPreference"; //$NON-NLS-1$ - public static final String P_C_KEYWORD_COLOR = "cKeywordColorPreference"; //$NON-NLS-1$ - public static final String P_C_COMMENT_COLOR = "cCommentColorPreference"; //$NON-NLS-1$ - public static final String P_C_PREPROCESSOR_COLOR = "cPreprocessorColorPreference"; //$NON-NLS-1$ - public static final String P_C_TYPE_COLOR = "cTypeColorPreference"; //$NON-NLS-1$ - public static final String P_C_STRING_COLOR = "cStringColorPreference"; //$NON-NLS-1$ - } diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/PreferenceInitializer.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/PreferenceInitializer.java index ad14abbb3d..337fc5e7f1 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/PreferenceInitializer.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/PreferenceInitializer.java @@ -17,11 +17,8 @@ import java.io.InputStreamReader; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin; -import org.eclipse.linuxtools.internal.systemtap.ui.ide.editors.stp.STPColorConstants; import org.eclipse.linuxtools.tools.launch.core.factory.RuntimeProcessFactory; -import org.eclipse.swt.graphics.RGB; public class PreferenceInitializer extends AbstractPreferenceInitializer { @@ -52,24 +49,6 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { //ide.stap.tapsets store.setDefault(IDEPreferenceConstants.P_TAPSETS, ""); //$NON-NLS-1$ - //ide.editor - PreferenceConverter.setDefault(store, IDEPreferenceConstants.P_EDITOR_BACKGROUND, new RGB(255,255,255)); - store.setDefault(IDEPreferenceConstants.P_SHOW_LINE_NUMBERS, false); - - //ide.editor.codeassist - store.setDefault(IDEPreferenceConstants.P_USE_CODE_ASSIST, true); - store.setDefault(IDEPreferenceConstants.P_COMPLETION, IDEPreferenceConstants.P_COMPLETION_INSERT); - store.setDefault(IDEPreferenceConstants.P_ACTIVATION_DELAY, 200); - store.setDefault(IDEPreferenceConstants.P_ACTIVATION_TRIGGER, "."); //$NON-NLS-1$ - - //ide.editor.conditionalfilters - store.setDefault(IDEPreferenceConstants.P_CONDITIONAL_FILTERS, - "if(pid=currentpid)" + File.pathSeparator + //$NON-NLS-1$ - "if(execname=cmdname)" + File.pathSeparator + //$NON-NLS-1$ - "if(cpu=0)" + File.pathSeparator + //$NON-NLS-1$ - "if(caller=functionname)"); //$NON-NLS-1$ - - //ide.stap.stapoptions for(int i=0; i<IDEPreferenceConstants.STAP_BOOLEAN_OPTIONS.length; i++) { store.setDefault(IDEPreferenceConstants.STAP_BOOLEAN_OPTIONS[i][IDEPreferenceConstants.KEY], false); @@ -79,15 +58,6 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { store.setDefault(IDEPreferenceConstants.STAP_STRING_OPTIONS[i][IDEPreferenceConstants.KEY], ""); //$NON-NLS-1$ } - //ide.editor.syntaxcoloring - PreferenceConverter.setDefault(store, IDEPreferenceConstants.P_STP_DEFAULT_COLOR, STPColorConstants.DEFAULT); - PreferenceConverter.setDefault(store, IDEPreferenceConstants.P_STP_KEYWORD_COLOR, STPColorConstants.KEYWORD); - PreferenceConverter.setDefault(store, IDEPreferenceConstants.P_STP_EMBEDDED_C_COLOR, STPColorConstants.EMBEDDEDC); - PreferenceConverter.setDefault(store, IDEPreferenceConstants.P_STP_EMBEDDED_COLOR, STPColorConstants.EMBEDDED); - PreferenceConverter.setDefault(store, IDEPreferenceConstants.P_STP_COMMENT_COLOR, STPColorConstants.COMMENT); - PreferenceConverter.setDefault(store, IDEPreferenceConstants.P_STP_TYPE_COLOR, STPColorConstants.TYPE); - PreferenceConverter.setDefault(store, IDEPreferenceConstants.P_STP_STRING_COLOR, STPColorConstants.STP_STRING); - } private String getKernelSourceLocation(){ diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/SyntaxColoringPreferencePage.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/SyntaxColoringPreferencePage.java deleted file mode 100644 index c2aec9723f..0000000000 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/SyntaxColoringPreferencePage.java +++ /dev/null @@ -1,123 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse - *******************************************************************************/ - -package org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences; - -import org.eclipse.jface.preference.ColorFieldEditor; -import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin; -import org.eclipse.linuxtools.internal.systemtap.ui.ide.Localization; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; - - -public class SyntaxColoringPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - public SyntaxColoringPreferencePage() { - super(); - setPreferenceStore(IDEPlugin.getDefault().getPreferenceStore()); - setDescription(Localization.getString("SyntaxColoringPreferencePage.SyntaxColoringOptions")); //$NON-NLS-1$ - } - - @Override - public void init(IWorkbench workbench) { - } - - @Override - protected Control createContents(Composite parent) { - //STP Editor - Composite comp = new Composite(parent, SWT.NULL); - comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - - stpDC = createColorFieldEditor( - IDEPreferenceConstants.P_STP_DEFAULT_COLOR, - Localization.getString("SyntaxColoringPreferencePage.DefaultColor"), comp); //$NON-NLS-1$ - stpKC = createColorFieldEditor( - IDEPreferenceConstants.P_STP_KEYWORD_COLOR, - Localization.getString("SyntaxColoringPreferencePage.KeywordColor"), comp); //$NON-NLS-1$ - stpEC = createColorFieldEditor( - IDEPreferenceConstants.P_STP_EMBEDDED_C_COLOR, - Localization.getString("SyntaxColoringPreferencePage.EmbeddedCColor"), comp); //$NON-NLS-1$ - stpEE = createColorFieldEditor( - IDEPreferenceConstants.P_STP_EMBEDDED_COLOR, - Localization.getString("SyntaxColoringPreferencePage.EmbeddedColor"), comp); //$NON-NLS-1$ - stpCC = createColorFieldEditor( - IDEPreferenceConstants.P_STP_COMMENT_COLOR, - Localization.getString("SyntaxColoringPreferencePage.CommentColor"), comp); //$NON-NLS-1$ - stpTC = createColorFieldEditor( - IDEPreferenceConstants.P_STP_TYPE_COLOR, - Localization.getString("SyntaxColoringPreferencePage.TypeColor"), comp); //$NON-NLS-1$ - stpSC = createColorFieldEditor( - IDEPreferenceConstants.P_STP_STRING_COLOR, - Localization.getString("SyntaxColoringPreferencePage.StringColor"), comp); //$NON-NLS-1$ - - return comp; - } - - private ColorFieldEditor createColorFieldEditor(String name, String lblText, Composite parent) { - ColorFieldEditor cfe = new ColorFieldEditor(name, lblText, parent); - cfe.setPage(this); - cfe.setPreferenceStore(getPreferenceStore()); - cfe.load(); - - return cfe; - } - - @Override - protected void performDefaults() { - stpDC.loadDefault(); - stpKC.loadDefault(); - stpEC.loadDefault(); - stpEE.loadDefault(); - stpCC.loadDefault(); - stpTC.loadDefault(); - stpSC.loadDefault(); - - super.performDefaults(); - } - - @Override - public boolean performOk() { - stpDC.store(); - stpKC.store(); - stpEC.store(); - stpEE.store(); - stpCC.store(); - stpTC.store(); - stpSC.store(); - - return true; - } - - @Override - public void dispose() { - super.dispose(); - stpDC.dispose(); - stpKC.dispose(); - stpEC.dispose(); - stpEE.dispose(); - stpCC.dispose(); - stpTC.dispose(); - stpSC.dispose(); - stpDC = null; - stpKC = null; - stpEC = null; - stpEE = null; - stpCC = null; - stpTC = null; - stpSC = null; - } - - private ColorFieldEditor stpDC, stpKC, stpEC, stpEE, stpCC, stpTC, stpSC; -} |