From 695306e4ef324fc74688c44952dc5b267490a19a Mon Sep 17 00:00:00 2001 From: robekras Date: Sun, 27 Oct 2013 17:23:31 +0100 Subject: [PATCH] 1) Added setting of syntax properties to italic, underline and strike through. Signed-off-by: robekras --- .../preferences/PreferencesMessages_de.properties | 23 +- .../phpeclipse/ui/IPreferenceConstants.java | 43 +- .../ui/preferences/JavaEditorPreferencePage.java | 854 ++++++++--------- .../internal/ui/text/AbstractJavaScanner.java | 313 +++++- .../sourceforge/phpdt/ui/PreferenceConstants.java | 1033 +++++++++----------- .../phpeclipse/IPreferenceConstants.java | 44 +- .../phpeclipse/phpeditor/php/PHPCodeScanner.java | 18 +- .../phpeditor/php/SmartyCodeScanner.java | 9 +- 8 files changed, 1206 insertions(+), 1131 deletions(-) diff --git a/net.sourceforge.phpeclipse.nl1/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages_de.properties b/net.sourceforge.phpeclipse.nl1/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages_de.properties index e083204..b02f2bc 100644 --- a/net.sourceforge.phpeclipse.nl1/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages_de.properties +++ b/net.sourceforge.phpeclipse.nl1/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages_de.properties @@ -55,7 +55,7 @@ NewJavaProjectPreferencePage.jre_container.description=JRE-Container NewJavaProjectPreferencePage.folders.error.namesempty=Geben Sie Ordnernamen ein. NewJavaProjectPreferencePage.folders.error.invalidsrcname=Der Name des Quellenordners {0} ist ung\u00FCltig. NewJavaProjectPreferencePage.folders.error.invalidbinname=Der Name des Ausgabeordners {0} ist ung\u00FCltig. -NewJavaProjectPreferencePage.folders.error.invalidcp=Die Einstellungen verursachen einen ung\u00FCltigen Erstellungspfad. Pr\u00FCfen Sie, ob Ordner verschachtelt sind. +NewJavaProjectPreferencePage.folders.error.invalidcp=Die Einstellungen verursachen einen ung\u00FCltigen Erstellungspfad. Pr\u00FCfen Sie, ob Ordner verschachtelt sind. NewJavaProjectPreferencePage.error.decode=Fehler beim Entschl\u00FCsseln des JRE-Eintrags JavaEditorPreferencePage.annotationsTab.title=Anmerkung&en JavaEditorPreferencePage.showQuickFixables=Mit &Schnellkorrektur aufl\u00F6sbare Anmerkungen in vertikaler Skala angeben @@ -87,6 +87,9 @@ JavaEditorPreferencePage.custom=Ange&passt\: JavaEditorPreferencePage.foreground=Vo&rdergrund\: JavaEditorPreferencePage.color=F&arbe\: JavaEditorPreferencePage.bold=&Fett\: +JavaEditorPreferencePage.italic=&Italic\: +JavaEditorPreferencePage.underline=&Unterstrich\: +JavaEditorPreferencePage.strikethrough=&Durchgestrichen: JavaEditorPreferencePage.preview=Voranzeige\: JavaEditorPreferencePage.displayedTabWidth=Angezeigte &Tabulatorbreite\: JavaEditorPreferencePage.insertSpaceForTabs=Leer&zeichen f\u00FCr Tabulatoren einf\u00FCgen (siehe Benutzervorgabenseite f\u00FCr Codeformatierungsprogramm) @@ -147,8 +150,8 @@ JavaEditorPreferencePage.navigation.browserLikeLinksKeyModifier=\u00C4nderungswe JavaEditorPreferencePage.navigation.modifierIsNotValid=Der \u00C4nderungswert ''{0}'' ist ung\u00FCltig. JavaEditorPreferencePage.navigation.shiftIsDisabled=Der \u00C4nderungswert 'Umschalttaste' ist nicht zul\u00E4ssig, weil 'Umschalttaste' + Mausklick eine neue Auswahl festlegt. JavaEditorPreferencePage.navigation.delimiter=+ -JavaEditorPreferencePage.navigation.insertDelimiterAndModifierAndDelimiter=\ + {0} + -JavaEditorPreferencePage.navigation.insertModifierAndDelimiter=\ {0} + +JavaEditorPreferencePage.navigation.insertDelimiterAndModifierAndDelimiter=\ + {0} + +JavaEditorPreferencePage.navigation.insertModifierAndDelimiter=\ {0} + JavaEditorPreferencePage.navigation.insertDelimiterAndModifier=\ + {0} JavaEditorHoverConfigurationBlock.hoverPreferences=Benutzervorgaben f\u00FCr \u00C4nderungswert f\u00FCr &Kurzinfotaste\: JavaEditorHoverConfigurationBlock.enabled=&Aktiviert @@ -158,18 +161,18 @@ JavaEditorHoverConfigurationBlock.modifierIsNotValid=Der \u00C4nderungswert ''{0 JavaEditorHoverConfigurationBlock.modifierIsNotValidForHover=Der \u00C4nderungswert ''{0}'' f\u00FCr die Kurzinfo ''{1}'' ist ung\u00FCltig. JavaEditorHoverConfigurationBlock.duplicateModifier=Kurzinfo ''{0}'' verwendet denselben \u00C4nderungswert wie Kurzinfo ''{1}''. JavaEditorHoverConfigurationBlock.delimiter=+ -JavaEditorHoverConfigurationBlock.insertDelimiterAndModifierAndDelimiter=\ + {0} + -JavaEditorHoverConfigurationBlock.insertModifierAndDelimiter=\ {0} + +JavaEditorHoverConfigurationBlock.insertDelimiterAndModifierAndDelimiter=\ + {0} + +JavaEditorHoverConfigurationBlock.insertModifierAndDelimiter=\ {0} + JavaEditorHoverConfigurationBlock.insertDelimiterAndModifier=\ + {0} JavaElementInfoPage.binary=bin\u00E4r -JavaElementInfoPage.classpath_entry_kind=Typ des Klassenpfadeintrags\: +JavaElementInfoPage.classpath_entry_kind=Typ des Klassenpfadeintrags\: JavaElementInfoPage.library=Bibliothek -JavaElementInfoPage.nameLabel=Name\: +JavaElementInfoPage.nameLabel=Name\: JavaElementInfoPage.not_present=Nicht vorhanden -JavaElementInfoPage.package=Paket\: -JavaElementInfoPage.package_contents=Paketinhalt\: +JavaElementInfoPage.package=Paket\: +JavaElementInfoPage.package_contents=Paketinhalt\: JavaElementInfoPage.project=Projekt -JavaElementInfoPage.resource_path=Ressourcenpfad\: +JavaElementInfoPage.resource_path=Ressourcenpfad\: JavaElementInfoPage.source=Quelle JavaElementInfoPage.variable=Variable JavaElementInfoPage.variable_path=Variablenpfad\: diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/IPreferenceConstants.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/IPreferenceConstants.java index 055fea5..ec9f0f9 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/IPreferenceConstants.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/IPreferenceConstants.java @@ -20,14 +20,14 @@ public interface IPreferenceConstants { // "_show_xml_files_local"; /** * Preference key suffix for bold text style preference keys. - * + * * @since 2.1 */ public static final String EDITOR_BOLD_SUFFIX = "_bold"; //$NON-NLS-1$ /** * Preference key suffix for italic text style preference keys. - * + * * @since 3.0 */ public static final String EDITOR_ITALIC_SUFFIX = "_italic"; //$NON-NLS-1$ @@ -92,7 +92,7 @@ public interface IPreferenceConstants { /** * The color key for operators and brackets in PHP code (value * "__php_operator"). - * + * * @since 3.0 */ public static final String PHP_OPERATOR = "__php_operator"; //$NON-NLS-1$ @@ -100,7 +100,7 @@ public interface IPreferenceConstants { /** * The color key for {} in PHP code (value * "__php_brace_operator"). - * + * * @since 3.0 */ public static final String PHP_BRACE_OPERATOR = "__php_brace_operator"; //$NON-NLS-1$ @@ -112,7 +112,7 @@ public interface IPreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

- * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 3.0 @@ -125,11 +125,10 @@ public interface IPreferenceConstants { *

* Value is of type Boolean. *

- * + * * @since 3.0 */ - public final static String EDITOR_PHP_OPERATOR_BOLD = PHP_OPERATOR - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_OPERATOR_BOLD = PHP_OPERATOR + EDITOR_BOLD_SUFFIX; /** * A named preference that controls whether operators and brackets are @@ -137,11 +136,10 @@ public interface IPreferenceConstants { *

* Value is of type Boolean. *

- * + * * @since 3.0 */ - public final static String EDITOR_PHP_OPERATOR_ITALIC = PHP_OPERATOR - + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_OPERATOR_ITALIC = PHP_OPERATOR + EDITOR_ITALIC_SUFFIX; /** * A named preference that holds the color used to render operators and @@ -150,7 +148,7 @@ public interface IPreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

- * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 3.0 @@ -163,11 +161,10 @@ public interface IPreferenceConstants { *

* Value is of type Boolean. *

- * + * * @since 3.0 */ - public final static String EDITOR_PHP_BRACE_OPERATOR_BOLD = PHP_BRACE_OPERATOR - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_BRACE_OPERATOR_BOLD = PHP_BRACE_OPERATOR + EDITOR_BOLD_SUFFIX; /** * A named preference that controls whether operators and brackets are @@ -175,7 +172,7 @@ public interface IPreferenceConstants { *

* Value is of type Boolean. *

- * + * * @since 3.0 */ public final static String EDITOR_PHP_BRACE_OPERATOR_ITALIC = PHP_BRACE_OPERATOR @@ -184,7 +181,7 @@ public interface IPreferenceConstants { /** * The color key for keyword 'return' in PHP code (value * "__php_keyword_return"). - * + * * @since 3.0 */ public static final String PHP_KEYWORD_RETURN = "__php_keyword_return"; //$NON-NLS-1$ @@ -196,7 +193,7 @@ public interface IPreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

- * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 3.0 @@ -209,11 +206,10 @@ public interface IPreferenceConstants { *

* Value is of type Boolean. *

- * + * * @since 3.0 */ - public final static String EDITOR_PHP_KEYWORD_RETURN_BOLD = PHP_KEYWORD_RETURN - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_KEYWORD_RETURN_BOLD = PHP_KEYWORD_RETURN + EDITOR_BOLD_SUFFIX; /** * A named preference that controls whether 'return' keyword is rendered in @@ -221,11 +217,10 @@ public interface IPreferenceConstants { *

* Value is of type Boolean. *

- * + * * @since 3.0 */ - public final static String EDITOR_PHP_KEYWORD_RETURN_ITALIC = PHP_KEYWORD_RETURN - + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_KEYWORD_RETURN_ITALIC = PHP_KEYWORD_RETURN + EDITOR_ITALIC_SUFFIX; public static final String PHP_SINGLELINE_COMMENT = "_php_singlelineComment"; diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java index f6e9da8..771385e 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java @@ -92,7 +92,10 @@ import org.eclipse.ui.texteditor.MarkerAnnotationPreferences; */ public class JavaEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - private static final String BOLD = PreferenceConstants.EDITOR_BOLD_SUFFIX; + private static final String BOLD = PreferenceConstants.EDITOR_BOLD_SUFFIX; + private static final String ITALIC = PreferenceConstants.EDITOR_ITALIC_SUFFIX; + private static final String UNDERLINE = PreferenceConstants.EDITOR_UNDERLINE_SUFFIX; + private static final String STRIKETHROUGH = PreferenceConstants.EDITOR_STRIKETHROUGH_SUFFIX; private static final String COMPILER_TASK_TAGS = JavaCore.COMPILER_TASK_TAGS; @@ -104,113 +107,96 @@ public class JavaEditorPreferencePage extends PreferencePage implements private final String[][] fSyntaxColorListModel = new String[][] { { - PreferencesMessages - .getString("JavaEditorPreferencePage.multiLineComment"), + PreferencesMessages.getString("JavaEditorPreferencePage.multiLineComment"), PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.singleLineComment"), + PreferencesMessages.getString("JavaEditorPreferencePage.singleLineComment"), PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR }, //$NON-NLS-1$ - { PreferencesMessages.getString("JavaEditorPreferencePage.tags"), + { + PreferencesMessages.getString("JavaEditorPreferencePage.tags"), PreferenceConstants.EDITOR_PHP_TAG_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.keywords"), + PreferencesMessages.getString("JavaEditorPreferencePage.keywords"), PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR }, { - PreferencesMessages - .getString("JavaEditorPreferencePage.functionNames"), + PreferencesMessages.getString("JavaEditorPreferencePage.functionNames"), PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.variables"), + PreferencesMessages.getString("JavaEditorPreferencePage.variables"), PreferenceConstants.EDITOR_PHP_VARIABLE_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.variables_dollar"), + PreferencesMessages.getString("JavaEditorPreferencePage.variables_dollar"), PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.constants"), + PreferencesMessages.getString("JavaEditorPreferencePage.constants"), PreferenceConstants.EDITOR_PHP_CONSTANT_COLOR }, //$NON-NLS-1$ - { PreferencesMessages.getString("JavaEditorPreferencePage.types"), + { + PreferencesMessages.getString("JavaEditorPreferencePage.types"), PreferenceConstants.EDITOR_PHP_TYPE_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.strings_dq"), + PreferencesMessages.getString("JavaEditorPreferencePage.strings_dq"), PreferenceConstants.EDITOR_STRING_COLOR_DQ }, { - PreferencesMessages - .getString("JavaEditorPreferencePage.strings_sq"), + PreferencesMessages.getString("JavaEditorPreferencePage.strings_sq"), PreferenceConstants.EDITOR_STRING_COLOR_SQ }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.others"), PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR }, //$NON-NLS-1$ + PreferencesMessages.getString("JavaEditorPreferencePage.others"), + PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.operators"), + PreferencesMessages.getString("JavaEditorPreferencePage.operators"), PreferenceConstants.EDITOR_PHP_OPERATOR_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.returnKeyword"), + PreferencesMessages.getString("JavaEditorPreferencePage.returnKeyword"), PreferenceConstants.EDITOR_PHP_KEYWORD_RETURN_COLOR }, - { PreferencesMessages.getString("JavaEditorPreferencePage.braces"), + { + PreferencesMessages.getString("JavaEditorPreferencePage.braces"), PreferenceConstants.EDITOR_PHP_BRACE_OPERATOR_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.phpDocKeywords"), + PreferencesMessages.getString("JavaEditorPreferencePage.phpDocKeywords"), PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.phpDocHtmlTags"), + PreferencesMessages.getString("JavaEditorPreferencePage.phpDocHtmlTags"), PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.phpDocLinks"), + PreferencesMessages.getString("JavaEditorPreferencePage.phpDocLinks"), PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.phpDocOthers"), PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR } //$NON-NLS-1$ + PreferencesMessages.getString("JavaEditorPreferencePage.phpDocOthers"), PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR } //$NON-NLS-1$ }; private final String[][] fAppearanceColorListModel = new String[][] { { - PreferencesMessages - .getString("JavaEditorPreferencePage.matchingBracketsHighlightColor2"), + PreferencesMessages.getString("JavaEditorPreferencePage.matchingBracketsHighlightColor2"), PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.currentLineHighlighColor"), + PreferencesMessages.getString("JavaEditorPreferencePage.currentLineHighlighColor"), AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.printMarginColor2"), + PreferencesMessages.getString("JavaEditorPreferencePage.printMarginColor2"), AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.findScopeColor2"), + PreferencesMessages.getString("JavaEditorPreferencePage.findScopeColor2"), PreferenceConstants.EDITOR_FIND_SCOPE_COLOR }, //$NON-NLS-1$ { - PreferencesMessages - .getString("JavaEditorPreferencePage.linkColor2"), PreferenceConstants.EDITOR_LINK_COLOR }, //$NON-NLS-1$ + PreferencesMessages.getString("JavaEditorPreferencePage.linkColor2"), PreferenceConstants.EDITOR_LINK_COLOR }, //$NON-NLS-1$ }; // private final String[][] fAnnotationColorListModel; @@ -306,6 +292,9 @@ public class JavaEditorPreferencePage extends PreferencePage implements private Button fBackgroundColorButton; private Button fBoldCheckBox; + private Button fItalicCheckBox; + private Button fUnderlineCheckBox; + private Button fStrikeThroughCheckBox; // private Button fAddJavaDocTagsButton; @@ -353,8 +342,7 @@ public class JavaEditorPreferencePage extends PreferencePage implements * Creates a new preference page. */ public JavaEditorPreferencePage() { - setDescription(PreferencesMessages - .getString("JavaEditorPreferencePage.description")); //$NON-NLS-1$ + setDescription(PreferencesMessages.getString("JavaEditorPreferencePage.description")); //$NON-NLS-1$ setPreferenceStore(PHPeclipsePlugin.getDefault().getPreferenceStore()); MarkerAnnotationPreferences markerAnnotationPreferences = new MarkerAnnotationPreferences(); fKeys = createOverlayStoreKeys(markerAnnotationPreferences); @@ -367,354 +355,224 @@ public class JavaEditorPreferencePage extends PreferencePage implements MarkerAnnotationPreferences preferences) { ArrayList overlayKeys = new ArrayList(); Iterator e = preferences.getAnnotationPreferences().iterator(); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_FOREGROUND_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_FOREGROUND_DEFAULT_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_BACKGROUND_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_BACKGROUND_DEFAULT_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.INT, - PreferenceConstants.EDITOR_TAB_WIDTH)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD)); - - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_PHP_TAG_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_PHP_TAG_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_PHP_VARIABLE_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_PHP_VARIABLE_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_PHP_CONSTANT_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_PHP_CONSTANT_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_PHP_TYPE_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_PHP_TYPE_BOLD)); - - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_STRING_COLOR_DQ)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_STRING_BOLD_DQ)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_STRING_COLOR_SQ)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_STRING_BOLD_SQ)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_TASK_TAG_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_TASK_TAG_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_FOREGROUND_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_FOREGROUND_DEFAULT_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_BACKGROUND_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_BACKGROUND_DEFAULT_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT,PreferenceConstants.EDITOR_TAB_WIDTH)); + + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_BOLD)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_ITALIC)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_UNDERLINE)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_STRIKETHROUGH)); + + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_ITALIC)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_UNDERLINE)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVA_KEYWORD_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVA_KEYWORD_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVA_KEYWORD_STRIKETHROUGH)); + + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_PHP_TAG_COLOR)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_TAG_BOLD)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_TAG_ITALIC)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_TAG_UNDERLINE)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_TAG_STRIKETHROUGH)); + + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_COLOR)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_BOLD)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_ITALIC)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_UNDERLINE)); + overlayKeys.add (new OverlayPreferenceStore.OverlayKey (OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_PHP_VARIABLE_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_VARIABLE_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_VARIABLE_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_VARIABLE_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_VARIABLE_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_PHP_CONSTANT_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_CONSTANT_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_CONSTANT_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_CONSTANT_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_CONSTANT_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_PHP_TYPE_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_TYPE_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_TYPE_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_TYPE_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_TYPE_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_STRING_COLOR_DQ)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_STRING_BOLD_DQ)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_STRING_ITALIC_DQ)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_STRING_UNDERLINE_DQ)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_STRING_STRIKETHROUGH_DQ)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_STRING_COLOR_SQ)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_STRING_BOLD_SQ)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_STRING_ITALIC_SQ)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_STRING_UNDERLINE_SQ)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_STRING_STRIKETHROUGH_SQ)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVA_DEFAULT_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVA_DEFAULT_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVA_DEFAULT_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_TASK_TAG_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_TASK_TAG_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_TASK_TAG_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_TASK_TAG_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_TASK_TAG_STRIKETHROUGH)); // overlayKeys.add(new // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING_DQ, // PreferenceConstants.EDITOR_JAVA_METHOD_NAME_COLOR)); // overlayKeys.add(new // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, // PreferenceConstants.EDITOR_JAVA_METHOD_NAME_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_PHP_OPERATOR_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_PHP_OPERATOR_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_PHP_KEYWORD_RETURN_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_PHP_KEYWORD_RETURN_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_PHP_BRACE_OPERATOR_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_PHP_BRACE_OPERATOR_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_JAVADOC_KEYWORD_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_JAVADOC_TAG_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_JAVADOC_LINKS_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_JAVADOC_DEFAULT_BOLD)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_MATCHING_BRACKETS)); - 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.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,PreferenceConstants.EDITOR_PHP_OPERATOR_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_OPERATOR_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_OPERATOR_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_OPERATOR_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_OPERATOR_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_PHP_KEYWORD_RETURN_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_KEYWORD_RETURN_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_KEYWORD_RETURN_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_KEYWORD_RETURN_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_KEYWORD_RETURN_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_PHP_BRACE_OPERATOR_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_BRACE_OPERATOR_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_BRACE_OPERATOR_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_BRACE_OPERATOR_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_PHP_BRACE_OPERATOR_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_KEYWORD_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_KEYWORD_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_KEYWORD_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_KEYWORD_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_TAG_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_TAG_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_TAG_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_TAG_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_LINKS_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_LINKS_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_LINKS_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_LINKS_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_DEFAULT_BOLD)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_DEFAULT_ITALIC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_DEFAULT_UNDERLINE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_JAVADOC_DEFAULT_STRIKETHROUGH)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_MATCHING_BRACKETS)); + 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.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.BOOLEAN, // PreferenceConstants.EDITOR_MARK_OCCURRENCES)); // overlayKeys.add(new // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, // PreferenceConstants.EDITOR_STICKY_OCCURRENCES)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_FIND_SCOPE_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_LINK_COLOR)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_CORRECTION_INDICATION)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_EVALUTE_TEMPORARY_PROBLEMS)); - overlayKeys - .add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - AbstractDecoratedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_SPACES_FOR_TABS)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.CODEASSIST_AUTOACTIVATION)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.INT, - PreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.CODEASSIST_AUTOINSERT)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.CODEASSIST_PARAMETERS_BACKGROUND)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA)); - overlayKeys - .add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVADOC)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.CODEASSIST_SHOW_VISIBLE_PROPOSALS)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.CODEASSIST_ORDER_PROPOSALS)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.CODEASSIST_CASE_SENSITIVITY)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.CODEASSIST_ADDIMPORT)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.CODEASSIST_INSERT_COMPLETION)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.CODEASSIST_GUESS_METHOD_ARGUMENTS)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_SMART_PASTE)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_CLOSE_STRINGS_DQ_PHP)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_CLOSE_STRINGS_SQ_PHP)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_CLOSE_BRACKETS_PHP)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_FIND_SCOPE_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_LINK_COLOR)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_CORRECTION_INDICATION)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_EVALUTE_TEMPORARY_PROBLEMS)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,AbstractDecoratedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_SPACES_FOR_TABS)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.CODEASSIST_AUTOACTIVATION)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT,PreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.CODEASSIST_AUTOINSERT)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.CODEASSIST_PARAMETERS_BACKGROUND)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVADOC)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.CODEASSIST_SHOW_VISIBLE_PROPOSALS)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.CODEASSIST_ORDER_PROPOSALS)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.CODEASSIST_CASE_SENSITIVITY)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.CODEASSIST_ADDIMPORT)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.CODEASSIST_INSERT_COMPLETION)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.CODEASSIST_GUESS_METHOD_ARGUMENTS)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_SMART_PASTE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_CLOSE_STRINGS_DQ_PHP)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_CLOSE_STRINGS_SQ_PHP)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_CLOSE_BRACKETS_PHP)); // overlayKeys // .add(new OverlayPreferenceStore.OverlayKey( // OverlayPreferenceStore.BOOLEAN, // PreferenceConstants.EDITOR_CLOSE_BRACES)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_CLOSE_JAVADOCS)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_WRAP_WORDS)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_WRAP_STRINGS_DQ)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_ESCAPE_STRINGS_DQ)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_WRAP_STRINGS_SQ)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_ESCAPE_STRINGS_SQ)); - - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_ADD_JAVADOC_TAGS)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_FORMAT_JAVADOCS)); - - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_SMART_HOME_END)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_SUB_WORD_NAVIGATION)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_CLOSE_JAVADOCS)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_WRAP_WORDS)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_WRAP_STRINGS_DQ)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_ESCAPE_STRINGS_DQ)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_WRAP_STRINGS_SQ)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_ESCAPE_STRINGS_SQ)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_ADD_JAVADOC_TAGS)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_FORMAT_JAVADOCS)); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_SMART_HOME_END)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_SUB_WORD_NAVIGATION)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE)); // overlayKeys.add(new // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, // PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, - PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER)); - overlayKeys - .add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, - PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER_MASK)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER)); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING,PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER_MASK)); + while (e.hasNext()) { AnnotationPreference info = (AnnotationPreference) e.next(); - overlayKeys - .add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, info - .getColorPreferenceKey())); - overlayKeys - .add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, info - .getTextPreferenceKey())); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, info.getColorPreferenceKey())); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, info.getTextPreferenceKey())); + if (info.getHighlightPreferenceKey() != null) - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, info - .getHighlightPreferenceKey())); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, info - .getOverviewRulerPreferenceKey())); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, info.getHighlightPreferenceKey())); + + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, info.getOverviewRulerPreferenceKey())); + if (info.getVerticalRulerPreferenceKey() != null) - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.BOOLEAN, info - .getVerticalRulerPreferenceKey())); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, info.getVerticalRulerPreferenceKey())); + if (info.getTextStylePreferenceKey() != null) - overlayKeys.add(new OverlayPreferenceStore.OverlayKey( - OverlayPreferenceStore.STRING, info - .getTextStylePreferenceKey())); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, info.getTextStylePreferenceKey())); } - OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys - .size()]; + + OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys.size()]; overlayKeys.toArray(keys); + return keys; } /* * @see IWorkbenchPreferencePage#init() @@ -732,12 +590,15 @@ public class JavaEditorPreferencePage extends PreferencePage implements IJavaHelpContextIds.JAVA_EDITOR_PREFERENCE_PAGE); } - private void handleSyntaxColorListSelection() { - int i = fSyntaxColorList.getSelectionIndex(); + private void handleSyntaxColorListSelection () { + int i = fSyntaxColorList.getSelectionIndex (); String key = fSyntaxColorListModel[i][1]; - RGB rgb = PreferenceConverter.getColor(fOverlayStore, key); - fSyntaxForegroundColorEditor.setColorValue(rgb); - fBoldCheckBox.setSelection(fOverlayStore.getBoolean(key + BOLD)); + RGB rgb = PreferenceConverter.getColor (fOverlayStore, key); + fSyntaxForegroundColorEditor.setColorValue (rgb); + fBoldCheckBox.setSelection (fOverlayStore.getBoolean (key + BOLD)); + fItalicCheckBox.setSelection (fOverlayStore.getBoolean (key + ITALIC)); + fUnderlineCheckBox.setSelection (fOverlayStore.getBoolean (key + UNDERLINE)); + fStrikeThroughCheckBox.setSelection (fOverlayStore.getBoolean (key + STRIKETHROUGH)); } private void handleAppearanceColorListSelection() { @@ -800,90 +661,112 @@ public class JavaEditorPreferencePage extends PreferencePage implements // } private Control createSyntaxPage(Composite parent) { Composite colorComposite = new Composite(parent, SWT.NULL); - colorComposite.setLayout(new GridLayout()); - Group backgroundComposite = new Group(colorComposite, - SWT.SHADOW_ETCHED_IN); + colorComposite.setLayout (new GridLayout()); + Group backgroundComposite = new Group (colorComposite, SWT.SHADOW_ETCHED_IN); backgroundComposite.setLayout(new RowLayout()); - backgroundComposite.setText(PreferencesMessages - .getString("JavaEditorPreferencePage.backgroundColor"));//$NON-NLS-1$ + backgroundComposite.setText (PreferencesMessages.getString ("JavaEditorPreferencePage.backgroundColor"));//$NON-NLS-1$ + // SelectionListener backgroundSelectionListener = new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - boolean custom = fBackgroundCustomRadioButton.getSelection(); - fBackgroundColorButton.setEnabled(custom); - fOverlayStore.setValue( - PreferenceConstants.EDITOR_BACKGROUND_DEFAULT_COLOR, - !custom); + public void widgetSelected (SelectionEvent e) { + boolean custom = fBackgroundCustomRadioButton.getSelection (); + fBackgroundColorButton.setEnabled (custom); + fOverlayStore.setValue (PreferenceConstants.EDITOR_BACKGROUND_DEFAULT_COLOR, !custom); } public void widgetDefaultSelected(SelectionEvent e) { } }; - fBackgroundDefaultRadioButton = new Button(backgroundComposite, - SWT.RADIO | SWT.LEFT); - fBackgroundDefaultRadioButton.setText(PreferencesMessages - .getString("JavaEditorPreferencePage.systemDefault")); //$NON-NLS-1$ - fBackgroundDefaultRadioButton - .addSelectionListener(backgroundSelectionListener); - fBackgroundCustomRadioButton = new Button(backgroundComposite, - SWT.RADIO | SWT.LEFT); - fBackgroundCustomRadioButton.setText(PreferencesMessages - .getString("JavaEditorPreferencePage.custom")); //$NON-NLS-1$ - fBackgroundCustomRadioButton - .addSelectionListener(backgroundSelectionListener); + + fBackgroundDefaultRadioButton = new Button(backgroundComposite, SWT.RADIO | SWT.LEFT); + fBackgroundDefaultRadioButton.setText (PreferencesMessages.getString ("JavaEditorPreferencePage.systemDefault")); //$NON-NLS-1$ + fBackgroundDefaultRadioButton.addSelectionListener (backgroundSelectionListener); + fBackgroundCustomRadioButton = new Button(backgroundComposite, SWT.RADIO | SWT.LEFT); + fBackgroundCustomRadioButton.setText (PreferencesMessages.getString ("JavaEditorPreferencePage.custom")); //$NON-NLS-1$ + fBackgroundCustomRadioButton.addSelectionListener (backgroundSelectionListener); fBackgroundColorEditor = new ColorEditor(backgroundComposite); - fBackgroundColorButton = fBackgroundColorEditor.getButton(); + fBackgroundColorButton = fBackgroundColorEditor.getButton (); + Label label = new Label(colorComposite, SWT.LEFT); - label.setText(PreferencesMessages - .getString("JavaEditorPreferencePage.foreground")); //$NON-NLS-1$ - label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - Composite editorComposite = new Composite(colorComposite, SWT.NONE); + label.setText (PreferencesMessages.getString("JavaEditorPreferencePage.foreground")); //$NON-NLS-1$ + label.setLayoutData (new GridData (GridData.FILL_HORIZONTAL)); + Composite editorComposite = new Composite (colorComposite, SWT.NONE); + GridLayout layout = new GridLayout(); layout.numColumns = 2; layout.marginHeight = 0; layout.marginWidth = 0; editorComposite.setLayout(layout); - GridData gd = new GridData(GridData.FILL_BOTH); - editorComposite.setLayoutData(gd); - fSyntaxColorList = new List(editorComposite, SWT.SINGLE | SWT.V_SCROLL - | SWT.BORDER); - gd = new GridData(GridData.FILL_BOTH); - gd.heightHint = convertHeightInCharsToPixels(5); - fSyntaxColorList.setLayoutData(gd); - Composite stylesComposite = new Composite(editorComposite, SWT.NONE); - layout = new GridLayout(); + + GridData gd = new GridData (GridData.FILL_BOTH); + editorComposite.setLayoutData (gd); + fSyntaxColorList = new List (editorComposite, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER); + gd = new GridData (GridData.FILL_BOTH); + gd.heightHint = convertHeightInCharsToPixels (5); + fSyntaxColorList.setLayoutData (gd); + Composite stylesComposite = new Composite (editorComposite, SWT.NONE); + layout = new GridLayout (); layout.marginHeight = 0; layout.marginWidth = 0; layout.numColumns = 2; stylesComposite.setLayout(layout); - stylesComposite.setLayoutData(new GridData(GridData.FILL_BOTH)); + + stylesComposite.setLayoutData (new GridData(GridData.FILL_BOTH)); label = new Label(stylesComposite, SWT.LEFT); - label.setText(PreferencesMessages - .getString("JavaEditorPreferencePage.color")); //$NON-NLS-1$ + label.setText(PreferencesMessages.getString ("JavaEditorPreferencePage.color")); //$NON-NLS-1$ + gd = new GridData(); gd.horizontalAlignment = GridData.BEGINNING; label.setLayoutData(gd); + fSyntaxForegroundColorEditor = new ColorEditor(stylesComposite); Button foregroundColorButton = fSyntaxForegroundColorEditor.getButton(); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalAlignment = GridData.BEGINNING; - foregroundColorButton.setLayoutData(gd); - fBoldCheckBox = new Button(stylesComposite, SWT.CHECK); - fBoldCheckBox.setText(PreferencesMessages - .getString("JavaEditorPreferencePage.bold")); //$NON-NLS-1$ - gd = new GridData(GridData.FILL_HORIZONTAL); + foregroundColorButton.setLayoutData (gd); + + fBoldCheckBox = new Button (stylesComposite, SWT.CHECK); + fBoldCheckBox.setText (PreferencesMessages.getString ("JavaEditorPreferencePage.bold")); //$NON-NLS-1$ + + gd = new GridData (GridData.FILL_HORIZONTAL); + gd.horizontalAlignment = GridData.BEGINNING; + gd.horizontalSpan = 2; + fBoldCheckBox.setLayoutData (gd); + + fItalicCheckBox = new Button (stylesComposite, SWT.CHECK); + fItalicCheckBox.setText (PreferencesMessages.getString ("JavaEditorPreferencePage.italic")); //$NON-NLS-1$ + + gd = new GridData (GridData.FILL_HORIZONTAL); + gd.horizontalAlignment = GridData.BEGINNING; + gd.horizontalSpan = 2; + fItalicCheckBox.setLayoutData (gd); + + fUnderlineCheckBox = new Button (stylesComposite, SWT.CHECK); + fUnderlineCheckBox.setText (PreferencesMessages.getString ("JavaEditorPreferencePage.underline")); //$NON-NLS-1$ + + gd = new GridData (GridData.FILL_HORIZONTAL); + gd.horizontalAlignment = GridData.BEGINNING; + gd.horizontalSpan = 2; + fUnderlineCheckBox.setLayoutData (gd); + + fStrikeThroughCheckBox = new Button (stylesComposite, SWT.CHECK); + fStrikeThroughCheckBox.setText (PreferencesMessages.getString ("JavaEditorPreferencePage.strikethrough")); //$NON-NLS-1$ + + gd = new GridData (GridData.FILL_HORIZONTAL); gd.horizontalAlignment = GridData.BEGINNING; gd.horizontalSpan = 2; - fBoldCheckBox.setLayoutData(gd); - label = new Label(colorComposite, SWT.LEFT); - label.setText(PreferencesMessages - .getString("JavaEditorPreferencePage.preview")); //$NON-NLS-1$ - label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - Control previewer = createPreviewer(colorComposite); - gd = new GridData(GridData.FILL_BOTH); - gd.widthHint = convertWidthInCharsToPixels(20); - gd.heightHint = convertHeightInCharsToPixels(5); - previewer.setLayoutData(gd); - fSyntaxColorList.addSelectionListener(new SelectionListener() { + fStrikeThroughCheckBox.setLayoutData (gd); + + label = new Label (colorComposite, SWT.LEFT); + label.setText (PreferencesMessages.getString ("JavaEditorPreferencePage.preview")); //$NON-NLS-1$ + label.setLayoutData (new GridData (GridData.FILL_HORIZONTAL)); + Control previewer = createPreviewer (colorComposite); + + gd = new GridData (GridData.FILL_BOTH); + gd.widthHint = convertWidthInCharsToPixels (20); + gd.heightHint = convertHeightInCharsToPixels (5); + previewer.setLayoutData (gd); + + fSyntaxColorList.addSelectionListener (new SelectionListener () { public void widgetDefaultSelected(SelectionEvent e) { // do nothing } @@ -892,7 +775,8 @@ public class JavaEditorPreferencePage extends PreferencePage implements handleSyntaxColorListSelection(); } }); - foregroundColorButton.addSelectionListener(new SelectionListener() { + + foregroundColorButton.addSelectionListener (new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) { // do nothing } @@ -900,33 +784,68 @@ public class JavaEditorPreferencePage extends PreferencePage implements public void widgetSelected(SelectionEvent e) { int i = fSyntaxColorList.getSelectionIndex(); String key = fSyntaxColorListModel[i][1]; - PreferenceConverter.setValue(fOverlayStore, key, - fSyntaxForegroundColorEditor.getColorValue()); + PreferenceConverter.setValue(fOverlayStore, key, fSyntaxForegroundColorEditor.getColorValue ()); } }); - fBackgroundColorButton.addSelectionListener(new SelectionListener() { - public void widgetDefaultSelected(SelectionEvent e) { + + fBackgroundColorButton.addSelectionListener (new SelectionListener() { + public void widgetDefaultSelected (SelectionEvent e) { // do nothing } - public void widgetSelected(SelectionEvent e) { - PreferenceConverter.setValue(fOverlayStore, - PreferenceConstants.EDITOR_BACKGROUND_COLOR, - fBackgroundColorEditor.getColorValue()); + public void widgetSelected (SelectionEvent e) { + PreferenceConverter.setValue (fOverlayStore, PreferenceConstants.EDITOR_BACKGROUND_COLOR, fBackgroundColorEditor.getColorValue ()); } }); - fBoldCheckBox.addSelectionListener(new SelectionListener() { - public void widgetDefaultSelected(SelectionEvent e) { + + fBoldCheckBox.addSelectionListener (new SelectionListener () { + public void widgetDefaultSelected (SelectionEvent e) { // do nothing } - public void widgetSelected(SelectionEvent e) { - int i = fSyntaxColorList.getSelectionIndex(); + public void widgetSelected (SelectionEvent e) { + int i = fSyntaxColorList.getSelectionIndex (); + String key = fSyntaxColorListModel[i][1]; + fOverlayStore.setValue (key + BOLD, fBoldCheckBox.getSelection ()); + } + }); + + fItalicCheckBox.addSelectionListener (new SelectionListener () { + public void widgetDefaultSelected (SelectionEvent e) { + // do nothing + } + + public void widgetSelected (SelectionEvent e) { + int i = fSyntaxColorList.getSelectionIndex (); String key = fSyntaxColorListModel[i][1]; - fOverlayStore - .setValue(key + BOLD, fBoldCheckBox.getSelection()); + fOverlayStore.setValue (key + ITALIC, fItalicCheckBox.getSelection ()); } }); + + fUnderlineCheckBox.addSelectionListener (new SelectionListener () { + public void widgetDefaultSelected (SelectionEvent e) { + // do nothing + } + + public void widgetSelected (SelectionEvent e) { + int i = fSyntaxColorList.getSelectionIndex (); + String key = fSyntaxColorListModel[i][1]; + fOverlayStore.setValue (key + UNDERLINE, fUnderlineCheckBox.getSelection ()); + } + }); + + fStrikeThroughCheckBox.addSelectionListener (new SelectionListener () { + public void widgetDefaultSelected (SelectionEvent e) { + // do nothing + } + + public void widgetSelected (SelectionEvent e) { + int i = fSyntaxColorList.getSelectionIndex (); + String key = fSyntaxColorListModel[i][1]; + fOverlayStore.setValue (key + STRIKETHROUGH, fStrikeThroughCheckBox.getSelection ()); + } + }); + return colorComposite; } @@ -934,15 +853,13 @@ public class JavaEditorPreferencePage extends PreferencePage implements Preferences coreStore = createTemporaryCorePreferenceStore(); fJavaTextTools = new JavaTextTools(fOverlayStore, coreStore, false); IPreferenceStore generalTextStore = EditorsUI.getPreferenceStore(); - IPreferenceStore store = new ChainedPreferenceStore( + IPreferenceStore store = new ChainedPreferenceStore ( new IPreferenceStore[] { fOverlayStore, - new PreferencesAdapter( - createTemporaryCorePreferenceStore()), + new PreferencesAdapter (createTemporaryCorePreferenceStore ()), generalTextStore }); - fPreviewViewer = new JavaSourceViewer(parent, null, null, false, - SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER, store); + fPreviewViewer = new JavaSourceViewer(parent, null, null, false, SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER, store); JavaTextTools tools = PHPeclipsePlugin.getDefault().getJavaTextTools(); PHPSourceViewerConfiguration configuration = new PHPSourceViewerConfiguration( tools.getColorManager(), store, null, @@ -952,22 +869,21 @@ public class JavaEditorPreferencePage extends PreferencePage implements // IPHPPartitions.PHP_PARTITIONING); fPreviewViewer.configure(configuration); - Font font = JFaceResources - .getFont(PreferenceConstants.EDITOR_TEXT_FONT); - fPreviewViewer.getTextWidget().setFont(font); - new JavaSourcePreviewerUpdater(fPreviewViewer, configuration, store); - fPreviewViewer.setEditable(false); - String content = loadPreviewContentFromFile("ColorSettingPreviewCode.txt"); //$NON-NLS-1$ - IDocument document = new Document(content); - fJavaTextTools.setupJavaDocumentPartitioner(document, - IPHPPartitions.PHP_PARTITIONING); - fPreviewViewer.setDocument(document); - return fPreviewViewer.getControl(); + Font font = JFaceResources.getFont (PreferenceConstants.EDITOR_TEXT_FONT); + fPreviewViewer.getTextWidget ().setFont (font); + new JavaSourcePreviewerUpdater (fPreviewViewer, configuration, store); + fPreviewViewer.setEditable (false); + String content = loadPreviewContentFromFile ("ColorSettingPreviewCode.txt"); //$NON-NLS-1$ + IDocument document = new Document (content); + fJavaTextTools.setupJavaDocumentPartitioner (document, IPHPPartitions.PHP_PARTITIONING); + fPreviewViewer.setDocument (document); + + return fPreviewViewer.getControl (); } private Preferences createTemporaryCorePreferenceStore() { Preferences result = new Preferences(); - result.setValue(COMPILER_TASK_TAGS, "TASK"); //$NON-NLS-1$ + result.setValue (COMPILER_TASK_TAGS, "TASK"); //$NON-NLS-1$ return result; } @@ -976,7 +892,7 @@ public class JavaEditorPreferencePage extends PreferencePage implements GridLayout layout = new GridLayout(); layout.numColumns = 2; appearanceComposite.setLayout(layout); - + // Inserts a hyper-link to the General Editor preferences page // TODO Can probably be removed post 1.5.0? String label = PreferencesMessages @@ -985,7 +901,7 @@ public class JavaEditorPreferencePage extends PreferencePage implements GridData gridPosition = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); gridPosition.horizontalSpan = 2; link.setLayoutData(gridPosition); - + link.setText(label); link.addListener(SWT.Selection, new Listener () { public void handleEvent(Event event) { @@ -995,8 +911,8 @@ public class JavaEditorPreferencePage extends PreferencePage implements }); String tooltip = PreferencesMessages .getString("JavaEditorPreferencePage.appearanceTabTooltip"); - link.setToolTipText(tooltip); - + link.setToolTipText(tooltip); + label = PreferencesMessages .getString("JavaEditorPreferencePage.displayedTabWidth"); //$NON-NLS-1$ addTextField(appearanceComposite, label, @@ -1659,7 +1575,7 @@ public class JavaEditorPreferencePage extends PreferencePage implements /** * Computes the state mask for the given modifier string. - * + * * @param modifiers * the string with the modifiers, separated by '+', '-', ';', ',' * or '.' @@ -2046,4 +1962,4 @@ public class JavaEditorPreferencePage extends PreferencePage implements setValid(!status.matches(IStatus.ERROR)); StatusUtil.applyToStatusLine(this, status); } -} \ No newline at end of file +} diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/AbstractJavaScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/AbstractJavaScanner.java index 0aa214b..9906d9e 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/AbstractJavaScanner.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/AbstractJavaScanner.java @@ -38,8 +38,10 @@ public abstract class AbstractJavaScanner extends BufferedRuleBasedScanner { private Map fTokenMap = new HashMap(); private String[] fPropertyNamesColor; - - private String[] fPropertyNamesStyle; + private String[] fPropertyNamesBold; + private String[] fPropertyNamesItalic; + private String[] fPropertyNamesUnderline; + private String[] fPropertyNamesStrikeThrough; /** * Returns the list of preference keys which define the tokens used in the @@ -65,35 +67,71 @@ public abstract class AbstractJavaScanner extends BufferedRuleBasedScanner { * Must be called after the constructor has been called. */ public final void initialize() { + fPropertyNamesColor = getTokenProperties (); + int length = fPropertyNamesColor.length; + fPropertyNamesBold = new String[length]; + fPropertyNamesItalic = new String[length]; + fPropertyNamesUnderline = new String[length]; + fPropertyNamesStrikeThrough = new String[length]; - fPropertyNamesColor = getTokenProperties(); - int length = fPropertyNamesColor.length; - fPropertyNamesStyle = new String[length]; for (int i = 0; i < length; i++) { - fPropertyNamesStyle[i] = fPropertyNamesColor[i] + "_bold"; //$NON-NLS-1$ - addToken(fPropertyNamesColor[i], fPropertyNamesStyle[i]); + fPropertyNamesBold[i] = fPropertyNamesColor[i] + "_bold"; //$NON-NLS-1$ + fPropertyNamesItalic[i] = fPropertyNamesColor[i] + "_italic"; //$NON-NLS-1$ + fPropertyNamesUnderline[i] = fPropertyNamesColor[i] + "_underline"; //$NON-NLS-1$ + fPropertyNamesStrikeThrough[i] = fPropertyNamesColor[i] + "_strikethrough"; //$NON-NLS-1$ + + addToken (fPropertyNamesColor[i], + fPropertyNamesBold[i], // bold + fPropertyNamesItalic[i], // italic + fPropertyNamesUnderline[i], // underline + fPropertyNamesStrikeThrough[i]); // strike through } - initializeRules(); + initializeRules (); } - private void addToken(String colorKey, String styleKey) { - RGB rgb = PreferenceConverter.getColor(fPreferenceStore, colorKey); + /** + * + */ + + private void addToken (String colorKey, + String styleKeyBold, String styleKeyItalic, + String styleKeyUnderline, String styleKeyStrikeThrough) { + RGB rgb = PreferenceConverter.getColor (fPreferenceStore, colorKey); + if (fColorManager instanceof IColorManagerExtension) { IColorManagerExtension ext = (IColorManagerExtension) fColorManager; ext.unbindColor(colorKey); ext.bindColor(colorKey, rgb); } - boolean bold = fPreferenceStore.getBoolean(styleKey); - fTokenMap.put(colorKey, new Token(new TextAttribute(fColorManager - .getColor(colorKey), null, bold ? SWT.BOLD : SWT.NORMAL))); + boolean bold = fPreferenceStore.getBoolean (styleKeyBold); + boolean italic = fPreferenceStore.getBoolean (styleKeyItalic); + boolean underline = fPreferenceStore.getBoolean (styleKeyUnderline); + boolean strikethrough = fPreferenceStore.getBoolean (styleKeyStrikeThrough); + + int style = SWT.NORMAL; + + style |= (bold ? SWT.BOLD : SWT.NORMAL) | + (italic ? SWT.ITALIC : SWT.NORMAL) | + (underline ? (1 << 30) : SWT.NORMAL) | + (strikethrough ? (1 << 29) : SWT.NORMAL); + + fTokenMap.put (colorKey, new Token (new TextAttribute (fColorManager.getColor(colorKey), null, style))); } - protected Token getToken(String key) { + /** + * + */ + + protected Token getToken (String key) { return (Token) fTokenMap.get(key); } + /** + * + */ + private void initializeRules() { List rules = createRules(); if (rules != null) { @@ -103,81 +141,252 @@ public abstract class AbstractJavaScanner extends BufferedRuleBasedScanner { } } - private int indexOf(String property) { + /** + * + */ + + private int indexOfNamesColor (String property) { if (property != null) { int length = fPropertyNamesColor.length; + + for (int i = 0; i < length; i++) { + if (property.equals (fPropertyNamesColor[i])) { + return i; + } + } + } + + return -1; + } + + /** + * + */ + + private int indexOfNamesBold (String property) { + if (property != null) { + int length = fPropertyNamesBold.length; + + for (int i = 0; i < length; i++) { + if (property.equals (fPropertyNamesBold[i])) { + return i; + } + } + } + + return -1; + } + + /** + * + */ + + private int indexOfNamesItalic (String property) { + if (property != null) { + int length = fPropertyNamesItalic.length; + + for (int i = 0; i < length; i++) { + if (property.equals (fPropertyNamesItalic[i])) { + return i; + } + } + } + + return -1; + } + + /** + * + */ + + private int indexOfNamesUnderline (String property) { + if (property != null) { + int length = fPropertyNamesUnderline.length; + + for (int i = 0; i < length; i++) { + if (property.equals (fPropertyNamesUnderline[i])) { + return i; + } + } + } + + return -1; + } + + /** + * + */ + + private int indexOfNamesStrikeThrough (String property) { + if (property != null) { + int length = fPropertyNamesStrikeThrough.length; + for (int i = 0; i < length; i++) { - if (property.equals(fPropertyNamesColor[i]) - || property.equals(fPropertyNamesStyle[i])) + if (property.equals (fPropertyNamesStrikeThrough[i])) { return i; + } } } + return -1; } - public boolean affectsBehavior(PropertyChangeEvent event) { - return indexOf(event.getProperty()) >= 0; + + /** + * + */ + + public boolean affectsBehavior (PropertyChangeEvent event) { + return (indexOfNamesColor (event.getProperty ()) >= 0) || + (indexOfNamesBold (event.getProperty ()) >= 0) || + (indexOfNamesItalic (event.getProperty ()) >= 0) || + (indexOfNamesUnderline (event.getProperty ()) >= 0) || + (indexOfNamesStrikeThrough (event.getProperty ()) >= 0); } - public void adaptToPreferenceChange(PropertyChangeEvent event) { - String p = event.getProperty(); - int index = indexOf(p); - Token token = getToken(fPropertyNamesColor[index]); - if (fPropertyNamesColor[index].equals(p)) - adaptToColorChange(token, event); - else - adaptToStyleChange(token, event); + /** + * + */ + + public void adaptToPreferenceChange (PropertyChangeEvent event) { + String p = event.getProperty (); + int index = indexOfNamesColor (p); + + if (index < 0) { + index = indexOfNamesBold (p); + } + + if (index < 0) { + index = indexOfNamesItalic (p); + } + + if (index < 0) { + index = indexOfNamesUnderline (p); + } + + if (index < 0) { + index = indexOfNamesStrikeThrough (p); + } + + Token token = getToken (fPropertyNamesColor[index]); + + if (fPropertyNamesColor[index].equals (p)) { + adaptToColorChange (token, event); + } + else { + adaptToStyleChange (token, event); + } } - private void adaptToColorChange(Token token, PropertyChangeEvent event) { + /** + * + */ + private void adaptToColorChange (Token token, PropertyChangeEvent event) { RGB rgb = null; Object value = event.getNewValue(); - if (value instanceof RGB) + + if (value instanceof RGB) { rgb = (RGB) value; - else if (value instanceof String) + } + else if (value instanceof String) { rgb = StringConverter.asRGB((String) value); + } if (rgb != null) { - - String property = event.getProperty(); + String property = event.getProperty (); if (fColorManager instanceof IColorManagerExtension) { IColorManagerExtension ext = (IColorManagerExtension) fColorManager; - ext.unbindColor(property); - ext.bindColor(property, rgb); + ext.unbindColor (property); + ext.bindColor (property, rgb); } - Object data = token.getData(); + Object data = token.getData (); + if (data instanceof TextAttribute) { TextAttribute oldAttr = (TextAttribute) data; - token.setData(new TextAttribute(fColorManager - .getColor(property), oldAttr.getBackground(), oldAttr - .getStyle())); + token.setData (new TextAttribute (fColorManager.getColor (property), oldAttr.getBackground (), oldAttr.getStyle ())); } } } + /** + * + */ + private void adaptToStyleChange(Token token, PropertyChangeEvent event) { - boolean bold = false; - Object value = event.getNewValue(); - if (value instanceof Boolean) - bold = ((Boolean) value).booleanValue(); + int index = -1; + boolean newValue = false; + Object value = event.getNewValue (); + + if (value instanceof Boolean) { + newValue = ((Boolean) value).booleanValue(); + } else if (value instanceof String) { String s = (String) value; - if (IPreferenceStore.TRUE.equals(s)) - bold = true; - else if (IPreferenceStore.FALSE.equals(s)) - bold = false; + + if (IPreferenceStore.TRUE.equals(s)) { + newValue = true; + } + else if (IPreferenceStore.FALSE.equals(s)) { + newValue = false; + } } - Object data = token.getData(); + Object data = token.getData (); + if (data instanceof TextAttribute) { TextAttribute oldAttr = (TextAttribute) data; - boolean isBold = (oldAttr.getStyle() == SWT.BOLD); - if (isBold != bold) - token.setData(new TextAttribute(oldAttr.getForeground(), - oldAttr.getBackground(), bold ? SWT.BOLD : SWT.NORMAL)); + + int style = oldAttr.getStyle (); + + index = indexOfNamesBold (event.getProperty ()); + + if (index >= 0) { + if (newValue) { + style |= SWT.BOLD; + } + else { + style &= ~SWT.BOLD; + } + } + + index = indexOfNamesItalic (event.getProperty ()); + + if (index >= 0) { + if (newValue) { + style |= SWT.ITALIC; + } + else { + style &= ~SWT.ITALIC; + } + } + + index = indexOfNamesUnderline (event.getProperty ()); + + if (index >= 0) { + if (newValue) { + style |= (1 << 30); + } + else { + style &= ~(1 << 30); + } + } + + index = indexOfNamesStrikeThrough (event.getProperty ()); + + if (index >= 0) { + if (newValue) { + style |= (1 << 29); + } + else { + style &= ~(1 << 29); + } + } + + + token.setData (new TextAttribute (oldAttr.getForeground (), oldAttr.getBackground (), style)); } } -} \ No newline at end of file +} diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java index 60f8e03..5ba18bc 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java @@ -35,7 +35,7 @@ import org.eclipse.ui.texteditor.AbstractTextEditor; * Preference constants used in the JDT-UI preference store. Clients should only * read the JDT-UI preference store using these values. Clients are not allowed * to modify the preference store programmatically. - * + * * @since 2.0 */ public class PreferenceConstants { @@ -80,7 +80,7 @@ public class PreferenceConstants { *

* Value is of type Boolean. *

- * + * * @see #APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW */ public static final String APPEARANCE_COMPRESS_PACKAGE_NAMES = "net.sourceforge.phpdt.ui.compresspackagenames"; //$NON-NLS-1$ @@ -92,7 +92,7 @@ public class PreferenceConstants { * Value is of type Boolean: if true empty * inner packages are folded. *

- * + * * @since 2.1 */ public static final String APPEARANCE_FOLD_PACKAGES_IN_PACKAGE_EXPLORER = "net.sourceforge.phpdt.ui.flatPackagesInPackageExplorer"; //$NON-NLS-1$ @@ -115,7 +115,7 @@ public class PreferenceConstants { *
  • SF : Static Fields
    • * *

    - * + * * @since 2.1 */ public static final String APPEARANCE_MEMBER_SORT_ORDER = "outlinesortoption"; //$NON-NLS-1$ @@ -134,7 +134,7 @@ public class PreferenceConstants { *
  • D : Default
    • * *

    - * + * * @since 3.0 */ public static final String APPEARANCE_VISIBILITY_SORT_ORDER = "net.sourceforge.phpdt.ui.visibility.order"; //$NON-NLS-1$ @@ -145,7 +145,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String APPEARANCE_ENABLE_VISIBILITY_SORT_ORDER = "net.sourceforge.phpdt.ui.enable.visibility.order"; //$NON-NLS-1$ @@ -165,7 +165,7 @@ public class PreferenceConstants { *

    * Value is of type String: comma separated list of prefixed *

    - * + * * @see #CODEGEN_USE_GETTERSETTER_PREFIX */ public static final String CODEGEN_GETTERSETTER_PREFIX = "net.sourceforge.phpdt.ui.gettersetter.prefix.list"; //$NON-NLS-1$ @@ -185,7 +185,7 @@ public class PreferenceConstants { *

    * Value is of type String: comma separated list of suffixes *

    - * + * * @see #CODEGEN_USE_GETTERSETTER_SUFFIX */ public static final String CODEGEN_GETTERSETTER_SUFFIX = "net.sourceforge.phpdt.ui.gettersetter.suffix.list"; //$NON-NLS-1$ @@ -196,7 +196,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String CODEGEN_KEYWORD_THIS = "org.eclipse.jdt.ui.keywordthis"; //$NON-NLS-1$ @@ -208,7 +208,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String CODEGEN_IS_FOR_GETTERS = "org.eclipse.jdt.ui.gettersetter.use.is"; //$NON-NLS-1$ @@ -219,7 +219,7 @@ public class PreferenceConstants { *

    * Value is of type String. *

    - * + * * @since 3.0 */ public static final String CODEGEN_EXCEPTION_VAR_NAME = "org.eclipse.jdt.ui.exception.name"; //$NON-NLS-1$ @@ -230,7 +230,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public static final String CODEGEN_ADD_COMMENTS = "net.sourceforge.phpdt.ui.phpdoc"; //$NON-NLS-1$ @@ -241,7 +241,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @deprecated Use CODEGEN_ADD_COMMENTS instead (Name is more precise). */ // public static final String CODEGEN__JAVADOC_STUBS = CODEGEN_ADD_COMMENTS; @@ -327,7 +327,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public static final String LINK_BROWSING_VIEW_TO_EDITOR = "net.sourceforge.phpdt.ui.browsing.linktoeditor"; //$NON-NLS-1$ @@ -350,7 +350,7 @@ public class PreferenceConstants { *

    * Value is of type String. *

    - * + * * @see #SRCBIN_FOLDERS_IN_NEWPROJ */ public static final String SRCBIN_SRCNAME = "net.sourceforge.phpdt.ui.wizards.srcBinFoldersSrcName"; //$NON-NLS-1$ @@ -362,7 +362,7 @@ public class PreferenceConstants { *

    * Value is of type String. *

    - * + * * @see #SRCBIN_FOLDERS_IN_NEWPROJ */ public static final String SRCBIN_BINNAME = "net.sourceforge.phpdt.ui.wizards.srcBinFoldersBinName"; //$NON-NLS-1$ @@ -382,7 +382,7 @@ public class PreferenceConstants { * to decode the description and the array of classpath entries from an * encoded string. *

    - * + * * @see #NEWPROJECT_JRELIBRARY_INDEX * @see #encodeJRELibrary(String, IClasspathEntry[]) * @see #decodeJRELibraryDescription(String) @@ -396,7 +396,7 @@ public class PreferenceConstants { * Value is of type Int: an index into the list of possible * JRE libraries. *

    - * + * * @see #NEWPROJECT_JRELIBRARY_LIST */ public static final String NEWPROJECT_JRELIBRARY_INDEX = "net.sourceforge.phpdt.ui.wizards.jre.index"; //$NON-NLS-1$ @@ -410,7 +410,7 @@ public class PreferenceConstants { * or * OPEN_TYPE_HIERARCHY_IN_VIEW_PART. *

    - * + * * @see #OPEN_TYPE_HIERARCHY_IN_PERSPECTIVE * @see #OPEN_TYPE_HIERARCHY_IN_VIEW_PART */ @@ -419,7 +419,7 @@ public class PreferenceConstants { /** * A string value used by the named preference * OPEN_TYPE_HIERARCHY. - * + * * @see #OPEN_TYPE_HIERARCHY */ public static final String OPEN_TYPE_HIERARCHY_IN_PERSPECTIVE = "perspective"; //$NON-NLS-1$ @@ -427,7 +427,7 @@ public class PreferenceConstants { /** * A string value used by the named preference * OPEN_TYPE_HIERARCHY. - * + * * @see #OPEN_TYPE_HIERARCHY */ public static final String OPEN_TYPE_HIERARCHY_IN_VIEW_PART = "viewPart"; //$NON-NLS-1$ @@ -441,7 +441,7 @@ public class PreferenceConstants { * or * DOUBLE_CLICK_EXPANDS. *

    - * + * * @see #DOUBLE_CLICK_EXPANDS * @see #DOUBLE_CLICK_GOES_INTO */ @@ -449,14 +449,14 @@ public class PreferenceConstants { /** * A string value used by the named preference DOUBLE_CLICK. - * + * * @see #DOUBLE_CLICK */ public static final String DOUBLE_CLICK_GOES_INTO = "packageview.gointo"; //$NON-NLS-1$ /** * A string value used by the named preference DOUBLE_CLICK. - * + * * @see #DOUBLE_CLICK */ public static final String DOUBLE_CLICK_EXPANDS = "packageview.doubleclick.expands"; //$NON-NLS-1$ @@ -470,7 +470,7 @@ public class PreferenceConstants { * or * UPDATE_WHILE_EDITING. *

    - * + * * @see #UPDATE_ON_SAVE * @see #UPDATE_WHILE_EDITING */ @@ -479,7 +479,7 @@ public class PreferenceConstants { /** * A string value used by the named preference * UPDATE_JAVA_VIEWS - * + * * @see #UPDATE_JAVA_VIEWS */ public static final String UPDATE_ON_SAVE = "JavaUI.update.onSave"; //$NON-NLS-1$ @@ -487,7 +487,7 @@ public class PreferenceConstants { /** * A string value used by the named preference * UPDATE_JAVA_VIEWS - * + * * @see #UPDATE_JAVA_VIEWS */ public static final String UPDATE_WHILE_EDITING = "JavaUI.update.whileEditing"; //$NON-NLS-1$ @@ -504,7 +504,7 @@ public class PreferenceConstants { /** * A named preference that defines whether hint to make hover sticky should * be shown. - * + * * @see JavaUI * @since 3.0 */ @@ -512,7 +512,7 @@ public class PreferenceConstants { /** * A named preference that defines the key for the hover modifiers. - * + * * @see JavaUI * @since 2.1 */ @@ -521,7 +521,7 @@ public class PreferenceConstants { /** * The id of the best match hover contributed for extension point * javaEditorTextHovers. - * + * * @since 2.1 */ public static String ID_BESTMATCH_HOVER = "net.sourceforge.phpdt.ui.BestMatchHover"; //$NON-NLS-1$ @@ -529,7 +529,7 @@ public class PreferenceConstants { /** * The id of the source code hover contributed for extension point * javaEditorTextHovers. - * + * * @since 2.1 */ public static String ID_SOURCE_HOVER = "net.sourceforge.phpdt.ui.JavaSourceHover"; //$NON-NLS-1$ @@ -537,7 +537,7 @@ public class PreferenceConstants { /** * The id of the problem hover contributed for extension point * javaEditorTextHovers. - * + * * @since 2.1 */ public static String ID_PROBLEM_HOVER = "net.sourceforge.phpdt.ui.ProblemHover"; //$NON-NLS-1$ @@ -558,7 +558,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -580,7 +580,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -601,7 +601,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -618,7 +618,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -652,7 +652,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_SYNC_OUTLINE_ON_CURSOR_MOVE = "JavaEditor.SyncOutlineOnCursorMove"; //$NON-NLS-1$ @@ -682,7 +682,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see #EDITOR_PROBLEM_INDICATION * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter @@ -706,7 +706,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see #EDITOR_WARNING_INDICATION * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter @@ -728,7 +728,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see #EDITOR_TASK_INDICATION * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter @@ -741,7 +741,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_BOOKMARK_INDICATION = "bookmarkIndication"; //$NON-NLS-1$ @@ -753,7 +753,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see #EDITOR_BOOKMARK_INDICATION * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter @@ -767,7 +767,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_SEARCH_RESULT_INDICATION = "searchResultIndication"; //$NON-NLS-1$ @@ -778,7 +778,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see #EDITOR_SEARCH_RESULT_INDICATION * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter @@ -792,7 +792,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_UNKNOWN_INDICATION = "othersIndication"; //$NON-NLS-1$ @@ -804,7 +804,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see #EDITOR_UNKNOWN_INDICATION * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter @@ -818,7 +818,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER = "errorIndicationInOverviewRuler"; //$NON-NLS-1$ @@ -829,7 +829,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER = "warningIndicationInOverviewRuler"; //$NON-NLS-1$ @@ -840,7 +840,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER = "taskIndicationInOverviewRuler"; //$NON-NLS-1$ @@ -851,7 +851,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER = "bookmarkIndicationInOverviewRuler"; //$NON-NLS-1$ @@ -862,7 +862,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER = "searchResultIndicationInOverviewRuler"; //$NON-NLS-1$ @@ -873,7 +873,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER = "othersIndicationInOverviewRuler"; //$NON-NLS-1$ @@ -902,7 +902,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_CLOSE_BRACKETS_PHP = "closeBracketsPHP"; //$NON-NLS-1$ @@ -913,7 +913,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_WRAP_WORDS = "wrapWords"; //$NON-NLS-1$ @@ -924,7 +924,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_WRAP_STRINGS_DQ = "wrapStringsDQ"; //$NON-NLS-1$ @@ -935,7 +935,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String EDITOR_ESCAPE_STRINGS_DQ = "escapeStringsDQ"; //$NON-NLS-1$ @@ -946,7 +946,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_WRAP_STRINGS_SQ = "wrapStringsSQ"; //$NON-NLS-1$ @@ -957,7 +957,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String EDITOR_ESCAPE_STRINGS_SQ = "escapeStringsSQ"; //$NON-NLS-1$ @@ -968,7 +968,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String CODEASSIST_PREFIX_COMPLETION = "content_assist_prefix_completion"; //$NON-NLS-1$ @@ -979,7 +979,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_CLOSE_BRACES = "closeBraces"; //$NON-NLS-1$ @@ -990,7 +990,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_CLOSE_JAVADOCS = "closeJavaDocs"; //$NON-NLS-1$ @@ -1001,7 +1001,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_ADD_JAVADOC_TAGS = "addJavaDocTags"; //$NON-NLS-1$ @@ -1012,7 +1012,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_FORMAT_JAVADOCS = "formatJavaDocs"; //$NON-NLS-1$ @@ -1023,7 +1023,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_SMART_PASTE = "smartPaste"; //$NON-NLS-1$ @@ -1034,7 +1034,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_CLOSE_STRINGS_HTML = "closeStringsHTML"; //$NON-NLS-1$ @@ -1045,7 +1045,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_CLOSE_BRACKETS_HTML = "closeBracketsHTML"; //$NON-NLS-1$ @@ -1056,7 +1056,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_SMART_HOME_END = AbstractTextEditor.PREFERENCE_NAVIGATION_SMART_HOME_END; @@ -1067,7 +1067,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_SUB_WORD_NAVIGATION = "subWordNavigation"; //$NON-NLS-1$ @@ -1097,7 +1097,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1109,7 +1109,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1130,7 +1130,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1156,13 +1156,23 @@ public class PreferenceConstants { public static final String EDITOR_ITALIC_SUFFIX = "_italic"; //$NON-NLS-1$ /** + * Preference key suffix for bold text style preference keys. + */ + public static final String EDITOR_UNDERLINE_SUFFIX = "_underline"; //$NON-NLS-1$ + + /** + * Preference key suffix for bold text style preference keys. + */ + public static final String EDITOR_STRIKETHROUGH_SUFFIX = "_strikethrough"; //$NON-NLS-1$ + + /** * A named preference that holds the color used to render multi line * comments. *

    * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1171,7 +1181,7 @@ public class PreferenceConstants { /** * The symbolic font name for the Java editor text font (value * "net.sourceforge.phpdt.ui.editors.textfont"). - * + * * @since 2.1 */ public final static String EDITOR_TEXT_FONT = "net.sourceforge.phpdt.ui.editors.textfont"; //$NON-NLS-1$ @@ -1185,8 +1195,10 @@ public class PreferenceConstants { * rendered using no font style attribute. *

    */ - public final static String EDITOR_MULTI_LINE_COMMENT_BOLD = IPreferenceConstants.PHP_MULTILINE_COMMENT - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_MULTI_LINE_COMMENT_BOLD = IPreferenceConstants.PHP_MULTILINE_COMMENT + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_MULTI_LINE_COMMENT_ITALIC = IPreferenceConstants.PHP_MULTILINE_COMMENT + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_MULTI_LINE_COMMENT_UNDERLINE = IPreferenceConstants.PHP_MULTILINE_COMMENT + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_MULTI_LINE_COMMENT_STRIKETHROUGH = IPreferenceConstants.PHP_MULTILINE_COMMENT + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render single line @@ -1195,14 +1207,14 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ public final static String EDITOR_SINGLE_LINE_COMMENT_COLOR = IPreferenceConstants.PHP_SINGLELINE_COMMENT; /** - * A named preference that controls whether sinle line comments are rendered + * A named preference that controls whether single line comments are rendered * in bold. *

    * Value is of type Boolean. If true single @@ -1210,8 +1222,10 @@ public class PreferenceConstants { * rendered using no font style attribute. *

    */ - public final static String EDITOR_SINGLE_LINE_COMMENT_BOLD = IPreferenceConstants.PHP_SINGLELINE_COMMENT - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_SINGLE_LINE_COMMENT_BOLD = IPreferenceConstants.PHP_SINGLELINE_COMMENT + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_SINGLE_LINE_COMMENT_ITALIC = IPreferenceConstants.PHP_SINGLELINE_COMMENT + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_SINGLE_LINE_COMMENT_UNDERLINE = IPreferenceConstants.PHP_SINGLELINE_COMMENT + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_SINGLE_LINE_COMMENT_STRIKETHROUGH = IPreferenceConstants.PHP_SINGLELINE_COMMENT + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render operators and @@ -1220,7 +1234,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 3.0 @@ -1233,23 +1247,13 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * - * @since 3.0 - */ - public final static String EDITOR_PHP_OPERATOR_BOLD = IPreferenceConstants.PHP_OPERATOR - + EDITOR_BOLD_SUFFIX; - - /** - * A named preference that controls whether operators and brackets are - * rendered in italic. - *

    - * Value is of type Boolean. - *

    - * + * * @since 3.0 */ - public final static String EDITOR_PHP_OPERATOR_ITALIC = IPreferenceConstants.PHP_OPERATOR - + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_OPERATOR_BOLD = IPreferenceConstants.PHP_OPERATOR + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_OPERATOR_ITALIC = IPreferenceConstants.PHP_OPERATOR + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_OPERATOR_UNDERLINE = IPreferenceConstants.PHP_OPERATOR + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_PHP_OPERATOR_STRIKETHROUGH = IPreferenceConstants.PHP_OPERATOR + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render operators and @@ -1258,7 +1262,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 3.0 @@ -1271,23 +1275,13 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * - * @since 3.0 - */ - public final static String EDITOR_PHP_BRACE_OPERATOR_BOLD = IPreferenceConstants.PHP_BRACE_OPERATOR - + EDITOR_BOLD_SUFFIX; - - /** - * A named preference that controls whether operators and brackets are - * rendered in italic. - *

    - * Value is of type Boolean. - *

    - * + * * @since 3.0 */ - public final static String EDITOR_PHP_BRACE_OPERATOR_ITALIC = IPreferenceConstants.PHP_BRACE_OPERATOR - + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_BRACE_OPERATOR_BOLD = IPreferenceConstants.PHP_BRACE_OPERATOR + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_BRACE_OPERATOR_ITALIC = IPreferenceConstants.PHP_BRACE_OPERATOR + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_BRACE_OPERATOR_UNDERLINE = IPreferenceConstants.PHP_BRACE_OPERATOR + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_PHP_BRACE_OPERATOR_STRIKETHROUGH = IPreferenceConstants.PHP_BRACE_OPERATOR + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render the 'return' @@ -1296,7 +1290,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 3.0 @@ -1309,23 +1303,13 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * - * @since 3.0 - */ - public final static String EDITOR_PHP_KEYWORD_RETURN_BOLD = IPreferenceConstants.PHP_KEYWORD_RETURN - + EDITOR_BOLD_SUFFIX; - - /** - * A named preference that controls whether 'return' keyword is rendered in - * italic. - *

    - * Value is of type Boolean. - *

    - * + * * @since 3.0 */ - public final static String EDITOR_PHP_KEYWORD_RETURN_ITALIC = IPreferenceConstants.PHP_KEYWORD_RETURN - + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_KEYWORD_RETURN_BOLD = IPreferenceConstants.PHP_KEYWORD_RETURN + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_KEYWORD_RETURN_ITALIC = IPreferenceConstants.PHP_KEYWORD_RETURN + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_KEYWORD_RETURN_UNDERLINE = IPreferenceConstants.PHP_KEYWORD_RETURN + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_PHP_KEYWORD_RETURN_STRIKETHROUGH = IPreferenceConstants.PHP_KEYWORD_RETURN + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render php start and stop @@ -1334,7 +1318,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1347,8 +1331,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_PHP_TAG_BOLD = IPreferenceConstants.PHP_TAG - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_TAG_BOLD = IPreferenceConstants.PHP_TAG + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_TAG_ITALIC = IPreferenceConstants.PHP_TAG + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_TAG_UNDERLINE = IPreferenceConstants.PHP_TAG + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_PHP_TAG_STRIKETHROUGH = IPreferenceConstants.PHP_TAG + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render php keywords. @@ -1356,7 +1342,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1368,8 +1354,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_JAVA_KEYWORD_BOLD = IPreferenceConstants.PHP_KEYWORD - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_JAVA_KEYWORD_BOLD = IPreferenceConstants.PHP_KEYWORD + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_JAVA_KEYWORD_ITALIC = IPreferenceConstants.PHP_KEYWORD + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_JAVA_KEYWORD_UNDERLINE = IPreferenceConstants.PHP_KEYWORD + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_JAVA_KEYWORD_STRIKETHROUGH = IPreferenceConstants.PHP_KEYWORD + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render predefined php @@ -1378,7 +1366,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1391,8 +1379,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_PHP_FUNCTIONNAME_BOLD = IPreferenceConstants.PHP_FUNCTIONNAME - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_FUNCTIONNAME_BOLD = IPreferenceConstants.PHP_FUNCTIONNAME + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_FUNCTIONNAME_ITALIC = IPreferenceConstants.PHP_FUNCTIONNAME + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_FUNCTIONNAME_UNDERLINE = IPreferenceConstants.PHP_FUNCTIONNAME + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_PHP_FUNCTIONNAME_STRIKETHROUGH = IPreferenceConstants.PHP_FUNCTIONNAME + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render php variables with @@ -1401,7 +1391,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1414,8 +1404,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_PHP_VARIABLE_DOLLAR_BOLD = IPreferenceConstants.PHP_VARIABLE_DOLLAR - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_VARIABLE_DOLLAR_BOLD = IPreferenceConstants.PHP_VARIABLE_DOLLAR + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_VARIABLE_DOLLAR_ITALIC = IPreferenceConstants.PHP_VARIABLE_DOLLAR + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_VARIABLE_DOLLAR_UNDERLINE = IPreferenceConstants.PHP_VARIABLE_DOLLAR + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_PHP_VARIABLE_DOLLAR_STRIKETHROUGH = IPreferenceConstants.PHP_VARIABLE_DOLLAR + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render php variables. @@ -1423,7 +1415,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1435,8 +1427,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_PHP_VARIABLE_BOLD = IPreferenceConstants.PHP_VARIABLE - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_VARIABLE_BOLD = IPreferenceConstants.PHP_VARIABLE + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_VARIABLE_ITALIC = IPreferenceConstants.PHP_VARIABLE + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_VARIABLE_UNDERLINE = IPreferenceConstants.PHP_VARIABLE + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_PHP_VARIABLE_STRIKETHROUGH = IPreferenceConstants.PHP_VARIABLE + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render php constants. @@ -1444,7 +1438,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1456,8 +1450,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_PHP_CONSTANT_BOLD = IPreferenceConstants.PHP_CONSTANT - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_CONSTANT_BOLD = IPreferenceConstants.PHP_CONSTANT + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_CONSTANT_ITALIC = IPreferenceConstants.PHP_CONSTANT + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_CONSTANT_UNDERLINE = IPreferenceConstants.PHP_CONSTANT + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_PHP_CONSTANT_STRIKETHROUGH = IPreferenceConstants.PHP_CONSTANT + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render php types. @@ -1465,7 +1461,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1477,8 +1473,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_PHP_TYPE_BOLD = IPreferenceConstants.PHP_TYPE - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_TYPE_BOLD = IPreferenceConstants.PHP_TYPE + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_PHP_TYPE_ITALIC = IPreferenceConstants.PHP_TYPE + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_PHP_TYPE_UNDERLINE = IPreferenceConstants.PHP_TYPE + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_PHP_TYPE_STRIKETHROUGH = IPreferenceConstants.PHP_TYPE + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render string constants. @@ -1486,7 +1484,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1499,8 +1497,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_STRING_BOLD_DQ = IPreferenceConstants.PHP_STRING_DQ - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_STRING_BOLD_DQ = IPreferenceConstants.PHP_STRING_DQ + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_STRING_ITALIC_DQ = IPreferenceConstants.PHP_STRING_DQ + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_STRING_UNDERLINE_DQ = IPreferenceConstants.PHP_STRING_DQ + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_STRING_STRIKETHROUGH_DQ = IPreferenceConstants.PHP_STRING_DQ + EDITOR_STRIKETHROUGH_SUFFIX; public final static String EDITOR_STRING_COLOR_SQ = IPreferenceConstants.PHP_STRING_SQ; @@ -1511,8 +1511,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_STRING_BOLD_SQ = IPreferenceConstants.PHP_STRING_SQ - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_STRING_BOLD_SQ = IPreferenceConstants.PHP_STRING_SQ + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_STRING_ITALIC_SQ = IPreferenceConstants.PHP_STRING_SQ + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_STRING_UNDERLINE_SQ = IPreferenceConstants.PHP_STRING_SQ + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_STRING_STRIKETHROUGH_SQ = IPreferenceConstants.PHP_STRING_SQ + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render php default text. @@ -1520,7 +1522,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1533,8 +1535,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_JAVA_DEFAULT_BOLD = IPreferenceConstants.PHP_DEFAULT - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_JAVA_DEFAULT_BOLD = IPreferenceConstants.PHP_DEFAULT + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_JAVA_DEFAULT_ITALIC = IPreferenceConstants.PHP_DEFAULT + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_JAVA_DEFAULT_UNDERLINE = IPreferenceConstants.PHP_DEFAULT + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_JAVA_DEFAULT_STRIKETHROUGH = IPreferenceConstants.PHP_DEFAULT + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render task tags. @@ -1542,7 +1546,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 2.1 @@ -1554,11 +1558,13 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ - public final static String EDITOR_TASK_TAG_BOLD = IPreferenceConstants.TASK_TAG - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_TASK_TAG_BOLD = IPreferenceConstants.TASK_TAG + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_TASK_TAG_ITALIC = IPreferenceConstants.TASK_TAG + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_TASK_TAG_UNDERLINE = IPreferenceConstants.TASK_TAG + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_TASK_TAG_STRIKETHROUGH = IPreferenceConstants.TASK_TAG + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render phpdoc keywords. @@ -1566,7 +1572,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1579,8 +1585,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_JAVADOC_KEYWORD_BOLD = IPreferenceConstants.PHPDOC_KEYWORD - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_JAVADOC_KEYWORD_BOLD = IPreferenceConstants.PHPDOC_KEYWORD + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_JAVADOC_KEYWORD_ITALIC = IPreferenceConstants.PHPDOC_KEYWORD + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_JAVADOC_KEYWORD_UNDERLINE = IPreferenceConstants.PHPDOC_KEYWORD + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_JAVADOC_KEYWORD_STRIKETHROUGH = IPreferenceConstants.PHPDOC_KEYWORD + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render phpdoc tags. @@ -1588,7 +1596,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1601,8 +1609,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_JAVADOC_TAG_BOLD = IPreferenceConstants.PHPDOC_TAG - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_JAVADOC_TAG_BOLD = IPreferenceConstants.PHPDOC_TAG + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_JAVADOC_TAG_ITALIC = IPreferenceConstants.PHPDOC_TAG + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_JAVADOC_TAG_UNDERLINE = IPreferenceConstants.PHPDOC_TAG + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_JAVADOC_TAG_STRIKETHROUGH = IPreferenceConstants.PHPDOC_TAG + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render phpdoc links. @@ -1610,7 +1620,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1623,8 +1633,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_JAVADOC_LINKS_BOLD = IPreferenceConstants.PHPDOC_LINK - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_JAVADOC_LINKS_BOLD = IPreferenceConstants.PHPDOC_LINK + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_JAVADOC_LINKS_ITALIC = IPreferenceConstants.PHPDOC_LINK + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_JAVADOC_LINKS_UNDERLINE = IPreferenceConstants.PHPDOC_LINK + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_JAVADOC_LINKS_STRIKETHROUGH = IPreferenceConstants.PHPDOC_LINK + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used to render phpdoc default @@ -1633,7 +1645,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -1646,8 +1658,10 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_JAVADOC_DEFAULT_BOLD = IPreferenceConstants.PHPDOC_DEFAULT - + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_JAVADOC_DEFAULT_BOLD = IPreferenceConstants.PHPDOC_DEFAULT + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_JAVADOC_DEFAULT_ITALIC = IPreferenceConstants.PHPDOC_DEFAULT + EDITOR_ITALIC_SUFFIX; + public final static String EDITOR_JAVADOC_DEFAULT_UNDERLINE = IPreferenceConstants.PHPDOC_DEFAULT + EDITOR_UNDERLINE_SUFFIX; + public final static String EDITOR_JAVADOC_DEFAULT_STRIKETHROUGH = IPreferenceConstants.PHPDOC_DEFAULT + EDITOR_STRIKETHROUGH_SUFFIX; /** * A named preference that holds the color used for 'linked-mode' underline. @@ -1655,7 +1669,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 2.1 @@ -1680,7 +1694,7 @@ public class PreferenceConstants { * or EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a * hover contributed as phpEditorTextHovers. *

    - * + * * @see #EDITOR_NO_HOVER_CONFIGURED_ID * @see #EDITOR_DEFAULT_HOVER_CONFIGURED_ID * @see JavaUI @@ -1697,7 +1711,7 @@ public class PreferenceConstants { * or EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a * hover contributed as phpEditorTextHovers. *

    - * + * * @see #EDITOR_NO_HOVER_CONFIGURED_ID * @see #EDITOR_DEFAULT_HOVER_CONFIGURED_ID * @see JavaUI @@ -1714,7 +1728,7 @@ public class PreferenceConstants { * or EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a * hover contributed as phpEditorTextHovers. *

    - * + * * @see #EDITOR_NO_HOVER_CONFIGURED_ID * @see #EDITOR_DEFAULT_HOVER_CONFIGURED_ID * @see JavaUI ID_*_HOVER @@ -1731,7 +1745,7 @@ public class PreferenceConstants { * or EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a * hover contributed as phpEditorTextHovers. *

    - * + * * @see #EDITOR_NO_HOVER_CONFIGURED_ID * @see #EDITOR_DEFAULT_HOVER_CONFIGURED_ID * @see JavaUI ID_*_HOVER @@ -1748,7 +1762,7 @@ public class PreferenceConstants { * or EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a * hover contributed as phpEditorTextHovers. *

    - * + * * @see #EDITOR_NO_HOVER_CONFIGURED_ID * @see #EDITOR_DEFAULT_HOVER_CONFIGURED_ID * @see JavaUI ID_*_HOVER @@ -1765,7 +1779,7 @@ public class PreferenceConstants { * or EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a * hover contributed as phpEditorTextHovers. *

    - * + * * @see #EDITOR_NO_HOVER_CONFIGURED_ID * @see #EDITOR_DEFAULT_HOVER_CONFIGURED_ID * @see JavaUI ID_*_HOVER @@ -1782,7 +1796,7 @@ public class PreferenceConstants { * EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a * hover contributed as phpEditorTextHovers. *

    - * + * * @see #EDITOR_NO_HOVER_CONFIGURED_ID * @see #EDITOR_DEFAULT_HOVER_CONFIGURED_ID * @see JavaUI ID_*_HOVER @@ -1793,7 +1807,7 @@ public class PreferenceConstants { /** * A string value used by the named preferences for hover configuration to * descibe that no hover should be shown for the given key modifiers. - * + * * @since 2.1 */ public static final String EDITOR_NO_HOVER_CONFIGURED_ID = "noHoverConfiguredId"; //$NON-NLS-1$ @@ -1803,7 +1817,7 @@ public class PreferenceConstants { * descibe that the default hover should be shown for the given key * modifiers. The default hover is described by the * EDITOR_DEFAULT_HOVER property. - * + * * @since 2.1 */ public static final String EDITOR_DEFAULT_HOVER_CONFIGURED_ID = "defaultHoverConfiguredId"; //$NON-NLS-1$ @@ -1834,7 +1848,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public static final String EDITOR_BROWSER_LIKE_LINKS = "browserLikeLinks"; //$NON-NLS-1$ @@ -1844,7 +1858,7 @@ public class PreferenceConstants { *

    * Value is of type String. *

    - * + * * @since 2.1 */ public static final String EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER = "browserLikeLinksKeyModifier"; //$NON-NLS-1$ @@ -1855,7 +1869,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String EDITOR_MARK_OCCURRENCES = "markOccurrences"; //$NON-NLS-1$ @@ -1866,7 +1880,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String EDITOR_STICKY_OCCURRENCES = "stickyOccurrences"; //$NON-NLS-1$ @@ -1876,7 +1890,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String EDITOR_DISABLE_OVERWRITE_MODE = "disable_overwrite_mode"; //$NON-NLS-1$ @@ -1886,7 +1900,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String EDITOR_SAVE_ON_BLUR = "save_on_blur"; //$NON-NLS-1$ @@ -1897,7 +1911,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String EDITOR_SMART_SEMICOLON = "smart_semicolon"; //$NON-NLS-1$ @@ -1906,7 +1920,7 @@ public class PreferenceConstants { * A named preference that controls the smart backspace behavior. *

    * Value is of type Boolean. - * + * * @since 3.0 */ public static final String EDITOR_SMART_BACKSPACE = "smart_backspace"; //$NON-NLS-1$ @@ -1917,7 +1931,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String EDITOR_SMART_OPENING_BRACE = "smart_opening_brace"; //$NON-NLS-1$ @@ -1926,7 +1940,7 @@ public class PreferenceConstants { * A named preference that controls the smart tab behaviour. *

    * Value is of type Boolean. - * + * * @since 3.0 */ public static final String EDITOR_SMART_TAB = "smart_tab"; //$NON-NLS-1$ @@ -1939,7 +1953,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String SPELLING_CHECK_SPELLING = ISpellCheckPreferenceKeys.SPELLING_CHECK_SPELLING; @@ -1950,7 +1964,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String SPELLING_IGNORE_DIGITS = ISpellCheckPreferenceKeys.SPELLING_IGNORE_DIGITS; @@ -1961,7 +1975,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String SPELLING_IGNORE_MIXED = ISpellCheckPreferenceKeys.SPELLING_IGNORE_MIXED; @@ -1972,7 +1986,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String SPELLING_IGNORE_SENTENCE = ISpellCheckPreferenceKeys.SPELLING_IGNORE_SENTENCE; @@ -1983,7 +1997,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String SPELLING_IGNORE_UPPER = ISpellCheckPreferenceKeys.SPELLING_IGNORE_UPPER; @@ -1994,7 +2008,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String SPELLING_IGNORE_URLS = ISpellCheckPreferenceKeys.SPELLING_IGNORE_URLS; @@ -2004,7 +2018,7 @@ public class PreferenceConstants { *

    * Value is of type String. *

    - * + * * @since 3.0 */ public final static String SPELLING_LOCALE = ISpellCheckPreferenceKeys.SPELLING_LOCALE; @@ -2015,7 +2029,7 @@ public class PreferenceConstants { *

    * Value is of type Integer. *

    - * + * * @since 3.0 */ public final static String SPELLING_PROPOSAL_THRESHOLD = ISpellCheckPreferenceKeys.SPELLING_PROPOSAL_THRESHOLD; @@ -2025,7 +2039,7 @@ public class PreferenceConstants { *

    * Value is of type Integer. *

    - * + * * @since 3.0 */ public final static String SPELLING_USER_DICTIONARY = ISpellCheckPreferenceKeys.SPELLING_USER_DICTIONARY; @@ -2036,7 +2050,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String SPELLING_ENABLE_CONTENTASSIST = ISpellCheckPreferenceKeys.SPELLING_ENABLE_CONTENTASSIST; @@ -2047,7 +2061,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String FORMATTER_COMMENT_FORMATSOURCE = "comment_format_source_code"; //$NON-NLS-1$ @@ -2058,7 +2072,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String FORMATTER_COMMENT_INDENTPARAMETERDESCRIPTION = "comment_indent_parameter_description"; //$NON-NLS-1$ @@ -2069,7 +2083,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String FORMATTER_COMMENT_FORMATHEADER = "comment_format_header"; //$NON-NLS-1$ @@ -2079,7 +2093,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String FORMATTER_COMMENT_INDENTROOTTAGS = "comment_indent_root_tags"; //$NON-NLS-1$ @@ -2090,7 +2104,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String FORMATTER_COMMENT_FORMAT = "comment_format_comments"; //$NON-NLS-1$ @@ -2101,7 +2115,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String FORMATTER_COMMENT_NEWLINEFORPARAMETER = "comment_new_line_for_parameter"; //$NON-NLS-1$ @@ -2112,7 +2126,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String FORMATTER_COMMENT_SEPARATEROOTTAGS = "comment_separate_root_tags"; //$NON-NLS-1$ @@ -2123,7 +2137,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String FORMATTER_COMMENT_CLEARBLANKLINES = "comment_clear_blank_lines"; //$NON-NLS-1$ @@ -2134,7 +2148,7 @@ public class PreferenceConstants { * Value is of type Integer. The value must be at least 4 * for reasonable formatting. *

    - * + * * @since 3.0 */ public final static String FORMATTER_COMMENT_LINELENGTH = "comment_line_length"; //$NON-NLS-1$ @@ -2144,7 +2158,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String FORMATTER_COMMENT_FORMATHTML = "comment_format_html"; //$NON-NLS-1$ @@ -2184,7 +2198,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String CODEASSIST_AUTOINSERT = "content_assist_autoinsert"; //$NON-NLS-1$ @@ -2195,7 +2209,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String CODEASSIST_ADDIMPORT = "content_assist_add_import"; //$NON-NLS-1$ @@ -2206,7 +2220,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String CODEASSIST_INSERT_COMPLETION = "content_assist_insert_completion"; //$NON-NLS-1$ @@ -2245,7 +2259,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String CODEASSIST_GUESS_METHOD_ARGUMENTS = "content_assist_guess_method_arguments"; //$NON-NLS-1$ @@ -2287,7 +2301,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -2300,7 +2314,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -2313,7 +2327,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -2326,7 +2340,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ @@ -2339,7 +2353,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 2.1 @@ -2353,7 +2367,7 @@ public class PreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 2.1 @@ -2370,7 +2384,7 @@ public class PreferenceConstants { * REFACTOR_INFO_SEVERITY, * REFACTOR_OK_SEVERITY. *

    - * + * * @see #REFACTOR_FATAL_SEVERITY * @see #REFACTOR_ERROR_SEVERITY * @see #REFACTOR_WARNING_SEVERITY @@ -2382,7 +2396,7 @@ public class PreferenceConstants { /** * A string value used by the named preference * REFACTOR_ERROR_PAGE_SEVERITY_THRESHOLD. - * + * * @see #REFACTOR_ERROR_PAGE_SEVERITY_THRESHOLD */ public static final String REFACTOR_FATAL_SEVERITY = "4"; //$NON-NLS-1$ @@ -2390,7 +2404,7 @@ public class PreferenceConstants { /** * A string value used by the named preference * REFACTOR_ERROR_PAGE_SEVERITY_THRESHOLD. - * + * * @see #REFACTOR_ERROR_PAGE_SEVERITY_THRESHOLD */ public static final String REFACTOR_ERROR_SEVERITY = "3"; //$NON-NLS-1$ @@ -2398,7 +2412,7 @@ public class PreferenceConstants { /** * A string value used by the named preference * REFACTOR_ERROR_PAGE_SEVERITY_THRESHOLD. - * + * * @see #REFACTOR_ERROR_PAGE_SEVERITY_THRESHOLD */ public static final String REFACTOR_WARNING_SEVERITY = "2"; //$NON-NLS-1$ @@ -2406,7 +2420,7 @@ public class PreferenceConstants { /** * A string value used by the named preference * REFACTOR_ERROR_PAGE_SEVERITY_THRESHOLD. - * + * * @see #REFACTOR_ERROR_PAGE_SEVERITY_THRESHOLD */ public static final String REFACTOR_INFO_SEVERITY = "1"; //$NON-NLS-1$ @@ -2414,7 +2428,7 @@ public class PreferenceConstants { /** * A string value used by the named preference * REFACTOR_ERROR_PAGE_SEVERITY_THRESHOLD. - * + * * @see #REFACTOR_ERROR_PAGE_SEVERITY_THRESHOLD */ public static final String REFACTOR_OK_SEVERITY = "0"; //$NON-NLS-1$ @@ -2434,7 +2448,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @see #LINK_PACKAGES_TO_EDITOR */ public static final String BROWSING_LINK_VIEW_TO_EDITOR = "net.sourceforge.phpdt.ui.browsing.linktoeditor"; //$NON-NLS-1$ @@ -2455,7 +2469,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public static final String TEMPLATES_USE_CODEFORMATTER = "net.sourceforge.phpdt.ui.template.format"; //$NON-NLS-1$ @@ -2481,7 +2495,7 @@ public class PreferenceConstants { *

    * Value is of type String. *

    - * + * * @see #EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER * @since 2.1.1 */ @@ -2492,7 +2506,7 @@ public class PreferenceConstants { * masks. The value is only used if the value of * EDITOR_TEXT_HOVER_MODIFIERS cannot be resolved to valid * SWT modifier bits. - * + * * @see JavaUI * @see #EDITOR_TEXT_HOVER_MODIFIERS * @since 2.1.1 @@ -2505,7 +2519,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String EDITOR_FOLDING_ENABLED = "editor_folding_enabled"; //$NON-NLS-1$ @@ -2515,7 +2529,7 @@ public class PreferenceConstants { *

    * Value is of type String. *

    - * + * * @since 3.0 */ public static final String EDITOR_FOLDING_PROVIDER = "editor_folding_provider"; //$NON-NLS-1$ @@ -2526,7 +2540,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String EDITOR_FOLDING_JAVADOC = "editor_folding_default_javadoc"; //$NON-NLS-1$ @@ -2537,7 +2551,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String EDITOR_FOLDING_INNERTYPES = "editor_folding_default_innertypes"; //$NON-NLS-1$ @@ -2548,7 +2562,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String EDITOR_FOLDING_METHODS = "editor_folding_default_methods"; //$NON-NLS-1$ @@ -2559,7 +2573,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ // public static final String EDITOR_FOLDING_IMPORTS = @@ -2570,50 +2584,36 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.1 */ public static final String EDITOR_FOLDING_HEADERS = "editor_folding_default_headers"; //$NON-NLS-1$ public static void initializeDefaultValues(IPreferenceStore store) { - store.setDefault(PreferenceConstants.EDITOR_SHOW_SEGMENTS, false); + store.setDefault (PreferenceConstants.EDITOR_SHOW_SEGMENTS, false); // JavaBasePreferencePage - store.setDefault(PreferenceConstants.LINK_PACKAGES_TO_EDITOR, true); - store.setDefault(PreferenceConstants.LINK_TYPEHIERARCHY_TO_EDITOR, - false); - store - .setDefault(PreferenceConstants.LINK_BROWSING_VIEW_TO_EDITOR, - true); - store.setDefault(PreferenceConstants.OPEN_TYPE_HIERARCHY, - PreferenceConstants.OPEN_TYPE_HIERARCHY_IN_VIEW_PART); - store.setDefault(PreferenceConstants.DOUBLE_CLICK, - PreferenceConstants.DOUBLE_CLICK_EXPANDS); - store.setDefault(PreferenceConstants.UPDATE_JAVA_VIEWS, - PreferenceConstants.UPDATE_WHILE_EDITING); + store.setDefault (PreferenceConstants.LINK_PACKAGES_TO_EDITOR, true); + store.setDefault (PreferenceConstants.LINK_TYPEHIERARCHY_TO_EDITOR,false); + store.setDefault (PreferenceConstants.LINK_BROWSING_VIEW_TO_EDITOR,true); + store.setDefault (PreferenceConstants.OPEN_TYPE_HIERARCHY,PreferenceConstants.OPEN_TYPE_HIERARCHY_IN_VIEW_PART); + store.setDefault (PreferenceConstants.DOUBLE_CLICK,PreferenceConstants.DOUBLE_CLICK_EXPANDS); + store.setDefault (PreferenceConstants.UPDATE_JAVA_VIEWS,PreferenceConstants.UPDATE_WHILE_EDITING); // AppearancePreferencePage - store.setDefault(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES, - false); - store.setDefault(PreferenceConstants.APPEARANCE_METHOD_RETURNTYPE, - false); - store.setDefault(PreferenceConstants.SHOW_CU_CHILDREN, true); - store.setDefault(PreferenceConstants.APPEARANCE_OVERRIDE_INDICATOR, - true); - store.setDefault(PreferenceConstants.BROWSING_STACK_VERTICALLY, false); - store.setDefault( - PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW, - ""); //$NON-NLS-1$ - store - .setDefault( - PreferenceConstants.APPEARANCE_FOLD_PACKAGES_IN_PACKAGE_EXPLORER, - true); + store.setDefault (PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES,false); + store.setDefault (PreferenceConstants.APPEARANCE_METHOD_RETURNTYPE,false); + store.setDefault (PreferenceConstants.SHOW_CU_CHILDREN, true); + store.setDefault (PreferenceConstants.APPEARANCE_OVERRIDE_INDICATOR,true); + store.setDefault (PreferenceConstants.BROWSING_STACK_VERTICALLY, false); + store.setDefault (PreferenceConstants.APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW,""); //$NON-NLS-1$ + store.setDefault (PreferenceConstants.APPEARANCE_FOLD_PACKAGES_IN_PACKAGE_EXPLORER,true); // ImportOrganizePreferencePage // store.setDefault(PreferenceConstants.ORGIMPORTS_IMPORTORDER, // "php;phpx;org;com"); //$NON-NLS-1$ - store.setDefault(PreferenceConstants.ORGIMPORTS_ONDEMANDTHRESHOLD, 99); - store.setDefault(PreferenceConstants.ORGIMPORTS_IGNORELOWERCASE, true); + store.setDefault (PreferenceConstants.ORGIMPORTS_ONDEMANDTHRESHOLD, 99); + store.setDefault (PreferenceConstants.ORGIMPORTS_IGNORELOWERCASE, true); // ClasspathVariablesPreferencePage // CodeFormatterPreferencePage @@ -2621,63 +2621,44 @@ public class PreferenceConstants { // no initialization needed // RefactoringPreferencePage - store.setDefault( - PreferenceConstants.REFACTOR_ERROR_PAGE_SEVERITY_THRESHOLD, - PreferenceConstants.REFACTOR_ERROR_SEVERITY); - store.setDefault(PreferenceConstants.REFACTOR_SAVE_ALL_EDITORS, false); - store.setDefault("RefactoringUI", "dialog"); + store.setDefault (PreferenceConstants.REFACTOR_ERROR_PAGE_SEVERITY_THRESHOLD,PreferenceConstants.REFACTOR_ERROR_SEVERITY); + store.setDefault (PreferenceConstants.REFACTOR_SAVE_ALL_EDITORS, false); + store.setDefault ("RefactoringUI", "dialog"); // TemplatePreferencePage - store.setDefault(PreferenceConstants.TEMPLATES_USE_CODEFORMATTER, true); + store.setDefault (PreferenceConstants.TEMPLATES_USE_CODEFORMATTER, true); // CodeGenerationPreferencePage - store.setDefault(PreferenceConstants.CODEGEN_USE_GETTERSETTER_PREFIX, - false); - store.setDefault(PreferenceConstants.CODEGEN_USE_GETTERSETTER_SUFFIX, - false); - store.setDefault(PreferenceConstants.CODEGEN_GETTERSETTER_PREFIX, - "fg, f, _$, _, m_"); //$NON-NLS-1$ - store.setDefault(PreferenceConstants.CODEGEN_GETTERSETTER_SUFFIX, "_"); //$NON-NLS-1$ - - store.setDefault(PreferenceConstants.CODEGEN_KEYWORD_THIS, false); - store.setDefault(PreferenceConstants.CODEGEN_IS_FOR_GETTERS, true); - store.setDefault(PreferenceConstants.CODEGEN_EXCEPTION_VAR_NAME, "e"); //$NON-NLS-1$ - store.setDefault(PreferenceConstants.CODEGEN_ADD_COMMENTS, true); - store.setDefault(PreferenceConstants.CODEGEN__NON_JAVADOC_COMMENTS, - false); - store.setDefault(PreferenceConstants.CODEGEN__FILE_COMMENTS, false); + store.setDefault (PreferenceConstants.CODEGEN_USE_GETTERSETTER_PREFIX,false); + store.setDefault (PreferenceConstants.CODEGEN_USE_GETTERSETTER_SUFFIX,false); + store.setDefault (PreferenceConstants.CODEGEN_GETTERSETTER_PREFIX,"fg, f, _$, _, m_"); //$NON-NLS-1$ + store.setDefault (PreferenceConstants.CODEGEN_GETTERSETTER_SUFFIX, "_"); //$NON-NLS-1$ + + store.setDefault (PreferenceConstants.CODEGEN_KEYWORD_THIS, false); + store.setDefault (PreferenceConstants.CODEGEN_IS_FOR_GETTERS, true); + store.setDefault (PreferenceConstants.CODEGEN_EXCEPTION_VAR_NAME, "e"); //$NON-NLS-1$ + store.setDefault (PreferenceConstants.CODEGEN_ADD_COMMENTS, true); + store.setDefault (PreferenceConstants.CODEGEN__NON_JAVADOC_COMMENTS,false); + store.setDefault (PreferenceConstants.CODEGEN__FILE_COMMENTS, false); // MembersOrderPreferencePage - store.setDefault(PreferenceConstants.APPEARANCE_MEMBER_SORT_ORDER, - "T,SF,SI,SM,I,F,C,M"); //$NON-NLS-1$ - store.setDefault(PreferenceConstants.APPEARANCE_VISIBILITY_SORT_ORDER, - "B,V,R,D"); //$NON-NLS-1$ - store.setDefault( - PreferenceConstants.APPEARANCE_ENABLE_VISIBILITY_SORT_ORDER, - false); + store.setDefault (PreferenceConstants.APPEARANCE_MEMBER_SORT_ORDER,"T,SF,SI,SM,I,F,C,M"); //$NON-NLS-1$ + store.setDefault (PreferenceConstants.APPEARANCE_VISIBILITY_SORT_ORDER,"B,V,R,D"); //$NON-NLS-1$ + store.setDefault (PreferenceConstants.APPEARANCE_ENABLE_VISIBILITY_SORT_ORDER,false); // must add here to guarantee that it is the first in the listener list - store.addPropertyChangeListener(PHPeclipsePlugin.getDefault() - .getMemberOrderPreferenceCache()); + store.addPropertyChangeListener (PHPeclipsePlugin.getDefault().getMemberOrderPreferenceCache()); - store.setDefault(PreferenceConstants.EDITOR_MATCHING_BRACKETS, true); - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR, new RGB( - 192, 192, 192)); + store.setDefault (PreferenceConstants.EDITOR_MATCHING_BRACKETS, true); + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR, new RGB(192, 192, 192)); - store.setDefault(PreferenceConstants.EDITOR_CURRENT_LINE, true); - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_CURRENT_LINE_COLOR, new RGB(225, - 235, 224)); + store.setDefault (PreferenceConstants.EDITOR_CURRENT_LINE, true); + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_CURRENT_LINE_COLOR, new RGB(225,235, 224)); - store.setDefault(PreferenceConstants.EDITOR_PRINT_MARGIN, false); - store.setDefault(PreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN, 80); - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, new RGB(176, - 180, 185)); + store.setDefault (PreferenceConstants.EDITOR_PRINT_MARGIN, false); + store.setDefault (PreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN, 80); + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, new RGB(176,180, 185)); - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_FIND_SCOPE_COLOR, new RGB(185, 176, - 180)); + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_FIND_SCOPE_COLOR, new RGB(185, 176,180)); // store.setDefault(PreferenceConstants.EDITOR_PROBLEM_INDICATION, // true); @@ -2726,234 +2707,189 @@ public class PreferenceConstants { // store.setDefault(PreferenceConstants.EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER, // false); - store - .setDefault(PreferenceConstants.EDITOR_CORRECTION_INDICATION, - true); - store.setDefault( - PreferenceConstants.EDITOR_SYNC_OUTLINE_ON_CURSOR_MOVE, true); - - store.setDefault(PreferenceConstants.EDITOR_EVALUTE_TEMPORARY_PROBLEMS, - true); - - store.setDefault(PreferenceConstants.EDITOR_OVERVIEW_RULER, true); + store.setDefault (PreferenceConstants.EDITOR_CORRECTION_INDICATION,true); + store.setDefault (PreferenceConstants.EDITOR_SYNC_OUTLINE_ON_CURSOR_MOVE, true); + store.setDefault (PreferenceConstants.EDITOR_EVALUTE_TEMPORARY_PROBLEMS,true); + store.setDefault (PreferenceConstants.EDITOR_OVERVIEW_RULER, true); // WorkbenchChainedTextFontFieldEditor.startPropagate(store, // JFaceResources.TEXT_FONT); - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_LINKED_POSITION_COLOR, new RGB(0, - 200, 100)); - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_LINK_COLOR, new RGB(0, 0, 255)); - - store.setDefault(PreferenceConstants.EDITOR_FOREGROUND_DEFAULT_COLOR, - true); - - store.setDefault(PreferenceConstants.EDITOR_BACKGROUND_DEFAULT_COLOR, - true); - - store.setDefault(PreferenceConstants.EDITOR_TAB_WIDTH, 4); - store.setDefault(PreferenceConstants.EDITOR_SPACES_FOR_TABS, false); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR, new RGB( - 63, 127, 95)); - store.setDefault(PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_BOLD, - false); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR, new RGB( - 63, 127, 95)); - store.setDefault(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD, - false); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_PHP_TAG_COLOR, new RGB(255, 0, 128)); - store.setDefault(PreferenceConstants.EDITOR_PHP_TAG_BOLD, true); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR, new RGB(127, 0, - 85)); - store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD, true); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_COLOR, new RGB(127, - 127, 159)); - store.setDefault(PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_BOLD, - false); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_PHP_VARIABLE_COLOR, new RGB(127, - 159, 191)); - store.setDefault(PreferenceConstants.EDITOR_PHP_VARIABLE_BOLD, false); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_COLOR, new RGB( - 127, 159, 191)); - store.setDefault(PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_BOLD, - false); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_PHP_CONSTANT_COLOR, new RGB(127, 0, - 85)); - store.setDefault(PreferenceConstants.EDITOR_PHP_CONSTANT_BOLD, false); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_PHP_TYPE_COLOR, new RGB(127, 0, 85)); - store.setDefault(PreferenceConstants.EDITOR_PHP_TYPE_BOLD, false); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_STRING_COLOR_DQ, - PHPColorProvider.STRING_DQ); - store.setDefault(PreferenceConstants.EDITOR_STRING_BOLD_DQ, false); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_STRING_COLOR_SQ, - PHPColorProvider.STRING_SQ); - store.setDefault(PreferenceConstants.EDITOR_STRING_BOLD_SQ, true); - - PreferenceConverter - .setDefault(store, - PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR, new RGB( - 0, 0, 0)); - store.setDefault(PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD, false); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR, new RGB(127, - 159, 191)); - store.setDefault(PreferenceConstants.EDITOR_JAVADOC_KEYWORD_BOLD, true); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR, new RGB(127, 127, - 159)); - store.setDefault(PreferenceConstants.EDITOR_JAVADOC_TAG_BOLD, false); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR, new RGB(63, 63, - 191)); - store.setDefault(PreferenceConstants.EDITOR_JAVADOC_LINKS_BOLD, false); - - PreferenceConverter.setDefault(store, - PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR, new RGB(63, - 95, 191)); - store - .setDefault(PreferenceConstants.EDITOR_JAVADOC_DEFAULT_BOLD, - false); - - store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION, true); - store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY, - 500); - - store.setDefault(PreferenceConstants.CODEASSIST_AUTOINSERT, true); - PreferenceConverter.setDefault(store, - PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND, new RGB( - 254, 241, 233)); - PreferenceConverter.setDefault(store, - PreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND, new RGB(0, - 0, 0)); - PreferenceConverter.setDefault(store, - PreferenceConstants.CODEASSIST_PARAMETERS_BACKGROUND, new RGB( - 254, 241, 233)); - PreferenceConverter.setDefault(store, - PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND, new RGB( - 0, 0, 0)); - PreferenceConverter.setDefault(store, - PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND, new RGB( - 255, 255, 0)); - PreferenceConverter.setDefault(store, - PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND, new RGB( - 255, 0, 0)); - store.setDefault( - PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, - "$>"); //$NON-NLS-1$ - store.setDefault( - PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVADOC, - "@"); //$NON-NLS-1$ - store.setDefault( - PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_HTML, - "<&#"); //$NON-NLS-1$ - store.setDefault(PreferenceConstants.CODEASSIST_SHOW_VISIBLE_PROPOSALS, - true); - store - .setDefault(PreferenceConstants.CODEASSIST_CASE_SENSITIVITY, - false); - store.setDefault(PreferenceConstants.CODEASSIST_ORDER_PROPOSALS, false); - store.setDefault(PreferenceConstants.CODEASSIST_ADDIMPORT, true); - store - .setDefault(PreferenceConstants.CODEASSIST_INSERT_COMPLETION, - true); - store.setDefault(PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES, - false); - store.setDefault(PreferenceConstants.CODEASSIST_GUESS_METHOD_ARGUMENTS, - true); - store.setDefault(PreferenceConstants.CODEASSIST_PREFIX_COMPLETION, - false); - - store.setDefault(PreferenceConstants.EDITOR_SMART_HOME_END, true); - store.setDefault(PreferenceConstants.EDITOR_SUB_WORD_NAVIGATION, true); - store.setDefault(PreferenceConstants.EDITOR_SMART_PASTE, true); - store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS_DQ_PHP, true); - store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS_SQ_PHP, true); - store.setDefault(PreferenceConstants.EDITOR_CLOSE_BRACKETS_PHP, true); - store.setDefault(PreferenceConstants.EDITOR_CLOSE_BRACES, true); - store.setDefault(PreferenceConstants.EDITOR_CLOSE_JAVADOCS, true); - store.setDefault(PreferenceConstants.EDITOR_WRAP_WORDS, false); - store.setDefault(PreferenceConstants.EDITOR_WRAP_STRINGS_DQ, true); - store.setDefault(PreferenceConstants.EDITOR_ESCAPE_STRINGS_DQ, false); - store.setDefault(PreferenceConstants.EDITOR_WRAP_STRINGS_SQ, true); - store.setDefault(PreferenceConstants.EDITOR_ESCAPE_STRINGS_SQ, false); - store.setDefault(PreferenceConstants.EDITOR_ADD_JAVADOC_TAGS, true); - store.setDefault(PreferenceConstants.EDITOR_FORMAT_JAVADOCS, false); - store.setDefault(PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE, - false); - - store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS_HTML, true); - store.setDefault(PreferenceConstants.EDITOR_CLOSE_BRACKETS_HTML, true); + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_LINKED_POSITION_COLOR, new RGB(0,200, 100)); + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_LINK_COLOR, new RGB(0, 0, 255)); + + store.setDefault (PreferenceConstants.EDITOR_FOREGROUND_DEFAULT_COLOR,true); + + store.setDefault (PreferenceConstants.EDITOR_BACKGROUND_DEFAULT_COLOR,true); + + store.setDefault (PreferenceConstants.EDITOR_TAB_WIDTH, 4); + store.setDefault (PreferenceConstants.EDITOR_SPACES_FOR_TABS, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR, new RGB(63, 127, 95)); + store.setDefault (PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_BOLD, false); + store.setDefault (PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR, new RGB(63, 127, 95)); + store.setDefault (PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD, false); + store.setDefault (PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_PHP_TAG_COLOR, new RGB(255, 0, 128)); + store.setDefault (PreferenceConstants.EDITOR_PHP_TAG_BOLD, true); + store.setDefault (PreferenceConstants.EDITOR_PHP_TAG_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_TAG_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_TAG_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR, new RGB(127, 0,85)); + store.setDefault (PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD, true); + store.setDefault (PreferenceConstants.EDITOR_JAVA_KEYWORD_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_JAVA_KEYWORD_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_JAVA_KEYWORD_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_COLOR, new RGB(127,127, 159)); + store.setDefault (PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_BOLD, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_FUNCTIONNAME_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_PHP_VARIABLE_COLOR, new RGB(127,159, 191)); + store.setDefault (PreferenceConstants.EDITOR_PHP_VARIABLE_BOLD, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_VARIABLE_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_VARIABLE_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_VARIABLE_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_COLOR, new RGB(127, 159, 191)); + store.setDefault (PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_BOLD, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_VARIABLE_DOLLAR_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_PHP_CONSTANT_COLOR, new RGB(127, 0,85)); + store.setDefault (PreferenceConstants.EDITOR_PHP_CONSTANT_BOLD, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_CONSTANT_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_CONSTANT_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_CONSTANT_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_PHP_TYPE_COLOR, new RGB(127, 0, 85)); + store.setDefault (PreferenceConstants.EDITOR_PHP_TYPE_BOLD, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_TYPE_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_TYPE_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_PHP_TYPE_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_STRING_COLOR_DQ,PHPColorProvider.STRING_DQ); + store.setDefault (PreferenceConstants.EDITOR_STRING_BOLD_DQ, false); + store.setDefault (PreferenceConstants.EDITOR_STRING_ITALIC_DQ, false); + store.setDefault (PreferenceConstants.EDITOR_STRING_UNDERLINE_DQ, false); + store.setDefault (PreferenceConstants.EDITOR_STRING_STRIKETHROUGH_DQ, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_STRING_COLOR_SQ,PHPColorProvider.STRING_SQ); + store.setDefault (PreferenceConstants.EDITOR_STRING_BOLD_SQ, true); + store.setDefault (PreferenceConstants.EDITOR_STRING_ITALIC_SQ, false); + store.setDefault (PreferenceConstants.EDITOR_STRING_UNDERLINE_SQ, false); + store.setDefault (PreferenceConstants.EDITOR_STRING_STRIKETHROUGH_SQ, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR, new RGB(0, 0, 0)); + store.setDefault (PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD, false); + store.setDefault (PreferenceConstants.EDITOR_JAVA_DEFAULT_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_JAVA_DEFAULT_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_JAVA_DEFAULT_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_JAVADOC_KEYWORD_COLOR, new RGB(127,159, 191)); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_KEYWORD_BOLD, true); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_KEYWORD_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_KEYWORD_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_KEYWORD_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_JAVADOC_TAG_COLOR, new RGB(127, 127,159)); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_TAG_BOLD, false); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_TAG_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_TAG_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_TAG_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_JAVADOC_LINKS_COLOR, new RGB(63, 63,191)); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_LINKS_BOLD, false); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_LINKS_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_LINKS_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_LINKS_STRIKETHROUGH, false); + + PreferenceConverter.setDefault (store,PreferenceConstants.EDITOR_JAVADOC_DEFAULT_COLOR, new RGB(63,95, 191)); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_DEFAULT_BOLD, false); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_DEFAULT_ITALIC, false); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_DEFAULT_UNDERLINE, false); + store.setDefault (PreferenceConstants.EDITOR_JAVADOC_DEFAULT_STRIKETHROUGH, false); + + store.setDefault (PreferenceConstants.CODEASSIST_AUTOACTIVATION, true); + store.setDefault (PreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY,500); + + store.setDefault (PreferenceConstants.CODEASSIST_AUTOINSERT, true); + PreferenceConverter.setDefault (store,PreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND, new RGB(254, 241, 233)); + PreferenceConverter.setDefault (store,PreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND, new RGB(0,0, 0)); + PreferenceConverter.setDefault (store,PreferenceConstants.CODEASSIST_PARAMETERS_BACKGROUND, new RGB(254, 241, 233)); + PreferenceConverter.setDefault (store,PreferenceConstants.CODEASSIST_PARAMETERS_FOREGROUND, new RGB(0, 0, 0)); + PreferenceConverter.setDefault (store,PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND, new RGB(255, 255, 0)); + PreferenceConverter.setDefault (store,PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND, new RGB(255, 0, 0)); + store.setDefault (PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA,"$>"); //$NON-NLS-1$ + store.setDefault (PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVADOC,"@"); //$NON-NLS-1$ + store.setDefault (PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_HTML,"<&#"); //$NON-NLS-1$ + store.setDefault (PreferenceConstants.CODEASSIST_SHOW_VISIBLE_PROPOSALS,true); + store.setDefault (PreferenceConstants.CODEASSIST_CASE_SENSITIVITY,false); + store.setDefault (PreferenceConstants.CODEASSIST_ORDER_PROPOSALS, false); + store.setDefault (PreferenceConstants.CODEASSIST_ADDIMPORT, true); + store.setDefault (PreferenceConstants.CODEASSIST_INSERT_COMPLETION,true); + store.setDefault (PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES,false); + store.setDefault (PreferenceConstants.CODEASSIST_GUESS_METHOD_ARGUMENTS,true); + store.setDefault (PreferenceConstants.CODEASSIST_PREFIX_COMPLETION,false); + + store.setDefault (PreferenceConstants.EDITOR_SMART_HOME_END, true); + store.setDefault (PreferenceConstants.EDITOR_SUB_WORD_NAVIGATION, true); + store.setDefault (PreferenceConstants.EDITOR_SMART_PASTE, true); + store.setDefault (PreferenceConstants.EDITOR_CLOSE_STRINGS_DQ_PHP, true); + store.setDefault (PreferenceConstants.EDITOR_CLOSE_STRINGS_SQ_PHP, true); + store.setDefault (PreferenceConstants.EDITOR_CLOSE_BRACKETS_PHP, true); + store.setDefault (PreferenceConstants.EDITOR_CLOSE_BRACES, true); + store.setDefault (PreferenceConstants.EDITOR_CLOSE_JAVADOCS, true); + store.setDefault (PreferenceConstants.EDITOR_WRAP_WORDS, false); + store.setDefault (PreferenceConstants.EDITOR_WRAP_STRINGS_DQ, true); + store.setDefault (PreferenceConstants.EDITOR_ESCAPE_STRINGS_DQ, false); + store.setDefault (PreferenceConstants.EDITOR_WRAP_STRINGS_SQ, true); + store.setDefault (PreferenceConstants.EDITOR_ESCAPE_STRINGS_SQ, false); + store.setDefault (PreferenceConstants.EDITOR_ADD_JAVADOC_TAGS, true); + store.setDefault (PreferenceConstants.EDITOR_FORMAT_JAVADOCS, false); + store.setDefault (PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE,false); + + store.setDefault (PreferenceConstants.EDITOR_CLOSE_STRINGS_HTML, true); + store.setDefault (PreferenceConstants.EDITOR_CLOSE_BRACKETS_HTML, true); // store.setDefault(PreferenceConstants.EDITOR_DEFAULT_HOVER, // JavaPlugin.ID_BESTMATCH_HOVER); - store.setDefault(PreferenceConstants.EDITOR_NONE_HOVER, - PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); + store.setDefault (PreferenceConstants.EDITOR_NONE_HOVER,PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); // store.setDefault(PreferenceConstants.EDITOR_CTRL_HOVER, // JavaPlugin.ID_SOURCE_HOVER); - store.setDefault(PreferenceConstants.EDITOR_SHIFT_HOVER, - PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); - store.setDefault(PreferenceConstants.EDITOR_CTRL_SHIFT_HOVER, - PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); - store.setDefault(PreferenceConstants.EDITOR_CTRL_ALT_HOVER, - PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); - store.setDefault(PreferenceConstants.EDITOR_ALT_SHIFT_HOVER, - PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); - store.setDefault(PreferenceConstants.EDITOR_CTRL_ALT_SHIFT_HOVER, - PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); + store.setDefault (PreferenceConstants.EDITOR_SHIFT_HOVER,PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); + store.setDefault (PreferenceConstants.EDITOR_CTRL_SHIFT_HOVER,PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); + store.setDefault (PreferenceConstants.EDITOR_CTRL_ALT_HOVER,PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); + store.setDefault (PreferenceConstants.EDITOR_ALT_SHIFT_HOVER,PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); + store.setDefault (PreferenceConstants.EDITOR_CTRL_ALT_SHIFT_HOVER,PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); int modifier = SWT.CTRL; if (Platform.getOS().equals(Platform.OS_MACOSX)) modifier = SWT.COMMAND; + String ctrl = Action.findModifierString(modifier); - store - .setDefault( - PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS, - "net.sourceforge.phpdt.ui.BestMatchHover;0;net.sourceforge.phpdt.ui.JavaSourceHover;" + ctrl); //$NON-NLS-1$ - store - .setDefault( - PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS, - "net.sourceforge.phpdt.ui.BestMatchHover;0;net.sourceforge.phpdt.ui.JavaSourceHover;" + modifier); //$NON-NLS-1$ - store.setDefault(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE, - true); - - store.setDefault(PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS, true); - store.setDefault( - PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER, - ctrl); - store - .setDefault( - PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER_MASK, - modifier); + store.setDefault (PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS,"net.sourceforge.phpdt.ui.BestMatchHover;0;net.sourceforge.phpdt.ui.JavaSourceHover;" + ctrl); //$NON-NLS-1$ + store.setDefault (PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS,"net.sourceforge.phpdt.ui.BestMatchHover;0;net.sourceforge.phpdt.ui.JavaSourceHover;" + modifier); //$NON-NLS-1$ + store.setDefault (PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE,true); + + store.setDefault (PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS, true); + store.setDefault (PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER,ctrl); + store.setDefault (PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER_MASK,modifier); // mark occurrences - store.setDefault(PreferenceConstants.EDITOR_MARK_OCCURRENCES, true); - store.setDefault(PreferenceConstants.EDITOR_STICKY_OCCURRENCES, true); + store.setDefault (PreferenceConstants.EDITOR_MARK_OCCURRENCES, true); + store.setDefault (PreferenceConstants.EDITOR_STICKY_OCCURRENCES, true); // store.setDefault(PreferenceConstants.EDITOR_MARK_TYPE_OCCURRENCES, // true); // store.setDefault(PreferenceConstants.EDITOR_MARK_METHOD_OCCURRENCES, @@ -2971,38 +2907,35 @@ public class PreferenceConstants { // store.setDefault(PreferenceConstants.EDITOR_MARK_IMPLEMENTORS, true); // spell checking - store.setDefault(PreferenceConstants.SPELLING_CHECK_SPELLING, false); - store.setDefault(PreferenceConstants.SPELLING_LOCALE, SpellCheckEngine - .getDefaultLocale().toString()); - store.setDefault(PreferenceConstants.SPELLING_IGNORE_DIGITS, true); - store.setDefault(PreferenceConstants.SPELLING_IGNORE_MIXED, true); - store.setDefault(PreferenceConstants.SPELLING_IGNORE_SENTENCE, true); - store.setDefault(PreferenceConstants.SPELLING_IGNORE_UPPER, true); - store.setDefault(PreferenceConstants.SPELLING_IGNORE_URLS, true); - store.setDefault(PreferenceConstants.SPELLING_USER_DICTIONARY, ""); //$NON-NLS-1$ - store.setDefault(PreferenceConstants.SPELLING_PROPOSAL_THRESHOLD, 20); - store.setDefault(PreferenceConstants.SPELLING_ENABLE_CONTENTASSIST, - false); + store.setDefault (PreferenceConstants.SPELLING_CHECK_SPELLING, false); + store.setDefault (PreferenceConstants.SPELLING_LOCALE, SpellCheckEngine.getDefaultLocale().toString()); + store.setDefault (PreferenceConstants.SPELLING_IGNORE_DIGITS, true); + store.setDefault (PreferenceConstants.SPELLING_IGNORE_MIXED, true); + store.setDefault (PreferenceConstants.SPELLING_IGNORE_SENTENCE, true); + store.setDefault (PreferenceConstants.SPELLING_IGNORE_UPPER, true); + store.setDefault (PreferenceConstants.SPELLING_IGNORE_URLS, true); + store.setDefault (PreferenceConstants.SPELLING_USER_DICTIONARY, ""); //$NON-NLS-1$ + store.setDefault (PreferenceConstants.SPELLING_PROPOSAL_THRESHOLD, 20); + store.setDefault (PreferenceConstants.SPELLING_ENABLE_CONTENTASSIST,false); // folding - store.setDefault(PreferenceConstants.EDITOR_FOLDING_ENABLED, true); - store.setDefault(PreferenceConstants.EDITOR_FOLDING_PROVIDER, - "net.sourceforge.phpdt.ui.text.defaultFoldingProvider"); //$NON-NLS-1$ - store.setDefault(PreferenceConstants.EDITOR_FOLDING_JAVADOC, true); - store.setDefault(PreferenceConstants.EDITOR_FOLDING_INNERTYPES, true); - store.setDefault(PreferenceConstants.EDITOR_FOLDING_METHODS, false); + store.setDefault (PreferenceConstants.EDITOR_FOLDING_ENABLED, true); + store.setDefault (PreferenceConstants.EDITOR_FOLDING_PROVIDER,"net.sourceforge.phpdt.ui.text.defaultFoldingProvider"); //$NON-NLS-1$ + store.setDefault (PreferenceConstants.EDITOR_FOLDING_JAVADOC, true); + store.setDefault (PreferenceConstants.EDITOR_FOLDING_INNERTYPES, true); + store.setDefault (PreferenceConstants.EDITOR_FOLDING_METHODS, false); // store.setDefault(PreferenceConstants.EDITOR_FOLDING_IMPORTS, false); - store.setDefault(PreferenceConstants.EDITOR_FOLDING_HEADERS, true); + store.setDefault (PreferenceConstants.EDITOR_FOLDING_HEADERS, true); - store.setDefault(PreferenceConstants.EDITOR_SMART_BACKSPACE, true); - store.setDefault(PreferenceConstants.EDITOR_P_RTRIM_ON_SAVE, false); + store.setDefault (PreferenceConstants.EDITOR_SMART_BACKSPACE, true); + store.setDefault (PreferenceConstants.EDITOR_P_RTRIM_ON_SAVE, false); // do more complicated stuff // NewJavaProjectPreferencePage.initDefaults(store); } /** * Returns the JDT-UI preference store. - * + * * @return the JDT-UI preference store */ public static IPreferenceStore getPreferenceStore() { @@ -3067,4 +3000,4 @@ public class PreferenceConstants { // public static IClasspathEntry[] getDefaultJRELibrary() { // return NewJavaProjectPreferencePage.getDefaultJRELibrary(); // } -} \ No newline at end of file +} diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java index 6b399eb..3592ffa 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java @@ -17,18 +17,32 @@ package net.sourceforge.phpeclipse; public interface IPreferenceConstants { /** * Preference key suffix for bold text style preference keys. - * + * * @since 2.1 */ public static final String EDITOR_BOLD_SUFFIX = "_bold"; //$NON-NLS-1$ /** * Preference key suffix for italic text style preference keys. - * + * * @since 3.0 */ public static final String EDITOR_ITALIC_SUFFIX = "_italic"; //$NON-NLS-1$ + /** + * Preference key suffix for underline text style preference keys. + * + * @since 3.0 + */ + public static final String EDITOR_UNDERLINE_SUFFIX = "_underline"; //$NON-NLS-1$ + + /** + * Preference key suffix for strikethrough text style preference keys. + * + * @since 3.0 + */ + public static final String EDITOR_STRIKETHROUGH_SUFFIX = "_strikethrough"; //$NON-NLS-1$ + // public static final String LOCALHOST_PREF = "_localhost"; // public static final String DOCUMENTROOT_PREF = "_documentroot"; // public static final String XAMPP_START_PREF = "_xampp_start_pref"; @@ -89,7 +103,7 @@ public interface IPreferenceConstants { /** * The color key for operators and brackets in PHP code (value * "__php_operator"). - * + * * @since 3.0 */ public static final String PHP_OPERATOR = "__php_operator"; //$NON-NLS-1$ @@ -97,7 +111,7 @@ public interface IPreferenceConstants { /** * The color key for {} in PHP code (value * "__php_brace_operator"). - * + * * @since 3.0 */ public static final String PHP_BRACE_OPERATOR = "__php_brace_operator"; //$NON-NLS-1$ @@ -109,7 +123,7 @@ public interface IPreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 3.0 @@ -122,7 +136,7 @@ public interface IPreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String EDITOR_PHP_OPERATOR_BOLD = PHP_OPERATOR @@ -134,7 +148,7 @@ public interface IPreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String EDITOR_PHP_OPERATOR_ITALIC = PHP_OPERATOR @@ -147,7 +161,7 @@ public interface IPreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 3.0 @@ -160,7 +174,7 @@ public interface IPreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String EDITOR_PHP_BRACE_OPERATOR_BOLD = PHP_BRACE_OPERATOR @@ -172,7 +186,7 @@ public interface IPreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String EDITOR_PHP_BRACE_OPERATOR_ITALIC = PHP_BRACE_OPERATOR @@ -181,7 +195,7 @@ public interface IPreferenceConstants { /** * The color key for keyword 'return' in PHP code (value * "__php_keyword_return"). - * + * * @since 3.0 */ public static final String PHP_KEYWORD_RETURN = "__php_keyword_return"; //$NON-NLS-1$ @@ -193,7 +207,7 @@ public interface IPreferenceConstants { * Value is of type String. A RGB color value encoded as a * string using class PreferenceConverter *

    - * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 3.0 @@ -206,7 +220,7 @@ public interface IPreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String EDITOR_PHP_KEYWORD_RETURN_BOLD = PHP_KEYWORD_RETURN @@ -218,7 +232,7 @@ public interface IPreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String EDITOR_PHP_KEYWORD_RETURN_ITALIC = PHP_KEYWORD_RETURN @@ -401,4 +415,4 @@ public interface IPreferenceConstants { // "_bring_to_top_preview"; // public static final String PHP_SHOW_HTML_FILES_LOCAL = // "_show_html_files_local"; -} \ No newline at end of file +} diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java index 8f2eed7..70df0eb 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java @@ -43,7 +43,7 @@ public class PHPCodeScanner extends AbstractJavaScanner { /** * Rule to detect java operators. - * + * * @since 3.0 */ protected class OperatorRule implements IRule { @@ -64,7 +64,7 @@ public class PHPCodeScanner extends AbstractJavaScanner { /** * Creates a new operator rule. - * + * * @param token * Token to use for this rule * @param tokenHeredoc @@ -79,7 +79,7 @@ public class PHPCodeScanner extends AbstractJavaScanner { /** * Is this character an operator character? - * + * * @param character * Character to determine whether it is an operator character * @return true iff the character is an operator, @@ -192,7 +192,7 @@ public class PHPCodeScanner extends AbstractJavaScanner { /** * Check if lastCharacter/character are a PHP start or end token ( <? * ... ?> ) - * + * * @param scanner * @param lastCharacter * @param character @@ -265,7 +265,7 @@ public class PHPCodeScanner extends AbstractJavaScanner { /** * Adds a word and the token to be returned if it is detected. - * + * * @param word * the word this rule will search for, may not be * null @@ -380,12 +380,14 @@ public class PHPCodeScanner extends AbstractJavaScanner { private static String[] fgTokenProperties = { IPreferenceConstants.PHP_MULTILINE_COMMENT, IPreferenceConstants.PHP_SINGLELINE_COMMENT, - IPreferenceConstants.PHP_TAG, IPreferenceConstants.PHP_KEYWORD, + IPreferenceConstants.PHP_TAG, + IPreferenceConstants.PHP_KEYWORD, IPreferenceConstants.PHP_FUNCTIONNAME, IPreferenceConstants.PHP_VARIABLE, IPreferenceConstants.PHP_VARIABLE_DOLLAR, IPreferenceConstants.PHP_STRING_DQ, - IPreferenceConstants.PHP_STRING_SQ, IPreferenceConstants.PHP_TYPE, + IPreferenceConstants.PHP_STRING_SQ, + IPreferenceConstants.PHP_TYPE, IPreferenceConstants.PHP_CONSTANT, IPreferenceConstants.PHP_DEFAULT, IPreferenceConstants.PHP_OPERATOR, @@ -476,4 +478,4 @@ public class PHPCodeScanner extends AbstractJavaScanner { setDefaultReturnToken(getToken(IPreferenceConstants.PHP_DEFAULT)); return rules; } -} \ No newline at end of file +} diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/SmartyCodeScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/SmartyCodeScanner.java index ac1aa25..9cf1360 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/SmartyCodeScanner.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/SmartyCodeScanner.java @@ -105,13 +105,16 @@ public class SmartyCodeScanner extends AbstractJavaScanner { private static String[] fgTokenProperties = { IPreferenceConstants.PHP_MULTILINE_COMMENT, IPreferenceConstants.PHP_SINGLELINE_COMMENT, - IPreferenceConstants.PHP_TAG, IPreferenceConstants.PHP_KEYWORD, + IPreferenceConstants.PHP_TAG, + IPreferenceConstants.PHP_KEYWORD, IPreferenceConstants.PHP_FUNCTIONNAME, IPreferenceConstants.PHP_VARIABLE, IPreferenceConstants.PHP_VARIABLE_DOLLAR, IPreferenceConstants.PHP_STRING_DQ, - IPreferenceConstants.PHP_STRING_SQ, IPreferenceConstants.PHP_TYPE, - IPreferenceConstants.PHP_CONSTANT, IPreferenceConstants.PHP_DEFAULT }; + IPreferenceConstants.PHP_STRING_SQ, + IPreferenceConstants.PHP_TYPE, + IPreferenceConstants.PHP_CONSTANT, + IPreferenceConstants.PHP_DEFAULT }; /** * Creates a PHP code scanner -- 1.7.1