X-Git-Url: http://secure.phpeclipse.com 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 95b7d94..9aa8ef0 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2002 International Business Machines Corp. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v05.html - * + * * Contributors: * IBM Corporation - initial API and implementation ******************************************************************************/ @@ -15,14 +15,14 @@ import net.sourceforge.phpdt.internal.ui.text.spelling.SpellCheckEngine; import net.sourceforge.phpdt.internal.ui.text.spelling.engine.ISpellCheckPreferenceKeys; import net.sourceforge.phpeclipse.IPreferenceConstants; import net.sourceforge.phpeclipse.PHPeclipsePlugin; +import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider; import org.eclipse.jface.action.Action; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; -import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; import org.eclipse.ui.texteditor.AbstractTextEditor; // @@ -32,7 +32,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 { @@ -59,7 +59,7 @@ public class PreferenceConstants { /** * A named preference that defines the pattern used for package name compression. *

- * Value is of type String. For example foe the given package name 'org.eclipse.jdt' pattern '.' will compress it + * Value is of type String. For example foe the given package name 'net.sourceforge.phpdt' pattern '.' will compress it * to '..jdt', '1~' to 'o~.e~.jdt'. *

*/ @@ -70,7 +70,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$ @@ -80,7 +80,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$ @@ -101,12 +101,40 @@ public class PreferenceConstants { *
  • SF : Static Fields
    • * *

    - * + * * @since 2.1 */ public static final String APPEARANCE_MEMBER_SORT_ORDER = "outlinesortoption"; //$NON-NLS-1$ /** + * A named preference that defines how member elements are ordered by visibility in the Java views using the + * JavaElementSorter. + *

    + * Value is of type String: A comma separated list of the following entries. Each entry must be in the list, no + * duplication. List order defines the sort order. + *

    + *

    + * + * @since 3.0 + */ + public static final String APPEARANCE_VISIBILITY_SORT_ORDER = "net.sourceforge.phpdt.ui.visibility.order"; //$NON-NLS-1$ + + /** + * A named preferences that controls if Java elements are also sorted by visibility. + *

    + * 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$ + + /** * A named preference that controls if prefix removal during setter/getter generation is turned on or off. *

    * Value is of type Boolean. @@ -119,7 +147,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$ @@ -137,17 +165,47 @@ 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$ + /** + * A named preference that controls whether the keyword "this" will be added + * automatically to field accesses in generated methods. + *

    + * Value is of type Boolean. + *

    + * @since 3.0 + */ + public static final String CODEGEN_KEYWORD_THIS= "org.eclipse.jdt.ui.keywordthis"; //$NON-NLS-1$ + + /** + * A named preference that controls whether to use the prefix "is" or the prefix "get" for + * automatically created getters which return a boolean field. + *

    + * 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$ + + + /** + * A named preference that defines the preferred variable names for exceptions in + * catch clauses. + *

    + * 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$ /** * A named preference that controls if comment stubs will be added automatically to newly created types and methods. *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public static final String CODEGEN_ADD_COMMENTS = "net.sourceforge.phpdt.ui.phpdoc"; //$NON-NLS-1$ @@ -157,7 +215,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; //$NON-NLS-1$ @@ -184,7 +242,7 @@ public class PreferenceConstants { * Value is of type String: semicolon separated list of package names *

    */ - public static final String ORGIMPORTS_IMPORTORDER = "net.sourceforge.phpdt.ui.importorder"; //$NON-NLS-1$ +// public static final String ORGIMPORTS_IMPORTORDER = "net.sourceforge.phpdt.ui.importorder"; //$NON-NLS-1$ /** * A named preference that specifies the number of imports added before a star-import declaration is used. @@ -231,7 +289,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$ @@ -251,7 +309,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$ @@ -262,7 +320,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$ @@ -279,7 +337,7 @@ public class PreferenceConstants { * decodeJRELibraryClasspathEntries(String) 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) @@ -292,7 +350,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$ @@ -305,7 +363,7 @@ public class PreferenceConstants { * OPEN_TYPE_HIERARCHY_IN_PERSPECTIVE or * OPEN_TYPE_HIERARCHY_IN_VIEW_PART. *

    - * + * * @see #OPEN_TYPE_HIERARCHY_IN_PERSPECTIVE * @see #OPEN_TYPE_HIERARCHY_IN_VIEW_PART */ @@ -313,14 +371,14 @@ 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$ /** * 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$ @@ -332,7 +390,7 @@ public class PreferenceConstants { * DOUBLE_CLICK_GOES_INTO or * DOUBLE_CLICK_EXPANDS. *

    - * + * * @see #DOUBLE_CLICK_EXPANDS * @see #DOUBLE_CLICK_GOES_INTO */ @@ -340,14 +398,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$ @@ -360,7 +418,7 @@ public class PreferenceConstants { * UPDATE_ON_SAVE or * UPDATE_WHILE_EDITING. *

    - * + * * @see #UPDATE_ON_SAVE * @see #UPDATE_WHILE_EDITING */ @@ -368,14 +426,14 @@ 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$ /** * 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$ @@ -390,7 +448,7 @@ public class PreferenceConstants { /** * A named preference that defines whether hint to make hover sticky should be shown. - * + * * @see JavaUI * @since 3.0 */ @@ -398,7 +456,7 @@ public class PreferenceConstants { /** * A named preference that defines the key for the hover modifiers. - * + * * @see JavaUI * @since 2.1 */ @@ -406,21 +464,21 @@ 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$ /** * 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$ /** * 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$ @@ -438,7 +496,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 */ @@ -457,7 +515,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 */ @@ -476,7 +534,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 */ @@ -492,7 +550,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 */ @@ -513,7 +571,9 @@ public class PreferenceConstants { * Value is of type Int: positive int value specifying the number of spaces per tab. *

    */ - public final static String EDITOR_TAB_WIDTH = "net.sourceforge.phpdt.ui.editor.tab.width"; //$NON-NLS-1$ + public final static String EDITOR_TAB_WIDTH = AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH; //"net.sourceforge.phpdt.ui.editor.tab.width"; + + // //$NON-NLS-1$ /** * A named preference that controls whether the outline view selection should stay in sync with with the element at the current @@ -521,7 +581,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$ @@ -546,7 +606,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 @@ -565,7 +625,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 @@ -584,7 +644,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 @@ -596,7 +656,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_BOOKMARK_INDICATION = "bookmarkIndication"; //$NON-NLS-1$ @@ -606,7 +666,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 @@ -619,7 +679,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_SEARCH_RESULT_INDICATION = "searchResultIndication"; //$NON-NLS-1$ @@ -629,7 +689,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 @@ -642,7 +702,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_UNKNOWN_INDICATION = "othersIndication"; //$NON-NLS-1$ @@ -652,7 +712,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 @@ -665,7 +725,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$ @@ -675,7 +735,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$ @@ -685,7 +745,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$ @@ -695,7 +755,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$ @@ -705,7 +765,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$ @@ -715,7 +775,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$ @@ -741,7 +801,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String EDITOR_ESCAPE_STRINGS_SQ = "escapeStringsSQ"; //$NON-NLS-1$ @@ -801,7 +861,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$ @@ -811,7 +871,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_CLOSE_BRACKETS_HTML = "closeBracketsHTML"; //$NON-NLS-1$ @@ -881,7 +941,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; @@ -891,7 +951,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String EDITOR_SUB_WORD_NAVIGATION = "subWordNavigation"; //$NON-NLS-1$ @@ -925,7 +985,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 * @see #EDITOR_LINE_NUMBER_RULER @@ -937,7 +997,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 */ @@ -948,7 +1008,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 */ @@ -967,7 +1027,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 */ @@ -996,15 +1056,15 @@ 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_MULTI_LINE_COMMENT_COLOR = IPreferenceConstants.PHP_MULTILINE_COMMENT; /** - * The symbolic font name for the Java editor text font (value "org.eclipse.jdt.ui.editors.textfont"). - * + * 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$ @@ -1023,7 +1083,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 */ @@ -1043,7 +1103,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 @@ -1055,7 +1115,7 @@ 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; @@ -1065,7 +1125,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String EDITOR_PHP_OPERATOR_ITALIC = IPreferenceConstants.PHP_OPERATOR + EDITOR_ITALIC_SUFFIX; @@ -1075,7 +1135,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 @@ -1087,7 +1147,7 @@ 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; @@ -1097,7 +1157,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String EDITOR_PHP_BRACE_OPERATOR_ITALIC = IPreferenceConstants.PHP_BRACE_OPERATOR + EDITOR_ITALIC_SUFFIX; @@ -1107,7 +1167,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 @@ -1119,7 +1179,7 @@ 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; @@ -1129,7 +1189,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String EDITOR_PHP_KEYWORD_RETURN_ITALIC = IPreferenceConstants.PHP_KEYWORD_RETURN + EDITOR_ITALIC_SUFFIX; @@ -1139,7 +1199,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 */ @@ -1158,7 +1218,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 */ @@ -1177,7 +1237,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 */ @@ -1192,11 +1252,30 @@ public class PreferenceConstants { public final static String EDITOR_PHP_FUNCTIONNAME_BOLD = IPreferenceConstants.PHP_FUNCTIONNAME + EDITOR_BOLD_SUFFIX; /** + * A named preference that holds the color used to render php variables with prefix '$_'. + *

    + * 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_PHP_VARIABLE_DOLLAR_COLOR = IPreferenceConstants.PHP_VARIABLE_DOLLAR; + + /** + * A named preference that controls whether variables with prefix '$_' are rendered in bold. + *

    + * Value is of type Boolean. + *

    + */ + public final static String EDITOR_PHP_VARIABLE_DOLLAR_BOLD = IPreferenceConstants.PHP_VARIABLE_DOLLAR + EDITOR_BOLD_SUFFIX; + + /** * A named preference that holds the color used to render php variables. *

    * 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 */ @@ -1209,13 +1288,12 @@ public class PreferenceConstants { *

    */ public final static String EDITOR_PHP_VARIABLE_BOLD = IPreferenceConstants.PHP_VARIABLE + EDITOR_BOLD_SUFFIX; - /** * A named preference that holds the color used to render php constants. *

    * 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 */ @@ -1234,7 +1312,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 */ @@ -1253,11 +1331,21 @@ 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_STRING_COLOR = IPreferenceConstants.PHP_STRING; + public final static String EDITOR_STRING_COLOR_DQ = IPreferenceConstants.PHP_STRING_DQ; + + /** + * A named preference that controls whether string constants are rendered in bold. + *

    + * 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_COLOR_SQ = IPreferenceConstants.PHP_STRING_SQ; /** * A named preference that controls whether string constants are rendered in bold. @@ -1265,14 +1353,14 @@ public class PreferenceConstants { * Value is of type Boolean. *

    */ - public final static String EDITOR_STRING_BOLD = IPreferenceConstants.PHP_STRING + EDITOR_BOLD_SUFFIX; + public final static String EDITOR_STRING_BOLD_SQ = IPreferenceConstants.PHP_STRING_SQ + EDITOR_BOLD_SUFFIX; /** * A named preference that holds the color used to render php default text. *

    * 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 */ @@ -1291,7 +1379,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 @@ -1303,7 +1391,7 @@ 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; @@ -1313,7 +1401,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 */ @@ -1332,7 +1420,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 */ @@ -1351,7 +1439,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 */ @@ -1370,7 +1458,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 */ @@ -1389,7 +1477,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 @@ -1411,7 +1499,7 @@ public class PreferenceConstants { * EDITOR_NO_HOVER_CONFIGURED_ID 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 @@ -1426,7 +1514,7 @@ public class PreferenceConstants { * EDITOR_NO_HOVER_CONFIGURED_ID 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 @@ -1441,7 +1529,7 @@ public class PreferenceConstants { * EDITOR_NO_HOVER_CONFIGURED_ID 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 @@ -1456,7 +1544,7 @@ public class PreferenceConstants { * EDITOR_NO_HOVER_CONFIGURED_ID 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 @@ -1471,7 +1559,7 @@ public class PreferenceConstants { * EDITOR_NO_HOVER_CONFIGURED_ID 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 @@ -1486,7 +1574,7 @@ public class PreferenceConstants { * EDITOR_NO_HOVER_CONFIGURED_ID 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 @@ -1501,7 +1589,7 @@ public class PreferenceConstants { * EDITOR_NO_HOVER_CONFIGURED_ID, * 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 @@ -1512,7 +1600,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$ @@ -1520,7 +1608,7 @@ public class PreferenceConstants { /** * A string value used by the named preferences for hover configuration to 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$ @@ -1548,7 +1636,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public static final String EDITOR_BROWSER_LIKE_LINKS = "browserLikeLinks"; //$NON-NLS-1$ @@ -1558,7 +1646,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$ @@ -1568,7 +1656,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String EDITOR_STICKY_OCCURRENCES = "stickyOccurrences"; //$NON-NLS-1$ @@ -1588,7 +1676,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$ @@ -1598,7 +1686,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public static final String EDITOR_SMART_SEMICOLON = "smart_semicolon"; //$NON-NLS-1$ @@ -1607,7 +1695,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$ @@ -1617,7 +1705,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$ @@ -1626,17 +1714,19 @@ 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$ + public static final String EDITOR_P_RTRIM_ON_SAVE = "editor_p_trim_on_save"; //$NON-NLS-1$ + /** * A named preference that controls whether Java comments should be spell-checked. *

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type Boolean. *

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

    * Value is of type String. *

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

    * Value is of type Integer. *

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

    * Value is of type Integer. *

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

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ public final static String SPELLING_ENABLE_CONTENTASSIST = ISpellCheckPreferenceKeys.SPELLING_ENABLE_CONTENTASSIST; @@ -1736,7 +1826,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$ @@ -1746,7 +1836,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$ @@ -1756,7 +1846,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$ @@ -1766,7 +1856,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$ @@ -1776,7 +1866,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$ @@ -1786,7 +1876,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$ @@ -1796,7 +1886,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$ @@ -1806,7 +1896,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$ @@ -1816,7 +1906,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$ @@ -1826,7 +1916,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$ @@ -1850,7 +1940,7 @@ public class PreferenceConstants { /** * A named preference that controls if code assist contains only visible proposals. *

    - * Value is of type Boolean. if true code assist only contains visible members. If + * Value is of type Boolean. if true code assist only contains visible members. If * false all members are included. *

    */ @@ -1861,7 +1951,7 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 2.1 */ public final static String CODEASSIST_AUTOINSERT = "content_assist_autoinsert"; //$NON-NLS-1$ @@ -1871,7 +1961,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$ @@ -1882,10 +1972,10 @@ 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$ + public final static String CODEASSIST_INSERT_COMPLETION = "content_assist_insert_completion"; //$NON-NLS-1$ /** * A named preference that controls whether code assist proposals filtering is case sensitive or not. @@ -1919,7 +2009,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$ @@ -1953,7 +2043,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 */ @@ -1964,7 +2054,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 */ @@ -1975,7 +2065,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 */ @@ -1986,7 +2076,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 */ @@ -1997,7 +2087,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 @@ -2009,7 +2099,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 @@ -2024,7 +2114,7 @@ public class PreferenceConstants { * REFACTOR_INFO_SEVERITY, * REFACTOR_OK_SEVERITY. *

    - * + * * @see #REFACTOR_FATAL_SEVERITY * @see #REFACTOR_ERROR_SEVERITY * @see #REFACTOR_WARNING_SEVERITY @@ -2035,35 +2125,35 @@ 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$ /** * 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$ /** * 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$ /** * 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$ /** * 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$ @@ -2081,7 +2171,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$ @@ -2100,18 +2190,29 @@ 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$ /** + * A named preference that controls whether annotation roll over is used or not. + *

    + * Value is of type Boolean. If true the annotation ruler column + * uses a roll over to display multiple annotations + *

    + * + * @since 3.0 + */ + public static final String EDITOR_ANNOTATION_ROLL_OVER = "editor_annotation_roll_over"; //$NON-NLS-1$ + + /** * A named preference that controls the key modifier mask for browser like links. The value is only used if the value of * EDITOR_BROWSER_LIKE_LINKS cannot be resolved to valid SWT modifier bits. *

    * Value is of type String. *

    - * + * * @see #EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER * @since 2.1.1 */ @@ -2120,7 +2221,7 @@ public class PreferenceConstants { /** * A named preference that defines the key for the hover modifier state 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 @@ -2132,7 +2233,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$ @@ -2142,7 +2243,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$ @@ -2152,7 +2253,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$ @@ -2162,7 +2263,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$ @@ -2172,7 +2273,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$ @@ -2182,10 +2283,19 @@ public class PreferenceConstants { *

    * Value is of type Boolean. *

    - * + * * @since 3.0 */ - public static final String EDITOR_FOLDING_IMPORTS = "editor_folding_default_imports"; //$NON-NLS-1$ +// public static final String EDITOR_FOLDING_IMPORTS = "editor_folding_default_imports"; //$NON-NLS-1$ + /** + * A named preference that stores the value for header comment folding for the default folding provider. + *

    + * 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); @@ -2208,7 +2318,7 @@ public class PreferenceConstants { 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_IMPORTORDER, "php;phpx;org;com"); //$NON-NLS-1$ store.setDefault(PreferenceConstants.ORGIMPORTS_ONDEMANDTHRESHOLD, 99); store.setDefault(PreferenceConstants.ORGIMPORTS_IGNORELOWERCASE, true); @@ -2230,34 +2340,23 @@ public class PreferenceConstants { 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,SI,SF,SM,I,F,C,M"); //$NON-NLS-1$ + 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()); - // PHPEditorPreferencePage - /* - * Ensure that the display is accessed only in the UI thread. Ensure that there are no side effects of switching the thread. - */ - final RGB[] rgbs = new RGB[3]; - final Display display = Display.getDefault(); - display.syncExec(new Runnable() { - public void run() { - Color c = display.getSystemColor(SWT.COLOR_GRAY); - rgbs[0] = c.getRGB(); - c = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND); - rgbs[1] = c.getRGB(); - c = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND); - rgbs[2] = c.getRGB(); - } - }); - store.setDefault(PreferenceConstants.EDITOR_MATCHING_BRACKETS, true); - PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR, rgbs[0]); + 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)); @@ -2307,10 +2406,8 @@ public class PreferenceConstants { 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)); - PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_FOREGROUND_COLOR, rgbs[1]); store.setDefault(PreferenceConstants.EDITOR_FOREGROUND_DEFAULT_COLOR, true); - PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_BACKGROUND_COLOR, rgbs[2]); store.setDefault(PreferenceConstants.EDITOR_BACKGROUND_DEFAULT_COLOR, true); store.setDefault(PreferenceConstants.EDITOR_TAB_WIDTH, 4); @@ -2334,14 +2431,20 @@ public class PreferenceConstants { 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, new RGB(42, 0, 255)); - store.setDefault(PreferenceConstants.EDITOR_STRING_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); @@ -2368,7 +2471,7 @@ public class PreferenceConstants { 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_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); @@ -2394,7 +2497,7 @@ public class PreferenceConstants { 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, true); + store.setDefault(PreferenceConstants.EDITOR_FORMAT_JAVADOCS, false); store.setDefault(PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE, false); store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS_HTML, true); @@ -2438,17 +2541,18 @@ public class PreferenceConstants { 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_IMPORTS, false); + store.setDefault(PreferenceConstants.EDITOR_FOLDING_HEADERS, true); 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() { @@ -2467,7 +2571,7 @@ public class PreferenceConstants { // public static String encodeJRELibrary(String description, IClasspathEntry[] entries) { // return NewJavaProjectPreferencePage.encodeJRELibrary(description, entries); // } - // + // // /** // * Decodes an encoded JRE library and returns its description string. // * @@ -2478,7 +2582,7 @@ public class PreferenceConstants { // public static String decodeJRELibraryDescription(String encodedLibrary) { // return NewJavaProjectPreferencePage.decodeJRELibraryDescription(encodedLibrary); // } - // + // // /** // * Decodes an encoded JRE library and returns its classpath entries. // * @@ -2489,7 +2593,7 @@ public class PreferenceConstants { // public static IClasspathEntry[] decodeJRELibraryClasspathEntries(String encodedLibrary) { // return NewJavaProjectPreferencePage.decodeJRELibraryClasspathEntries(encodedLibrary); // } - // + // // /** // * Returns the current configuration for the JRE to be used as default in new Java projects. // * This is a convenience method to access the named preference NEWPROJECT_JRELIBRARY_LIST