X-Git-Url: http://git.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 c2b5815..0ff3193 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,13 @@ 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; @@ -33,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 { @@ -60,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'.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
: if true
empty inner packages are folded.
*
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.
+ *
+ * Value is of type Boolean
.
+ *
* Value is of type Boolean
.
@@ -120,7 +147,7 @@ public class PreferenceConstants {
*
* Value is of type String
: comma separated list of prefixed
*
* Value is of type String
: comma separated list of suffixes
*
+ * Value is of type Boolean
.
+ *
+ * Value is of type Boolean
.
+ *
+ * Value is of type String
.
+ *
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
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.
@@ -232,7 +289,7 @@ public class PreferenceConstants {
*
* Value is of type Boolean
.
*
* Value is of type String
.
*
* Value is of type String
.
*
* Value is of type Int
: an index into the list of possible JRE libraries.
*
* OPEN_TYPE_HIERARCHY_IN_VIEW_PART
.
*
- *
+ *
* @see #OPEN_TYPE_HIERARCHY_IN_PERSPECTIVE
* @see #OPEN_TYPE_HIERARCHY_IN_VIEW_PART
*/
@@ -314,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$
@@ -333,7 +390,7 @@ public class PreferenceConstants {
* DOUBLE_CLICK_GOES_INTO or
* DOUBLE_CLICK_EXPANDS
.
*
- *
+ *
* @see #DOUBLE_CLICK_EXPANDS
* @see #DOUBLE_CLICK_GOES_INTO
*/
@@ -341,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$
@@ -361,7 +418,7 @@ public class PreferenceConstants {
* UPDATE_ON_SAVE or
* UPDATE_WHILE_EDITING
.
*
- *
+ *
* @see #UPDATE_ON_SAVE
* @see #UPDATE_WHILE_EDITING
*/
@@ -369,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$
@@ -391,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
*/
@@ -399,7 +456,7 @@ public class PreferenceConstants {
/**
* A named preference that defines the key for the hover modifiers.
- *
+ *
* @see JavaUI
* @since 2.1
*/
@@ -407,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$
@@ -439,7 +496,7 @@ public class PreferenceConstants {
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type Boolean
.
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type Boolean
.
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type Boolean
.
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type Boolean
.
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
"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$
@@ -1025,7 +1083,7 @@ public class PreferenceConstants {
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
+ * Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
+ *
+ * Value is of type Boolean
.
+ *
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
+ * Value is of type Boolean
.
+ *
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
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type Boolean
.
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
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
@@ -1428,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
@@ -1443,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
@@ -1458,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
@@ -1473,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
@@ -1488,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
@@ -1503,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
@@ -1514,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$
@@ -1522,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$
@@ -1550,7 +1636,7 @@ public class PreferenceConstants {
*
* Value is of type Boolean
.
*
* Value is of type String
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
- *
+ *
* @since 3.0
*/
public static final String EDITOR_SMART_BACKSPACE = "smart_backspace"; //$NON-NLS-1$
@@ -1619,7 +1705,7 @@ public class PreferenceConstants {
*
* Value is of type Boolean
.
*
* 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
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type String
.
*
* Value is of type Integer
.
*
* Value is of type Integer
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Integer
. The value must be at least 4 for reasonable formatting.
*
* Value is of type Boolean
.
*
- * 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.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
* Value is of type String
. A RGB color value encoded as a string using class PreferenceConverter
*
REFACTOR_INFO_SEVERITY
,
* REFACTOR_OK_SEVERITY
.
*
- *
+ *
* @see #REFACTOR_FATAL_SEVERITY
* @see #REFACTOR_ERROR_SEVERITY
* @see #REFACTOR_WARNING_SEVERITY
@@ -2037,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$
@@ -2083,7 +2171,7 @@ public class PreferenceConstants {
*
* Value is of type Boolean
.
*
* Value is of type Boolean
.
*
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$
@@ -2124,7 +2212,7 @@ public class PreferenceConstants {
*
* Value is of type String
.
*
- *
+ *
* @see #EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER
* @since 2.1.1
*/
@@ -2133,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
@@ -2145,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$
@@ -2155,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$
@@ -2165,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$
@@ -2175,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$
@@ -2185,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$
@@ -2195,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);
@@ -2221,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);
@@ -2243,17 +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());
store.setDefault(PreferenceConstants.EDITOR_MATCHING_BRACKETS, true);
- PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR, new RGB(192, 192,192));
+ 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));
@@ -2328,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);
@@ -2362,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);
@@ -2414,6 +2523,18 @@ public class PreferenceConstants {
store.setDefault(PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER, ctrl);
store.setDefault(PreferenceConstants.EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER_MASK, SWT.CTRL);
+// mark occurrences
+ 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, true);
+// store.setDefault(PreferenceConstants.EDITOR_MARK_CONSTANT_OCCURRENCES, true);
+// store.setDefault(PreferenceConstants.EDITOR_MARK_FIELD_OCCURRENCES, true);
+// store.setDefault(PreferenceConstants.EDITOR_MARK_LOCAL_VARIABLE_OCCURRENCES, true);
+// store.setDefault(PreferenceConstants.EDITOR_MARK_EXCEPTION_OCCURRENCES, true);
+// store.setDefault(PreferenceConstants.EDITOR_MARK_METHOD_EXIT_POINTS, true);
+// store.setDefault(PreferenceConstants.EDITOR_MARK_IMPLEMENTORS, true);
+
// spell checking
store.setDefault(PreferenceConstants.SPELLING_CHECK_SPELLING, false);
store.setDefault(PreferenceConstants.SPELLING_LOCALE, SpellCheckEngine.getDefaultLocale().toString());
@@ -2432,17 +2553,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() {
@@ -2461,7 +2583,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.
// *
@@ -2472,7 +2594,7 @@ public class PreferenceConstants {
// public static String decodeJRELibraryDescription(String encodedLibrary) {
// return NewJavaProjectPreferencePage.decodeJRELibraryDescription(encodedLibrary);
// }
- //
+ //
// /**
// * Decodes an encoded JRE library and returns its classpath entries.
// *
@@ -2483,7 +2605,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