X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java index 4195eee..569458b 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java @@ -80,8 +80,8 @@ public class PHPEditorPreferencePage extends PreferencePage IWorkbenchPreferencePage { private static final String BOLD = PreferenceConstants.EDITOR_BOLD_SUFFIX; private static final String COMPILER_TASK_TAGS = JavaCore.COMPILER_TASK_TAGS; - // public final OverlayPreferenceStore.OverlayKey[] fKeys = - // new OverlayPreferenceStore.OverlayKey[] { +// public final OverlayPreferenceStore.OverlayKey[] fKeys = +// new OverlayPreferenceStore.OverlayKey[] { // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, // PreferenceConstants.EDITOR_FOREGROUND_COLOR), // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, @@ -225,47 +225,47 @@ public class PHPEditorPreferencePage extends PreferencePage // PreferenceConstants.EDITOR_LINE_NUMBER_RULER), // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, // PreferenceConstants.EDITOR_SPACES_FOR_TABS), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, - // PreferenceConstants.CODEASSIST_AUTOACTIVATION), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, - // PreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, - // PreferenceConstants.CODEASSIST_AUTOINSERT), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, - // PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, - // PreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, - // PreferenceConstants.CODEASSIST_PARAMETERS_BACKGROUND), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, - // PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, - // PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, - // PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND), - // new OverlayPreferenceStore.OverlayKey( - // OverlayPreferenceStore.STRING, - // PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA), - // new OverlayPreferenceStore.OverlayKey( - // OverlayPreferenceStore.STRING, - // PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVADOC), - // new OverlayPreferenceStore.OverlayKey( - // OverlayPreferenceStore.STRING, - // PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_HTML), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, - // PreferenceConstants.CODEASSIST_SHOW_VISIBLE_PROPOSALS), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, - // PreferenceConstants.CODEASSIST_ORDER_PROPOSALS), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, - // PreferenceConstants.CODEASSIST_CASE_SENSITIVITY), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, - // PreferenceConstants.CODEASSIST_ADDIMPORT), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, - // PreferenceConstants.CODEASSIST_INSERT_COMPLETION), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, - // PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES), - // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, - // PreferenceConstants.CODEASSIST_GUESS_METHOD_ARGUMENTS), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, +// PreferenceConstants.CODEASSIST_AUTOACTIVATION), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, +// PreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, +// PreferenceConstants.CODEASSIST_AUTOINSERT), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, +// PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, +// PreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, +// PreferenceConstants.CODEASSIST_PARAMETERS_BACKGROUND), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, +// PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, +// PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, +// PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND), +// new OverlayPreferenceStore.OverlayKey( +// OverlayPreferenceStore.STRING, +// PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA), +// new OverlayPreferenceStore.OverlayKey( +// OverlayPreferenceStore.STRING, +// PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVADOC), +// new OverlayPreferenceStore.OverlayKey( +// OverlayPreferenceStore.STRING, +// PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_HTML), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, +// PreferenceConstants.CODEASSIST_SHOW_VISIBLE_PROPOSALS), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, +// PreferenceConstants.CODEASSIST_ORDER_PROPOSALS), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, +// PreferenceConstants.CODEASSIST_CASE_SENSITIVITY), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, +// PreferenceConstants.CODEASSIST_ADDIMPORT), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, +// PreferenceConstants.CODEASSIST_INSERT_COMPLETION), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, +// PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES), +// new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, +// PreferenceConstants.CODEASSIST_GUESS_METHOD_ARGUMENTS), // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, // PreferenceConstants.EDITOR_SMART_PASTE), // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, @@ -308,7 +308,7 @@ public class PHPEditorPreferencePage extends PreferencePage // PreferenceConstants.EDITOR_CTRL_SHIFT_HOVER), // new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, // PreferenceConstants.EDITOR_ALT_SHIFT_HOVER), - // }; +// }; /** The keys of the overlay store. */ public final OverlayPreferenceStore.OverlayKey[] fKeys; private final String[][] fSyntaxColorListModel = new String[][]{ @@ -710,7 +710,7 @@ public class PHPEditorPreferencePage extends PreferencePage OverlayPreferenceStore.BOOLEAN, PreferenceConstants.CODEASSIST_AUTOINSERT)); overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, + OverlayPreferenceStore.STRING, PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND)); overlayKeys.add(new OverlayPreferenceStore.OverlayKey( OverlayPreferenceStore.STRING, @@ -1701,17 +1701,17 @@ public class PHPEditorPreferencePage extends PreferencePage } } }); - // for (int i= 0; i < fContentAssistColorListModel.length; i++) - // fContentAssistColorList.add(fContentAssistColorListModel[i][0]); - // fContentAssistColorList.getDisplay().asyncExec(new Runnable() { - // public void run() { - // if (fContentAssistColorList != null && - // !fContentAssistColorList.isDisposed()) { - // fContentAssistColorList.select(0); - // handleContentAssistColorListSelection(); - // } - // } - // }); +// for (int i= 0; i < fContentAssistColorListModel.length; i++) +// fContentAssistColorList.add(fContentAssistColorListModel[i][0]); +// fContentAssistColorList.getDisplay().asyncExec(new Runnable() { +// public void run() { +// if (fContentAssistColorList != null && +// !fContentAssistColorList.isDisposed()) { +// fContentAssistColorList.select(0); +// handleContentAssistColorListSelection(); +// } +// } +// }); } private void initializeFields() { Iterator e = fColorButtons.keySet().iterator();