From a012cbd2da4bb4accf69d692b1edf47d177027d6 Mon Sep 17 00:00:00 2001 From: jsurfer Date: Tue, 28 Sep 2004 19:25:47 +0000 Subject: [PATCH] Added word wrap option (problem: conflicts with folding) --- .../ui/preferences/JavaEditorPreferencePage.java | 4 + .../ui/preferences/PreferencesMessages.properties | 1 + .../sourceforge/phpdt/ui/PreferenceConstants.java | 1837 ++++++++++---------- .../phpeclipse/phpeditor/PHPEditor.java | 111 +- 4 files changed, 952 insertions(+), 1001 deletions(-) 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 558b087..2dfafd5 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 @@ -463,6 +463,7 @@ public class JavaEditorPreferencePage extends PreferencePage implements IWorkben // 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)); @@ -1065,6 +1066,9 @@ public class JavaEditorPreferencePage extends PreferencePage implements IWorkben group.setLayout(layout); group.setText(PreferencesMessages.getString("JavaEditorPreferencePage.typing.description")); //$NON-NLS-1$ + label = PreferencesMessages.getString("JavaEditorPreferencePage.wrapWords");//$NON-NLS-1$ + addCheckBox(group, label, PreferenceConstants.EDITOR_WRAP_WORDS, 1); + label = PreferencesMessages.getString("JavaEditorPreferencePage.wrapStringsDQ");//$NON-NLS-1$ Button button = addCheckBox(group, label, PreferenceConstants.EDITOR_WRAP_STRINGS_DQ, 1); diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages.properties b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages.properties index 14dbec3..91fe4b9 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages.properties +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages.properties @@ -179,6 +179,7 @@ JavaEditorPreferencePage.closeStringsSQ= Close &single quoted strings JavaEditorPreferencePage.closeBrackets= Close &brackets and parenthesis JavaEditorPreferencePage.closeBraces= Cl&ose braces JavaEditorPreferencePage.closeJavaDocs= Close PHP&docs and comments +JavaEditorPreferencePage.wrapWords= Wrap words JavaEditorPreferencePage.wrapStringsDQ= Wra&p double quoted PHP strings JavaEditorPreferencePage.escapeStringsDQ= &Escape text when pasting into a double quoted PHP string JavaEditorPreferencePage.wrapStringsSQ= Wra&p single quoted PHP strings 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 a013788..95b7d94 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java @@ -24,17 +24,17 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.texteditor.AbstractTextEditor; + // //import org.phpeclipse.phpdt.internal.ui.JavaPlugin; //import org.phpeclipse.phpdt.internal.ui.preferences.NewJavaProjectPreferencePage; /** - * 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. + * 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 { private PreferenceConstants() { @@ -43,8 +43,7 @@ public class PreferenceConstants { /** * A named preference that controls return type rendering of methods in the UI. *

- * Value is of type Boolean: if true return types - * are rendered + * Value is of type Boolean: if true return types are rendered *

*/ public static final String APPEARANCE_METHOD_RETURNTYPE = "net.sourceforge.phpdt.ui.methodreturntype"; //$NON-NLS-1$ @@ -52,17 +51,16 @@ public class PreferenceConstants { /** * A named preference that controls if override indicators are rendered in the UI. *

- * Value is of type Boolean: if true override - * indicators are rendered + * Value is of type Boolean: if true override indicators are rendered *

- */ + */ public static final String APPEARANCE_OVERRIDE_INDICATOR = "net.sourceforge.phpdt.ui.overrideindicator"; //$NON-NLS-1$ /** * 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 to '..jdt', '1~' to 'o~.e~.jdt'. + * Value is of type String. For example foe the given package name 'org.eclipse.jdt' pattern '.' will compress it + * to '..jdt', '1~' to 'o~.e~.jdt'. *

*/ public static final String APPEARANCE_PKG_NAME_PATTERN_FOR_PKG_VIEW = "PackagesView.pkgNamePatternForPackagesView"; //$NON-NLS-1$ @@ -78,40 +76,38 @@ public class PreferenceConstants { public static final String APPEARANCE_COMPRESS_PACKAGE_NAMES = "net.sourceforge.phpdt.ui.compresspackagenames"; //$NON-NLS-1$ /** - * A named preference that controls if empty inner packages are folded in - * the hierarchical mode of the package explorer. + * A named preference that controls if empty inner packages are folded in the hierarchical mode of the package explorer. *

- * Value is of type Boolean: if true empty - * inner packages are folded. + * 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$ /** - * A named preference that defines how member elements are ordered by the - * Java views using the JavaElementSorter. + * A named preference that defines how member elements are ordered by 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. + * 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 2.1 */ public static final String APPEARANCE_MEMBER_SORT_ORDER = "outlinesortoption"; //$NON-NLS-1$ /** - * A named preference that controls if prefix removal during setter/getter generation is turned on or off. + * A named preference that controls if prefix removal during setter/getter generation is turned on or off. *

* Value is of type Boolean. *

@@ -119,8 +115,7 @@ public class PreferenceConstants { public static final String CODEGEN_USE_GETTERSETTER_PREFIX = "net.sourceforge.phpdt.ui.gettersetter.prefix.enable"; //$NON-NLS-1$ /** - * A named preference that holds a list of prefixes to be removed from a local variable to compute setter - * and gettter names. + * A named preference that holds a list of prefixes to be removed from a local variable to compute setter and gettter names. *

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

@@ -138,8 +133,7 @@ public class PreferenceConstants { public static final String CODEGEN_USE_GETTERSETTER_SUFFIX = "net.sourceforge.phpdt.ui.gettersetter.suffix.enable"; //$NON-NLS-1$ /** - * A named preference that holds a list of suffixes to be removed from a local variable to compute setter - * and getter names. + * A named preference that holds a list of suffixes to be removed from a local variable to compute setter and getter names. *

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

@@ -147,28 +141,28 @@ public class PreferenceConstants { * @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 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$ + * 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$ /** * A name preference that controls if a JavaDoc stub gets added to newly created types and methods. *

* 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$ - + // public static final String CODEGEN__JAVADOC_STUBS = CODEGEN_ADD_COMMENTS; //$NON-NLS-1$ /** - * A named preference that controls if a non-phpdoc comment gets added to methods generated via the - * "Override Methods" operation. + * A named preference that controls if a non-phpdoc comment gets added to methods generated via the "Override Methods" operation. *

* Value is of type Boolean. *

@@ -184,11 +178,10 @@ public class PreferenceConstants { public static final String CODEGEN__FILE_COMMENTS = "net.sourceforge.phpdt.ui.filecomments"; //$NON-NLS-1$ /** - * A named preference that holds a list of comma separated package names. The list specifies the import order used by - * the "Organize Imports" opeation. + * A named preference that holds a list of comma separated package names. The list specifies the import order used by the + * "Organize Imports" opeation. *

- * Value is of type String: semicolon separated list of package - * names + * 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$ @@ -202,8 +195,7 @@ public class PreferenceConstants { public static final String ORGIMPORTS_ONDEMANDTHRESHOLD = "net.sourceforge.phpdt.ui.ondemandthreshold"; //$NON-NLS-1$ /** - * A named preferences that controls if types that start with a lower case letters get added by the - * "Organize Import" operation. + * A named preferences that controls if types that start with a lower case letters get added by the "Organize Import" operation. *

* Value is of type Boolean. *

@@ -235,11 +227,11 @@ public class PreferenceConstants { public static final String LINK_TYPEHIERARCHY_TO_EDITOR = "net.sourceforge.phpdt.ui.packages.linktypehierarchytoeditor"; //$NON-NLS-1$ /** - * A named preference that controls whether the browsing view's selection is - * linked to the active editor. + * A named preference that controls whether the browsing view's selection is linked to the active editor. *

* 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$ @@ -247,17 +239,17 @@ public class PreferenceConstants { /** * A named preference that controls whether new projects are generated using source and output folder. *

- * Value is of type Boolean. if true new projects are created with a source and - * output folder. If false source and output folder equals to the project. + * Value is of type Boolean. if true new projects are created with a source and output folder. If + * false source and output folder equals to the project. *

*/ public static final String SRCBIN_FOLDERS_IN_NEWPROJ = "net.sourceforge.phpdt.ui.wizards.srcBinFoldersInNewProjects"; //$NON-NLS-1$ /** - * A named preference that specifies the source folder name used when creating a new Java project. Value is inactive - * if SRCBIN_FOLDERS_IN_NEWPROJ is set to false. + * A named preference that specifies the source folder name used when creating a new Java project. Value is inactive if + * SRCBIN_FOLDERS_IN_NEWPROJ is set to false. *

- * Value is of type String. + * Value is of type String. *

* * @see #SRCBIN_FOLDERS_IN_NEWPROJ @@ -265,10 +257,10 @@ public class PreferenceConstants { public static final String SRCBIN_SRCNAME = "net.sourceforge.phpdt.ui.wizards.srcBinFoldersSrcName"; //$NON-NLS-1$ /** - * A named preference that specifies the output folder name used when creating a new Java project. Value is inactive - * if SRCBIN_FOLDERS_IN_NEWPROJ is set to false. + * A named preference that specifies the output folder name used when creating a new Java project. Value is inactive if + * SRCBIN_FOLDERS_IN_NEWPROJ is set to false. *

- * Value is of type String. + * Value is of type String. *

* * @see #SRCBIN_FOLDERS_IN_NEWPROJ @@ -276,16 +268,16 @@ public class PreferenceConstants { public static final String SRCBIN_BINNAME = "net.sourceforge.phpdt.ui.wizards.srcBinFoldersBinName"; //$NON-NLS-1$ /** - * A named preference that holds a list of possible JRE libraries used by the New Java Project wizard. An library - * consists of a description and an arbitrary number of IClasspathEntrys, that will represent the - * JRE on the new project's classpath. + * A named preference that holds a list of possible JRE libraries used by the New Java Project wizard. An library consists of a + * description and an arbitrary number of IClasspathEntrys, that will represent the JRE on the new project's + * classpath. *

- * Value is of type String: a semicolon separated list of encoded JRE libraries. - * NEWPROJECT_JRELIBRARY_INDEX defines the currently used library. Clients - * should use the method encodeJRELibrary to encode a JRE library into a string - * and the methods decodeJRELibraryDescription(String) and - * decodeJRELibraryClasspathEntries(String) to decode the description and the array - * of classpath entries from an encoded string. + * Value is of type String: a semicolon separated list of encoded JRE libraries. + * NEWPROJECT_JRELIBRARY_INDEX defines the currently used library. Clients should use the method + * encodeJRELibrary to encode a JRE library into a string and the methods + * decodeJRELibraryDescription(String) and + * decodeJRELibraryClasspathEntries(String) to decode the + * description and the array of classpath entries from an encoded string. *

* * @see #NEWPROJECT_JRELIBRARY_INDEX @@ -306,8 +298,8 @@ public class PreferenceConstants { public static final String NEWPROJECT_JRELIBRARY_INDEX = "net.sourceforge.phpdt.ui.wizards.jre.index"; //$NON-NLS-1$ /** - * A named preference that controls if a new type hierarchy gets opened in a - * new type hierarchy perspective or inside the type hierarchy view part. + * A named preference that controls if a new type hierarchy gets opened in a new type hierarchy perspective or inside the type + * hierarchy view part. *

* Value is of type String: possible values are * OPEN_TYPE_HIERARCHY_IN_PERSPECTIVE or @@ -334,7 +326,7 @@ public class PreferenceConstants { public static final String OPEN_TYPE_HIERARCHY_IN_VIEW_PART = "viewPart"; //$NON-NLS-1$ /** - * A named preference that controls the behaviour when double clicking on a container in the packages view. + * A named preference that controls the behaviour when double clicking on a container in the packages view. *

* Value is of type String: possible values are * DOUBLE_CLICK_GOES_INTO or @@ -361,8 +353,8 @@ public class PreferenceConstants { public static final String DOUBLE_CLICK_EXPANDS = "packageview.doubleclick.expands"; //$NON-NLS-1$ /** - * A named preference that controls whether Java views update their presentation while editing or when saving the - * content of an editor. + * A named preference that controls whether Java views update their presentation while editing or when saving the content of an + * editor. *

* Value is of type String: possible values are * UPDATE_ON_SAVE or @@ -395,43 +387,42 @@ public class PreferenceConstants { *

*/ public static final String JAVADOC_COMMAND = "command"; //$NON-NLS-1$ + /** - * A named preference that defines whether hint to make hover sticky should be shown. - * - * @see JavaUI - * @since 3.0 - */ - public static final String EDITOR_SHOW_TEXT_HOVER_AFFORDANCE= "PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE"; //$NON-NLS-1$ + * A named preference that defines whether hint to make hover sticky should be shown. + * + * @see JavaUI + * @since 3.0 + */ + public static final String EDITOR_SHOW_TEXT_HOVER_AFFORDANCE = "PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE"; //$NON-NLS-1$ /** - * A named preference that defines the key for the hover modifiers. - * - * @see JavaUI - * @since 2.1 - */ + * A named preference that defines the key for the hover modifiers. + * + * @see JavaUI + * @since 2.1 + */ public static final String EDITOR_TEXT_HOVER_MODIFIERS = "hoverModifiers"; //$NON-NLS-1$ - /** - * 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 - */ + + /** + * 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$ /** @@ -445,8 +436,7 @@ public class PreferenceConstants { /** * A named preference that holds the color used to highlight matching brackets. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -465,8 +455,7 @@ public class PreferenceConstants { /** * A named preference that holds the color used to highlight the current line. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -485,8 +474,7 @@ public class PreferenceConstants { /** * A named preference that holds the color used to render the print margin. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -502,8 +490,7 @@ public class PreferenceConstants { /** * A named preference that holds the color used for the find/replace scope. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -514,9 +501,8 @@ public class PreferenceConstants { /** * A named preference that specifies if the editor uses spaces for tabs. *

- * Value is of type Boolean. If truespaces instead of tabs are used - * in the editor. If false the editor inserts a tab character when pressing the tab - * key. + * Value is of type Boolean. If true spaces instead of tabs are used in the editor. If + * false the editor inserts a tab character when pressing the tab key. *

*/ public final static String EDITOR_SPACES_FOR_TABS = "spacesForTabs"; //$NON-NLS-1$ @@ -524,18 +510,18 @@ public class PreferenceConstants { /** * A named preference that holds the number of spaces used per tab in the editor. *

- * Value is of type Int: positive int value specifying the number of - * spaces per tab. + * 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$ /** - * A named preference that controls whether the outline view selection - * should stay in sync with with the element at the current cursor position. + * A named preference that controls whether the outline view selection should stay in sync with with the element at the current + * cursor position. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_SYNC_OUTLINE_ON_CURSOR_MOVE = "JavaEditor.SyncOutlineOnCursorMove"; //$NON-NLS-1$ @@ -549,49 +535,44 @@ public class PreferenceConstants { public final static String EDITOR_CORRECTION_INDICATION = "JavaEditor.ShowTemporaryProblem"; //$NON-NLS-1$ /** - * A named preference that controls whether the editor shows problem indicators in text (squiggly lines). + * A named preference that controls whether the editor shows problem indicators in text (squiggly lines). *

* Value is of type Boolean. *

*/ -// public final static String EDITOR_PROBLEM_INDICATION = "problemIndication"; //$NON-NLS-1$ - + // public final static String EDITOR_PROBLEM_INDICATION = "problemIndication"; //$NON-NLS-1$ /** * A named preference that holds the color used to render problem indicators. *

- * 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 *

* * @see #EDITOR_PROBLEM_INDICATION * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ -// public final static String EDITOR_PROBLEM_INDICATION_COLOR = "problemIndicationColor"; //$NON-NLS-1$ - - /**PreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR; - * A named preference that controls whether the editor shows warning indicators in text (squiggly lines). + // public final static String EDITOR_PROBLEM_INDICATION_COLOR = "problemIndicationColor"; //$NON-NLS-1$ + /** + * PreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR; A named preference that controls whether the editor shows warning + * indicators in text (squiggly lines). *

* Value is of type Boolean. *

*/ -// public final static String EDITOR_WARNING_INDICATION = "warningIndication"; //$NON-NLS-1$ - + // public final static String EDITOR_WARNING_INDICATION = "warningIndication"; //$NON-NLS-1$ /** * A named preference that holds the color used to render warning indicators. *

- * 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 *

* * @see #EDITOR_WARNING_INDICATION * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter */ -// public final static String EDITOR_WARNING_INDICATION_COLOR = "warningIndicationColor"; //$NON-NLS-1$ - + // public final static String EDITOR_WARNING_INDICATION_COLOR = "warningIndicationColor"; //$NON-NLS-1$ /** - * A named preference that controls whether the editor shows task indicators in text (squiggly lines). + * A named preference that controls whether the editor shows task indicators in text (squiggly lines). *

* Value is of type Boolean. *

@@ -601,8 +582,7 @@ public class PreferenceConstants { /** * A named preference that holds the color used to render task indicators. *

- * 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 *

* * @see #EDITOR_TASK_INDICATION @@ -612,11 +592,11 @@ public class PreferenceConstants { public final static String EDITOR_TASK_INDICATION_COLOR = "taskIndicationColor"; //$NON-NLS-1$ /** - * A named preference that controls whether the editor shows bookmark - * indicators in text (squiggly lines). + * A named preference that controls whether the editor shows bookmark indicators in text (squiggly lines). *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_BOOKMARK_INDICATION = "bookmarkIndication"; //$NON-NLS-1$ @@ -624,10 +604,9 @@ public class PreferenceConstants { /** * A named preference that holds the color used to render bookmark indicators. *

- * 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 *

- * + * * @see #EDITOR_BOOKMARK_INDICATION * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter @@ -636,11 +615,11 @@ public class PreferenceConstants { public final static String EDITOR_BOOKMARK_INDICATION_COLOR = "bookmarkIndicationColor"; //$NON-NLS-1$ /** - * A named preference that controls whether the editor shows search - * indicators in text (squiggly lines). + * A named preference that controls whether the editor shows search indicators in text (squiggly lines). *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_SEARCH_RESULT_INDICATION = "searchResultIndication"; //$NON-NLS-1$ @@ -648,10 +627,9 @@ public class PreferenceConstants { /** * A named preference that holds the color used to render search indicators. *

- * 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 *

- * + * * @see #EDITOR_SEARCH_RESULT_INDICATION * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter @@ -660,23 +638,21 @@ public class PreferenceConstants { public final static String EDITOR_SEARCH_RESULT_INDICATION_COLOR = "searchResultIndicationColor"; //$NON-NLS-1$ /** - * A named preference that controls whether the editor shows unknown - * indicators in text (squiggly lines). + * A named preference that controls whether the editor shows unknown indicators in text (squiggly lines). *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_UNKNOWN_INDICATION = "othersIndication"; //$NON-NLS-1$ /** - * A named preference that holds the color used to render unknown - * indicators. + * A named preference that holds the color used to render unknown indicators. *

- * 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 *

- * + * * @see #EDITOR_UNKNOWN_INDICATION * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter @@ -685,76 +661,75 @@ public class PreferenceConstants { public final static String EDITOR_UNKNOWN_INDICATION_COLOR = "othersIndicationColor"; //$NON-NLS-1$ /** - * A named preference that controls whether the overview ruler shows error - * indicators. + * A named preference that controls whether the overview ruler shows error indicators. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER = "errorIndicationInOverviewRuler"; //$NON-NLS-1$ /** - * A named preference that controls whether the overview ruler shows warning - * indicators. + * A named preference that controls whether the overview ruler shows warning indicators. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER = "warningIndicationInOverviewRuler"; //$NON-NLS-1$ /** - * A named preference that controls whether the overview ruler shows task - * indicators. + * A named preference that controls whether the overview ruler shows task indicators. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER = "taskIndicationInOverviewRuler"; //$NON-NLS-1$ /** - * A named preference that controls whether the overview ruler shows - * bookmark indicators. + * A named preference that controls whether the overview ruler shows bookmark indicators. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER = "bookmarkIndicationInOverviewRuler"; //$NON-NLS-1$ /** - * A named preference that controls whether the overview ruler shows - * search result indicators. + * A named preference that controls whether the overview ruler shows search result indicators. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER = "searchResultIndicationInOverviewRuler"; //$NON-NLS-1$ /** - * A named preference that controls whether the overview ruler shows - * unknown indicators. + * A named preference that controls whether the overview ruler shows unknown indicators. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER = "othersIndicationInOverviewRuler"; //$NON-NLS-1$ /** - * A named preference that controls whether the 'close strings' feature - * is enabled in PHP mode + * A named preference that controls whether the 'close strings' feature is enabled in PHP mode *

* Value is of type Boolean. *

*/ public final static String EDITOR_CLOSE_STRINGS_DQ_PHP = "closeStringsPHPDQ"; //$NON-NLS-1$ + /** - * A named preference that controls whether the 'close strings' feature - * is enabled in PHP mode + * A named preference that controls whether the 'close strings' feature is enabled in PHP mode *

* Value is of type Boolean. *

@@ -762,154 +737,165 @@ public class PreferenceConstants { public final static String EDITOR_CLOSE_STRINGS_SQ_PHP = "closeStringsPHPSQ"; //$NON-NLS-1$ /** - * A named preference that controls whether the 'close brackets' feature is - * enabled in PHP mode + * A named preference that controls whether the 'close brackets' feature is enabled in PHP mode *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_CLOSE_BRACKETS_PHP = "closeBracketsPHP"; //$NON-NLS-1$ - /** - * A named preference that controls whether the 'wrap strings' feature is - * enabled. - *

- * Value is of type Boolean. - *

- * @since 2.1 - */ - public final static String EDITOR_WRAP_STRINGS_DQ= "wrapStringsDQ"; //$NON-NLS-1$ - - /** - * A named preference that controls whether the 'escape strings' feature is - * enabled. - *

- * Value is of type Boolean. - *

- * @since 3.0 - */ - public final static String EDITOR_ESCAPE_STRINGS_DQ= "escapeStringsDQ"; //$NON-NLS-1$ - /** - * A named preference that controls whether the 'wrap strings' feature is - * enabled. - *

- * Value is of type Boolean. - *

- * @since 2.1 - */ - public final static String EDITOR_WRAP_STRINGS_SQ= "wrapStringsDQ"; //$NON-NLS-1$ - - /** - * A named preference that controls whether the 'escape strings' feature is - * enabled. - *

- * Value is of type Boolean. - *

- * @since 3.0 - */ - public final static String EDITOR_ESCAPE_STRINGS_SQ= "escapeStringsSQ"; //$NON-NLS-1$ - - /** - * A named preference that controls if content assist inserts the common - * prefix of all proposals before presenting choices. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String CODEASSIST_PREFIX_COMPLETION= "content_assist_prefix_completion"; //$NON-NLS-1$ - - /** - * A named preference that controls whether the 'close braces' feature is - * enabled. + /** + * A named preference that controls whether the 'wrap words' feature is enabled. + *

+ * Value is of type Boolean. + *

+ * + * @since 2.1 + */ + public final static String EDITOR_WRAP_WORDS = "wrapWords"; //$NON-NLS-1$ + + /** + * A named preference that controls whether the 'wrap strings' feature is enabled. + *

+ * Value is of type Boolean. + *

+ * + * @since 2.1 + */ + public final static String EDITOR_WRAP_STRINGS_DQ = "wrapStringsDQ"; //$NON-NLS-1$ + + /** + * A named preference that controls whether the 'escape strings' feature is enabled. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String EDITOR_ESCAPE_STRINGS_DQ = "escapeStringsDQ"; //$NON-NLS-1$ + + /** + * A named preference that controls whether the 'wrap strings' feature is enabled. *

* Value is of type Boolean. *

+ * + * @since 2.1 + */ + public final static String EDITOR_WRAP_STRINGS_SQ = "wrapStringsDQ"; //$NON-NLS-1$ + + /** + * A named preference that controls whether the 'escape strings' feature is enabled. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String EDITOR_ESCAPE_STRINGS_SQ = "escapeStringsSQ"; //$NON-NLS-1$ + + /** + * A named preference that controls if content assist inserts the common prefix of all proposals before presenting choices. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String CODEASSIST_PREFIX_COMPLETION = "content_assist_prefix_completion"; //$NON-NLS-1$ + + /** + * A named preference that controls whether the 'close braces' feature is enabled. + *

+ * Value is of type Boolean. + *

+ * * @since 2.1 */ public final static String EDITOR_CLOSE_BRACES = "closeBraces"; //$NON-NLS-1$ /** - * A named preference that controls whether the 'close php docs' feature is - * enabled. + * A named preference that controls whether the 'close php docs' feature is enabled. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_CLOSE_JAVADOCS = "closeJavaDocs"; //$NON-NLS-1$ /** - * A named preference that controls whether the 'add JavaDoc tags' feature - * is enabled. + * A named preference that controls whether the 'add JavaDoc tags' feature is enabled. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_ADD_JAVADOC_TAGS = "addJavaDocTags"; //$NON-NLS-1$ /** - * A named preference that controls whether the 'format Javadoc tags' - * feature is enabled. + * A named preference that controls whether the 'format Javadoc tags' feature is enabled. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_FORMAT_JAVADOCS = "formatJavaDocs"; //$NON-NLS-1$ /** - * A named preference that controls whether the 'smart paste' feature is - * enabled. + * A named preference that controls whether the 'smart paste' feature is enabled. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_SMART_PASTE = "smartPaste"; //$NON-NLS-1$ /** - * A named preference that controls whether the 'close strings' feature - * is enabled in HTML mode + * A named preference that controls whether the 'close strings' feature is enabled in HTML mode *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_CLOSE_STRINGS_HTML = "closeStringsHTML"; //$NON-NLS-1$ /** - * A named preference that controls whether the 'close brackets' feature is - * enabled in HTML mode + * A named preference that controls whether the 'close brackets' feature is enabled in HTML mode *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_CLOSE_BRACKETS_HTML = "closeBracketsHTML"; //$NON-NLS-1$ /** - * A named preference that controls whether the 'smart home-end' feature is - * enabled. + * A named preference that controls whether the 'smart home-end' feature is enabled. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String EDITOR_SMART_HOME_END = AbstractTextEditor.PREFERENCE_NAVIGATION_SMART_HOME_END; - + /** - * A named preference that controls whether the 'sub-word navigation' feature is - * enabled. - *

- * Value is of type Boolean. - *

- * @since 2.1 - */ - public final static String EDITOR_SUB_WORD_NAVIGATION= "subWordNavigation"; //$NON-NLS-1$ + * A named preference that controls whether the 'sub-word navigation' feature is enabled. + *

+ * Value is of type Boolean. + *

+ * + * @since 2.1 + */ + public final static String EDITOR_SUB_WORD_NAVIGATION = "subWordNavigation"; //$NON-NLS-1$ + /** * A named preference that controls if temporary problems are evaluated and shown in the UI. *

@@ -937,8 +923,7 @@ public class PreferenceConstants { /** * A named preference that holds the color used to render line numbers inside the line number ruler. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -950,8 +935,7 @@ public class PreferenceConstants { /** * A named preference that holds the color used to render linked positions inside code templates. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -962,8 +946,7 @@ public class PreferenceConstants { /** * A named preference that holds the color used as the text foreground. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -972,8 +955,7 @@ public class PreferenceConstants { public final static String EDITOR_FOREGROUND_COLOR = AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND; /** - * A named preference that describes if the system default foreground color - * is used as the text foreground. + * A named preference that describes if the system default foreground color is used as the text foreground. *

* Value is of type Boolean. *

@@ -983,8 +965,7 @@ public class PreferenceConstants { /** * A named preference that holds the color used as the text background. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -993,10 +974,9 @@ public class PreferenceConstants { public final static String EDITOR_BACKGROUND_COLOR = AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND; /** - * A named preference that describes if the system default background color - * is used as the text foreground. + * A named preference that describes if the system default background color is used as the text foreground. *

- * Value is of type Boolean. + * Value is of type Boolean. *

*/ public final static String EDITOR_BACKGROUND_DEFAULT_COLOR = AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT; @@ -1010,11 +990,11 @@ public class PreferenceConstants { * Preference key suffix for bold text style preference keys. */ public static final String EDITOR_ITALIC_SUFFIX = "_italic"; //$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 + * Value is of type String. A RGB color value encoded as a string using class PreferenceConverter *

* * @see org.eclipse.jface.resource.StringConverter @@ -1023,18 +1003,17 @@ public class PreferenceConstants { 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"). - * - * @since 2.1 - */ -public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.textfont"; //$NON-NLS-1$ + * The symbolic font name for the Java editor text font (value "org.eclipse.jdt.ui.editors.textfont"). + * + * @since 2.1 + */ + public final static String EDITOR_TEXT_FONT = "net.sourceforge.phpdt.ui.editors.textfont"; //$NON-NLS-1$ /** * A named preference that controls whether multi line comments are rendered in bold. *

- * Value is of type Boolean. If true multi line comments are rendered - * in bold. If false the are rendered using no font style attribute. + * Value is of type Boolean. If true multi line comments are rendered in bold. If + * false the are rendered using no font style attribute. *

*/ public final static String EDITOR_MULTI_LINE_COMMENT_BOLD = IPreferenceConstants.PHP_MULTILINE_COMMENT + EDITOR_BOLD_SUFFIX; @@ -1042,8 +1021,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that holds the color used to render single line comments. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -1054,120 +1032,117 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that controls whether sinle line comments are rendered in bold. *

- * Value is of type Boolean. If true single line comments are rendered - * in bold. If false the are rendered using no font style attribute. + * Value is of type Boolean. If true single line comments are rendered in bold. If + * false the are rendered using no font style attribute. *

*/ public final static String EDITOR_SINGLE_LINE_COMMENT_BOLD = IPreferenceConstants.PHP_SINGLELINE_COMMENT + EDITOR_BOLD_SUFFIX; + + /** + * A named preference that holds the color used to render operators and brackets. + *

+ * 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 + */ + public final static String EDITOR_PHP_OPERATOR_COLOR = IPreferenceConstants.PHP_OPERATOR; + + /** + * A named preference that controls whether operators and brackets are rendered in bold. + *

+ * 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; + /** - * A named preference that holds the color used to render operators and brackets. - *

- * 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 - */ - public final static String EDITOR_PHP_OPERATOR_COLOR= IPreferenceConstants.PHP_OPERATOR; - - /** - * A named preference that controls whether operators and brackets are rendered in bold. - *

- * 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; - - /** - * A named preference that holds the color used to render operators and brackets. - *

- * 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 - */ - public final static String EDITOR_PHP_BRACE_OPERATOR_COLOR= IPreferenceConstants.PHP_BRACE_OPERATOR; - - /** - * A named preference that controls whether operators and brackets are rendered in bold. - *

- * 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; - - /** - * A named preference that holds the color used to render the 'return' keyword. - *

- * 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 - */ - public final static String EDITOR_PHP_KEYWORD_RETURN_COLOR= IPreferenceConstants.PHP_KEYWORD_RETURN; - - /** - * A named preference that controls whether 'return' keyword is rendered in bold. - *

- * 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; - - /** - * A named preference that holds the color used to render php start and stop tags. - *

- * 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 - */ + * A named preference that holds the color used to render operators and brackets. + *

+ * 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 + */ + public final static String EDITOR_PHP_BRACE_OPERATOR_COLOR = IPreferenceConstants.PHP_BRACE_OPERATOR; + + /** + * A named preference that controls whether operators and brackets are rendered in bold. + *

+ * 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; + + /** + * A named preference that holds the color used to render the 'return' keyword. + *

+ * 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 + */ + public final static String EDITOR_PHP_KEYWORD_RETURN_COLOR = IPreferenceConstants.PHP_KEYWORD_RETURN; + + /** + * A named preference that controls whether 'return' keyword is rendered in bold. + *

+ * 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; + + /** + * A named preference that holds the color used to render php start and stop tags. + *

+ * 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_TAG_COLOR = IPreferenceConstants.PHP_TAG; /** @@ -1181,8 +1156,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that holds the color used to render php keywords. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -1199,11 +1173,9 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public final static String EDITOR_JAVA_KEYWORD_BOLD = IPreferenceConstants.PHP_KEYWORD + EDITOR_BOLD_SUFFIX; /** - * A named preference that holds the color used to render predefined php - * function names. + * A named preference that holds the color used to render predefined php function names. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -1212,8 +1184,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public final static String EDITOR_PHP_FUNCTIONNAME_COLOR = IPreferenceConstants.PHP_FUNCTIONNAME; /** - * A named preference that controls whether function names are rendered in - * bold. + * A named preference that controls whether function names are rendered in bold. *

* Value is of type Boolean. *

@@ -1221,11 +1192,9 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t 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. + * 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 + * Value is of type String. A RGB color value encoded as a string using class PreferenceConverter *

* * @see org.eclipse.jface.resource.StringConverter @@ -1244,8 +1213,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * 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 + * Value is of type String. A RGB color value encoded as a string using class PreferenceConverter *

* * @see org.eclipse.jface.resource.StringConverter @@ -1264,8 +1232,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that holds the color used to render php types. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -1284,8 +1251,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that holds the color used to render string constants. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -1304,8 +1270,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -1322,32 +1287,31 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public final static String EDITOR_JAVA_DEFAULT_BOLD = IPreferenceConstants.PHP_DEFAULT + EDITOR_BOLD_SUFFIX; /** - * A named preference that holds the color used to render task tags. - *

- * 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 - */ - public final static String EDITOR_TASK_TAG_COLOR= IPreferenceConstants.TASK_TAG; - - /** - * A named preference that controls whether task tags are rendered in bold. - *

- * Value is of type Boolean. - *

- * @since 2.1 - */ - public final static String EDITOR_TASK_TAG_BOLD= IPreferenceConstants.TASK_TAG + EDITOR_BOLD_SUFFIX; + * A named preference that holds the color used to render task tags. + *

+ * 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 + */ + public final static String EDITOR_TASK_TAG_COLOR = IPreferenceConstants.TASK_TAG; + + /** + * A named preference that controls whether task tags are rendered in bold. + *

+ * Value is of type Boolean. + *

+ * + * @since 2.1 + */ + public final static String EDITOR_TASK_TAG_BOLD = IPreferenceConstants.TASK_TAG + EDITOR_BOLD_SUFFIX; /** * A named preference that holds the color used to render phpdoc keywords. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -1366,8 +1330,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that holds the color used to render phpdoc tags. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -1386,8 +1349,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that holds the color used to render phpdoc links. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -1406,8 +1368,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that holds the color used to render phpdoc 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -1426,10 +1387,9 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that holds the color used for 'linked-mode' underline. *

- * 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 *

- * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 2.1 @@ -1445,13 +1405,13 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public static final String EDITOR_SHOW_HOVER = "net.sourceforge.phpdt.ui.editor.showHover"; //$NON-NLS-1$ /** - * A named preference that defines the hover shown when no control key is - * pressed. - *

Value is of type String: possible values are + * A named preference that defines the hover shown when no control key is pressed. + *

+ * Value is of type String: possible values are * EDITOR_NO_HOVER_CONFIGURED_ID or - * EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a hover - * contributed as phpEditorTextHovers. + * 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 @@ -1460,13 +1420,13 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public static final String EDITOR_NONE_HOVER = "noneHover"; //$NON-NLS-1$ /** - * A named preference that defines the hover shown when the - * CTRL modifier key is pressed. - *

Value is of type String: possible values are + * A named preference that defines the hover shown when the CTRL modifier key is pressed. + *

+ * Value is of type String: possible values are * EDITOR_NO_HOVER_CONFIGURED_ID or - * EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a - * hover contributed as phpEditorTextHovers. + * 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 @@ -1475,13 +1435,13 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public static final String EDITOR_CTRL_HOVER = "ctrlHover"; //$NON-NLS-1$ /** - * A named preference that defines the hover shown when the - * SHIFT modifier key is pressed. - *

Value is of type String: possible values are + * A named preference that defines the hover shown when the SHIFT modifier key is pressed. + *

+ * Value is of type String: possible values are * EDITOR_NO_HOVER_CONFIGURED_ID or - * EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a - * hover contributed as phpEditorTextHovers. + * 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 @@ -1490,13 +1450,13 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public static final String EDITOR_SHIFT_HOVER = "shiftHover"; //$NON-NLS-1$ /** - * A named preference that defines the hover shown when the - * CTRL + ALT modifier keys is pressed. - *

Value is of type String: possible values are + * A named preference that defines the hover shown when the CTRL + ALT modifier keys is pressed. + *

+ * Value is of type String: possible values are * EDITOR_NO_HOVER_CONFIGURED_ID or - * EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a - * hover contributed as phpEditorTextHovers. + * 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 @@ -1505,13 +1465,13 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public static final String EDITOR_CTRL_ALT_HOVER = "ctrlAltHover"; //$NON-NLS-1$ /** - * A named preference that defines the hover shown when the - * CTRL + ALT + SHIFT modifier keys is pressed. - *

Value is of type String: possible values are + * A named preference that defines the hover shown when the CTRL + ALT + SHIFT modifier keys is pressed. + *

+ * Value is of type String: possible values are * EDITOR_NO_HOVER_CONFIGURED_ID or - * EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a - * hover contributed as phpEditorTextHovers. + * 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 @@ -1520,13 +1480,13 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public static final String EDITOR_CTRL_ALT_SHIFT_HOVER = "ctrlAltShiftHover"; //$NON-NLS-1$ /** - * A named preference that defines the hover shown when the - * CTRL + SHIFT modifier keys is pressed. - *

Value is of type String: possible values are + * A named preference that defines the hover shown when the CTRL + SHIFT modifier keys is pressed. + *

+ * Value is of type String: possible values are * EDITOR_NO_HOVER_CONFIGURED_ID or - * EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a - * hover contributed as phpEditorTextHovers. + * 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 @@ -1535,13 +1495,13 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public static final String EDITOR_CTRL_SHIFT_HOVER = "ctrlShiftHover"; //$NON-NLS-1$ /** - * A named preference that defines the hover shown when the - * ALT modifier key is pressed. - *

Value is of type String: possible values are + * A named preference that defines the hover shown when the ALT modifier key is pressed. + *

+ * Value is of type String: possible values are * EDITOR_NO_HOVER_CONFIGURED_ID, - * EDITOR_DEFAULT_HOVER_CONFIGURED_ID or the hover id of a - * hover contributed as phpEditorTextHovers. + * 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 @@ -1550,24 +1510,24 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public static final String EDITOR_ALT_SHIFT_HOVER = "altShiftHover"; //$NON-NLS-1$ /** - * A string value used by the named preferences for hover configuration to - * descibe that no hover should be shown for the given key modifiers. + * 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$ /** - * 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. + * 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$ /** - * A named preference that defines the hover named the 'default hover'. - * Value is of type String: possible values are + * A named preference that defines the hover named the 'default hover'. Value is of type String: possible values + * are * EDITOR_NO_HOVER_CONFIGURED_ID or the hover id of a hover * contributed as phpEditorTextHovers. *

@@ -1582,14 +1542,15 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t *

*/ public static final String EDITOR_SHOW_SEGMENTS = "net.sourceforge.phpdt.ui.editor.showSegments"; //$NON-NLS-1$ + /** - * A named preference that controls if browser like links are turned on or off. - *

- * Value is of type Boolean. - *

- * - * @since 2.1 - */ + * A named preference that controls if browser like links are turned on or off. + *

+ * Value is of type Boolean. + *

+ * + * @since 2.1 + */ public static final String EDITOR_BROWSER_LIKE_LINKS = "browserLikeLinks"; //$NON-NLS-1$ /** @@ -1601,286 +1562,274 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t * @since 2.1 */ public static final String EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER = "browserLikeLinksKeyModifier"; //$NON-NLS-1$ + + /** + * A named preference that controls whether occurrences are marked in the editor. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public static final String EDITOR_MARK_OCCURRENCES = "markOccurrences"; //$NON-NLS-1$ + + /** + * A named preference that controls whether occurrences are sticky in the editor. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public static final String EDITOR_STICKY_OCCURRENCES = "stickyOccurrences"; //$NON-NLS-1$ + + /** + * A named preference that controls disabling of the overwrite mode. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public static final String EDITOR_DISABLE_OVERWRITE_MODE = "disable_overwrite_mode"; //$NON-NLS-1$ + + /** + * A named preference that controls the "smart semicolon" smart typing handler + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public static final String EDITOR_SMART_SEMICOLON = "smart_semicolon"; //$NON-NLS-1$ + + /** + * 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$ + + /** + * A named preference that controls the "smart opening brace" smart typing handler + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public static final String EDITOR_SMART_OPENING_BRACE = "smart_opening_brace"; //$NON-NLS-1$ + + /** + * 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$ + + /** + * 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; + + /** + * A named preference that controls whether words containing digits should be skipped during spell-checking. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String SPELLING_IGNORE_DIGITS = ISpellCheckPreferenceKeys.SPELLING_IGNORE_DIGITS; + /** - * A named preference that controls whether occurrences are marked in the editor. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public static final String EDITOR_MARK_OCCURRENCES= "markOccurrences"; //$NON-NLS-1$ - - /** - * A named preference that controls whether occurrences are sticky in the editor. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public static final String EDITOR_STICKY_OCCURRENCES= "stickyOccurrences"; //$NON-NLS-1$ - - /** - * A named preference that controls disabling of the overwrite mode. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public static final String EDITOR_DISABLE_OVERWRITE_MODE= "disable_overwrite_mode"; //$NON-NLS-1$ - - /** - * A named preference that controls the "smart semicolon" smart typing handler - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public static final String EDITOR_SMART_SEMICOLON= "smart_semicolon"; //$NON-NLS-1$ - /** - * 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$ - - /** - * A named preference that controls the "smart opening brace" smart typing handler - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public static final String EDITOR_SMART_OPENING_BRACE= "smart_opening_brace"; //$NON-NLS-1$ - - /** - * 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$ - - /** - * 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; - - /** - * A named preference that controls whether words containing digits should - * be skipped during spell-checking. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String SPELLING_IGNORE_DIGITS= ISpellCheckPreferenceKeys.SPELLING_IGNORE_DIGITS; - - /** - * A named preference that controls whether mixed case words should be - * skipped during spell-checking. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String SPELLING_IGNORE_MIXED= ISpellCheckPreferenceKeys.SPELLING_IGNORE_MIXED; - - /** - * A named preference that controls whether sentence capitalization should - * be ignored during spell-checking. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String SPELLING_IGNORE_SENTENCE= ISpellCheckPreferenceKeys.SPELLING_IGNORE_SENTENCE; - - /** - * A named preference that controls whether upper case words should be - * skipped during spell-checking. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String SPELLING_IGNORE_UPPER= ISpellCheckPreferenceKeys.SPELLING_IGNORE_UPPER; - - /** - * A named preference that controls whether urls should be ignored during - * spell-checking. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String SPELLING_IGNORE_URLS= ISpellCheckPreferenceKeys.SPELLING_IGNORE_URLS; - - /** - * A named preference that controls the locale used for spell-checking. - *

- * Value is of type String. - *

- * - * @since 3.0 - */ - public final static String SPELLING_LOCALE= ISpellCheckPreferenceKeys.SPELLING_LOCALE; - - /** - * A named preference that controls the number of proposals offered during - * spell-checking. - *

- * Value is of type Integer. - *

- * - * @since 3.0 - */ - public final static String SPELLING_PROPOSAL_THRESHOLD= ISpellCheckPreferenceKeys.SPELLING_PROPOSAL_THRESHOLD; - - /** - * A named preference that specifies the workspace user dictionary. - *

- * Value is of type Integer. - *

- * - * @since 3.0 - */ - public final static String SPELLING_USER_DICTIONARY= ISpellCheckPreferenceKeys.SPELLING_USER_DICTIONARY; - - /** - * A named preference that specifies whether spelling dictionaries are available to content assist. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String SPELLING_ENABLE_CONTENTASSIST= ISpellCheckPreferenceKeys.SPELLING_ENABLE_CONTENTASSIST; - - /** - * A named preference that controls whether code snippets are formatted - * in Javadoc comments. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String FORMATTER_COMMENT_FORMATSOURCE= "comment_format_source_code"; //$NON-NLS-1$ - - /** - * A named preference that controls whether description of Javadoc - * parameters are indented. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String FORMATTER_COMMENT_INDENTPARAMETERDESCRIPTION= "comment_indent_parameter_description"; //$NON-NLS-1$ - - /** - * A named preference that controls whether the header comment of - * a Java source file is formatted. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String FORMATTER_COMMENT_FORMATHEADER= "comment_format_header"; //$NON-NLS-1$ - - /** - * A named preference that controls whether Javadoc root tags - * are indented. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String FORMATTER_COMMENT_INDENTROOTTAGS= "comment_indent_root_tags"; //$NON-NLS-1$ - - /** - * A named preference that controls whether Javadoc comments - * are formatted by the content formatter. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String FORMATTER_COMMENT_FORMAT= "comment_format_comments"; //$NON-NLS-1$ - - /** - * A named preference that controls whether a new line is inserted - * after Javadoc root tag parameters. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String FORMATTER_COMMENT_NEWLINEFORPARAMETER= "comment_new_line_for_parameter"; //$NON-NLS-1$ - - /** - * A named preference that controls whether an empty line is inserted before - * the Javadoc root tag block. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String FORMATTER_COMMENT_SEPARATEROOTTAGS= "comment_separate_root_tags"; //$NON-NLS-1$ - - /** - * A named preference that controls whether blank lines are cleared during formatting - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String FORMATTER_COMMENT_CLEARBLANKLINES= "comment_clear_blank_lines"; //$NON-NLS-1$ - - /** - * A named preference that controls the line length of comments. - *

- * 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$ - - /** - * A named preference that controls whether html tags are formatted. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public final static String FORMATTER_COMMENT_FORMATHTML= "comment_format_html"; //$NON-NLS-1$ + * A named preference that controls whether mixed case words should be skipped during spell-checking. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String SPELLING_IGNORE_MIXED = ISpellCheckPreferenceKeys.SPELLING_IGNORE_MIXED; + + /** + * A named preference that controls whether sentence capitalization should be ignored during spell-checking. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String SPELLING_IGNORE_SENTENCE = ISpellCheckPreferenceKeys.SPELLING_IGNORE_SENTENCE; + + /** + * A named preference that controls whether upper case words should be skipped during spell-checking. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String SPELLING_IGNORE_UPPER = ISpellCheckPreferenceKeys.SPELLING_IGNORE_UPPER; + + /** + * A named preference that controls whether urls should be ignored during spell-checking. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String SPELLING_IGNORE_URLS = ISpellCheckPreferenceKeys.SPELLING_IGNORE_URLS; + + /** + * A named preference that controls the locale used for spell-checking. + *

+ * Value is of type String. + *

+ * + * @since 3.0 + */ + public final static String SPELLING_LOCALE = ISpellCheckPreferenceKeys.SPELLING_LOCALE; + + /** + * A named preference that controls the number of proposals offered during spell-checking. + *

+ * Value is of type Integer. + *

+ * + * @since 3.0 + */ + public final static String SPELLING_PROPOSAL_THRESHOLD = ISpellCheckPreferenceKeys.SPELLING_PROPOSAL_THRESHOLD; + + /** + * A named preference that specifies the workspace user dictionary. + *

+ * Value is of type Integer. + *

+ * + * @since 3.0 + */ + public final static String SPELLING_USER_DICTIONARY = ISpellCheckPreferenceKeys.SPELLING_USER_DICTIONARY; + + /** + * A named preference that specifies whether spelling dictionaries are available to content assist. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String SPELLING_ENABLE_CONTENTASSIST = ISpellCheckPreferenceKeys.SPELLING_ENABLE_CONTENTASSIST; + + /** + * A named preference that controls whether code snippets are formatted in Javadoc comments. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String FORMATTER_COMMENT_FORMATSOURCE = "comment_format_source_code"; //$NON-NLS-1$ + + /** + * A named preference that controls whether description of Javadoc parameters are indented. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String FORMATTER_COMMENT_INDENTPARAMETERDESCRIPTION = "comment_indent_parameter_description"; //$NON-NLS-1$ + + /** + * A named preference that controls whether the header comment of a Java source file is formatted. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String FORMATTER_COMMENT_FORMATHEADER = "comment_format_header"; //$NON-NLS-1$ + + /** + * A named preference that controls whether Javadoc root tags are indented. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String FORMATTER_COMMENT_INDENTROOTTAGS = "comment_indent_root_tags"; //$NON-NLS-1$ + + /** + * A named preference that controls whether Javadoc comments are formatted by the content formatter. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String FORMATTER_COMMENT_FORMAT = "comment_format_comments"; //$NON-NLS-1$ + + /** + * A named preference that controls whether a new line is inserted after Javadoc root tag parameters. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String FORMATTER_COMMENT_NEWLINEFORPARAMETER = "comment_new_line_for_parameter"; //$NON-NLS-1$ + + /** + * A named preference that controls whether an empty line is inserted before the Javadoc root tag block. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String FORMATTER_COMMENT_SEPARATEROOTTAGS = "comment_separate_root_tags"; //$NON-NLS-1$ + + /** + * A named preference that controls whether blank lines are cleared during formatting + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String FORMATTER_COMMENT_CLEARBLANKLINES = "comment_clear_blank_lines"; //$NON-NLS-1$ + + /** + * A named preference that controls the line length of comments. + *

+ * 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$ + + /** + * A named preference that controls whether html tags are formatted. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public final static String FORMATTER_COMMENT_FORMATHTML = "comment_format_html"; //$NON-NLS-1$ /** * A named preference that controls if the Java code assist gets auto activated. @@ -1908,31 +1857,32 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public final static String CODEASSIST_SHOW_VISIBLE_PROPOSALS = "content_assist_show_visible_proposals"; //$NON-NLS-1$ /** - * A named preference that controls if the Java code assist inserts a - * proposal automatically if only one proposal is available. + * A named preference that controls if the Java code assist inserts a proposal automatically if only one proposal is available. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String CODEASSIST_AUTOINSERT = "content_assist_autoinsert"; //$NON-NLS-1$ /** - * A named preference that controls if the Java code assist adds import - * statements. + * A named preference that controls if the Java code assist adds import statements. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String CODEASSIST_ADDIMPORT = "content_assist_add_import"; //$NON-NLS-1$ /** - * A named preference that controls if the Java code assist only inserts - * completions. If set to false the proposals can also _replace_ code. + * A named preference that controls if the Java code assist only inserts completions. If set to false the proposals can also + * _replace_ code. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String CODEASSIST_INSERT_COMPLETION = "content_assist_insert_completion"; //$NON-NLS-1$ @@ -1948,15 +1898,15 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that defines if code assist proposals are sorted in alphabetical order. *

- * Value is of type Boolean. If true that are sorted in alphabetical - * order. If false that are unsorted. + * Value is of type Boolean. If true that are sorted in alphabetical order. If false + * that are unsorted. *

*/ public final static String CODEASSIST_ORDER_PROPOSALS = "content_assist_order_proposals"; //$NON-NLS-1$ /** - * A named preference that controls if argument names are filled in when a method is selected from as list - * of code assist proposal. + * A named preference that controls if argument names are filled in when a method is selected from as list of code assist + * proposal. *

* Value is of type Boolean. *

@@ -1964,41 +1914,36 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public final static String CODEASSIST_FILL_ARGUMENT_NAMES = "content_assist_fill_method_arguments"; //$NON-NLS-1$ /** - * A named preference that controls if method arguments are guessed when a - * method is selected from as list of code assist proposal. + * A named preference that controls if method arguments are guessed when a method is selected from as list of code assist + * proposal. *

* Value is of type Boolean. *

+ * * @since 2.1 */ public final static String CODEASSIST_GUESS_METHOD_ARGUMENTS = "content_assist_guess_method_arguments"; //$NON-NLS-1$ /** - * A named preference that holds the characters that auto activate code assist - * in PHP code. + * A named preference that holds the characters that auto activate code assist in PHP code. *

- * Value is of type Sring. All characters that trigger auto code - * assist in PHP code. + * Value is of type Sring. All characters that trigger auto code assist in PHP code. *

*/ public final static String CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA = "content_assist_autoactivation_triggers_php"; //$NON-NLS-1$ /** - * A named preference that holds the characters that auto activate code assist - * in PHPDoc. + * A named preference that holds the characters that auto activate code assist in PHPDoc. *

- * Value is of type Sring. All characters that trigger auto code - * assist in PHPDoc. + * Value is of type Sring. All characters that trigger auto code assist in PHPDoc. *

*/ public final static String CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVADOC = "content_assist_autoactivation_triggers_phpdoc"; //$NON-NLS-1$ /** - * A named preference that holds the characters that auto activate code assist - * in HTML. + * A named preference that holds the characters that auto activate code assist in HTML. *

- * Value is of type Sring. All characters that trigger auto code - * assist in HTML. + * Value is of type Sring. All characters that trigger auto code assist in HTML. *

*/ public final static String CODEASSIST_AUTOACTIVATION_TRIGGERS_HTML = "content_assist_autoactivation_triggers_html"; //$NON-NLS-1$ @@ -2006,8 +1951,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that holds the background color used in the code assist selection dialog. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -2018,8 +1962,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that holds the foreground color used in the code assist selection dialog. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -2030,8 +1973,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that holds the background color used for parameter hints. *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -2042,8 +1984,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t /** * A named preference that holds the foreground color used in the code assist selection dialog *

- * 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 *

* * @see org.eclipse.jface.resource.StringConverter @@ -2052,13 +1993,11 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public final static String CODEASSIST_PARAMETERS_FOREGROUND = "content_assist_parameters_foreground"; //$NON-NLS-1$ /** - * A named preference that holds the background color used in the code - * assist selection dialog to mark replaced code. + * A named preference that holds the background color used in the code assist selection dialog to mark replaced code. *

- * 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 *

- * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 2.1 @@ -2066,13 +2005,11 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public final static String CODEASSIST_REPLACEMENT_BACKGROUND = "content_assist_completion_replacement_background"; //$NON-NLS-1$ /** - * A named preference that holds the foreground color used in the code - * assist selection dialog to mark replaced code. + * A named preference that holds the foreground color used in the code assist selection dialog to mark replaced code. *

- * 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 *

- * + * * @see org.eclipse.jface.resource.StringConverter * @see org.eclipse.jface.preference.PreferenceConverter * @since 2.1 @@ -2080,12 +2017,10 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public final static String CODEASSIST_REPLACEMENT_FOREGROUND = "content_assist_completion_replacement_foreground"; //$NON-NLS-1$ /** - * A named preference that controls the behaviour of the refactoring wizard for showing the error page. + * A named preference that controls the behaviour of the refactoring wizard for showing the error page. *

- * Value is of type String. Valid values are: - * REFACTOR_FATAL_SEVERITY, - * REFACTOR_ERROR_SEVERITY, - * REFACTOR_WARNING_SEVERITY + * Value is of type String. Valid values are: REFACTOR_FATAL_SEVERITY, + * REFACTOR_ERROR_SEVERITY,REFACTOR_WARNING_SEVERITY * REFACTOR_INFO_SEVERITY, * REFACTOR_OK_SEVERITY. *

@@ -2134,8 +2069,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public static final String REFACTOR_OK_SEVERITY = "0"; //$NON-NLS-1$ /** - * A named preference thet controls whether all dirty editors are automatically saved before a refactoring is - * executed. + * A named preference thet controls whether all dirty editors are automatically saved before a refactoring is executed. *

* Value is of type Boolean. *

@@ -2166,15 +2100,14 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t *

* 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 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. + * 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. *

@@ -2185,77 +2118,75 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t public static final String EDITOR_BROWSER_LIKE_LINKS_KEY_MODIFIER_MASK = "browserLikeLinksKeyModifierMask"; //$NON-NLS-1$ /** - * 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 - */ + * 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 + */ public static final String EDITOR_TEXT_HOVER_MODIFIER_MASKS = "hoverModifierMasks"; //$NON-NLS-1$ /** - * A named preference that controls whether folding is enabled in the Java editor. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public static final String EDITOR_FOLDING_ENABLED= "editor_folding_enabled"; //$NON-NLS-1$ - - /** - * A named preference that stores the configured folding provider. - *

- * Value is of type String. - *

- * - * @since 3.0 - */ - public static final String EDITOR_FOLDING_PROVIDER= "editor_folding_provider"; //$NON-NLS-1$ - - /** - * A named preference that stores the value for Javadoc folding for the default folding provider. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public static final String EDITOR_FOLDING_JAVADOC= "editor_folding_default_javadoc"; //$NON-NLS-1$ - - /** - * A named preference that stores the value for inner type folding for the default folding provider. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public static final String EDITOR_FOLDING_INNERTYPES= "editor_folding_default_innertypes"; //$NON-NLS-1$ - - /** - * A named preference that stores the value for method folding for the default folding provider. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public static final String EDITOR_FOLDING_METHODS= "editor_folding_default_methods"; //$NON-NLS-1$ - - /** - * A named preference that stores the value for imports folding for the default folding provider. - *

- * Value is of type Boolean. - *

- * - * @since 3.0 - */ - public static final String EDITOR_FOLDING_IMPORTS= "editor_folding_default_imports"; //$NON-NLS-1$ - - + * A named preference that controls whether folding is enabled in the Java editor. + *

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public static final String EDITOR_FOLDING_ENABLED = "editor_folding_enabled"; //$NON-NLS-1$ + + /** + * A named preference that stores the configured folding provider. + *

+ * Value is of type String. + *

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

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public static final String EDITOR_FOLDING_JAVADOC = "editor_folding_default_javadoc"; //$NON-NLS-1$ + + /** + * A named preference that stores the value for inner type folding for the default folding provider. + *

+ * Value is of type Boolean. + *

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

+ * Value is of type Boolean. + *

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

+ * Value is of type Boolean. + *

+ * + * @since 3.0 + */ + public static final String EDITOR_FOLDING_IMPORTS = "editor_folding_default_imports"; //$NON-NLS-1$ + public static void initializeDefaultValues(IPreferenceStore store) { store.setDefault(PreferenceConstants.EDITOR_SHOW_SEGMENTS, false); @@ -2310,8 +2241,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t // PHPEditorPreferencePage /* - * Ensure that the display is accessed only in the UI thread. - * Ensure that there are no side effects of switching the thread. + * 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(); @@ -2338,29 +2268,29 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_FIND_SCOPE_COLOR, new RGB(185, 176, 180)); -// store.setDefault(PreferenceConstants.EDITOR_PROBLEM_INDICATION, true); -// PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR, new RGB(255, 0, 128)); -// store.setDefault(PreferenceConstants.EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER, true); -// -// store.setDefault(PreferenceConstants.EDITOR_WARNING_INDICATION, true); -// PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_WARNING_INDICATION_COLOR, new RGB(244, 200, 45)); -// store.setDefault(PreferenceConstants.EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER, true); -// -// store.setDefault(PreferenceConstants.EDITOR_TASK_INDICATION, false); -// PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_TASK_INDICATION_COLOR, new RGB(0, 128, 255)); -// store.setDefault(PreferenceConstants.EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER, false); -// -// store.setDefault(PreferenceConstants.EDITOR_BOOKMARK_INDICATION, false); -// PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_BOOKMARK_INDICATION_COLOR, new RGB(34, 164, 99)); -// store.setDefault(PreferenceConstants.EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER, false); -// -// store.setDefault(PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION, false); -// PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_COLOR, new RGB(192, 192, 192)); -// store.setDefault(PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER, false); -// -// store.setDefault(PreferenceConstants.EDITOR_UNKNOWN_INDICATION, false); -// PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_UNKNOWN_INDICATION_COLOR, new RGB(0, 0, 0)); -// store.setDefault(PreferenceConstants.EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER, false); + // store.setDefault(PreferenceConstants.EDITOR_PROBLEM_INDICATION, true); + // PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR, new RGB(255, 0, 128)); + // store.setDefault(PreferenceConstants.EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER, true); + // + // store.setDefault(PreferenceConstants.EDITOR_WARNING_INDICATION, true); + // PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_WARNING_INDICATION_COLOR, new RGB(244, 200, 45)); + // store.setDefault(PreferenceConstants.EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER, true); + // + // store.setDefault(PreferenceConstants.EDITOR_TASK_INDICATION, false); + // PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_TASK_INDICATION_COLOR, new RGB(0, 128, 255)); + // store.setDefault(PreferenceConstants.EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER, false); + // + // store.setDefault(PreferenceConstants.EDITOR_BOOKMARK_INDICATION, false); + // PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_BOOKMARK_INDICATION_COLOR, new RGB(34, 164, 99)); + // store.setDefault(PreferenceConstants.EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER, false); + // + // store.setDefault(PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION, false); + // PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_COLOR, new RGB(192, 192, 192)); + // store.setDefault(PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER, false); + // + // store.setDefault(PreferenceConstants.EDITOR_UNKNOWN_INDICATION, false); + // PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_UNKNOWN_INDICATION_COLOR, new RGB(0, 0, 0)); + // 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); @@ -2372,7 +2302,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t store.setDefault(PreferenceConstants.EDITOR_LINE_NUMBER_RULER, false); PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, new RGB(0, 0, 0)); -// WorkbenchChainedTextFontFieldEditor.startPropagate(store, JFaceResources.TEXT_FONT); + // 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)); @@ -2451,20 +2381,21 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t 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_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, true); - store.setDefault(PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE, 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); @@ -2479,38 +2410,40 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t store.setDefault(PreferenceConstants.EDITOR_CTRL_ALT_SHIFT_HOVER, PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID); String ctrl = Action.findModifierString(SWT.CTRL); - 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;" + SWT.CTRL); //$NON-NLS-1$ + 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;" + SWT.CTRL); //$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, SWT.CTRL); -// 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); - - // 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_IMPORTS, false); - - store.setDefault(PreferenceConstants.EDITOR_SMART_BACKSPACE, 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); + + // 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_IMPORTS, false); + + store.setDefault(PreferenceConstants.EDITOR_SMART_BACKSPACE, true); + // do more complicated stuff - // NewJavaProjectPreferencePage.initDefaults(store); + // NewJavaProjectPreferencePage.initDefaults(store); } /** @@ -2523,12 +2456,12 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t } // /** - // * Encodes a JRE library to be used in the named preference NEWPROJECT_JRELIBRARY_LIST. - // * + // * Encodes a JRE library to be used in the named preference NEWPROJECT_JRELIBRARY_LIST. + // * // * @param description a string value describing the JRE library. The description is used // * to indentify the JDR library in the UI // * @param entries an array of classpath entries to be encoded - // * + // * // * @return the encoded string. // */ // public static String encodeJRELibrary(String description, IClasspathEntry[] entries) { @@ -2537,9 +2470,9 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t // // /** // * Decodes an encoded JRE library and returns its description string. - // * + // * // * @return the description of an encoded JRE library - // * + // * // * @see #encodeJRELibrary(String, IClasspathEntry[]) // */ // public static String decodeJRELibraryDescription(String encodedLibrary) { @@ -2548,9 +2481,9 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t // // /** // * Decodes an encoded JRE library and returns its classpath entries. - // * + // * // * @return the array of classpath entries of an encoded JRE library. - // * + // * // * @see #encodeJRELibrary(String, IClasspathEntry[]) // */ // public static IClasspathEntry[] decodeJRELibraryClasspathEntries(String encodedLibrary) { @@ -2563,11 +2496,11 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t // * with the index defined by NEWPROJECT_JRELIBRARY_INDEX. // * // * @return the current default set of classpath entries - // * + // * // * @see #NEWPROJECT_JRELIBRARY_LIST // * @see #NEWPROJECT_JRELIBRARY_INDEX // */ // public static IClasspathEntry[] getDefaultJRELibrary() { // return NewJavaProjectPreferencePage.getDefaultJRELibrary(); - // } -} + // } +} \ No newline at end of file diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java index 2c916d6..6c521d6 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java @@ -158,6 +158,7 @@ import org.eclipse.ui.views.contentoutline.ContentOutline; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; import org.eclipse.ui.views.tasklist.TaskList; + /** * PHP specific text editor. */ @@ -1907,10 +1908,18 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements I if (PreferenceConstants.getPreferenceStore().getBoolean(PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE)) enableOverwriteMode(false); - + + setWordWrap(); // getEditorSite().getShell().addShellListener(fActivationListener); } + private void setWordWrap() { + if (getSourceViewer() != null) { + getSourceViewer().getTextWidget().setWordWrap( + PHPeclipsePlugin.getDefault().getPreferenceStore().getBoolean(PreferenceConstants.EDITOR_WRAP_WORDS)); + } + } + protected void configureSourceViewerDecorationSupport(SourceViewerDecorationSupport support) { support.setCharacterPairMatcher(fBracketMatcher); @@ -2153,8 +2162,8 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements I if (fProjectionModelUpdater != null) fProjectionModelUpdater.initialize(); -// if (isShowingOverrideIndicators()) -// installOverrideIndicator(false); + // if (isShowingOverrideIndicators()) + // installOverrideIndicator(false); } /* @@ -2969,6 +2978,9 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements I .getNewValue()))) sourceViewer.invalidateTextPresentation(); } + if (PreferenceConstants.EDITOR_WRAP_WORDS.equals(event.getProperty())) { + setWordWrap(); + } } /** @@ -3834,55 +3846,56 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements I } protected void uninstallOverrideIndicator() { -// if (fOverrideIndicatorManager != null) { -// fOverrideIndicatorManager.removeAnnotations(); -// fOverrideIndicatorManager= null; -// } + // if (fOverrideIndicatorManager != null) { + // fOverrideIndicatorManager.removeAnnotations(); + // fOverrideIndicatorManager= null; + // } } protected void installOverrideIndicator(boolean waitForReconcilation) { - uninstallOverrideIndicator(); - IAnnotationModel model= getDocumentProvider().getAnnotationModel(getEditorInput()); - final IJavaElement inputElement= getInputJavaElement(); - - if (model == null || inputElement == null) - return; - -// fOverrideIndicatorManager= new OverrideIndicatorManager(model, inputElement, null); -// -// if (provideAST) { -// Job job= new Job(JavaEditorMessages.getString("OverrideIndicatorManager.intallJob")) { //$NON-NLS-1$ -// /* -// * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) -// * @since 3.0 -// */ -// protected IStatus run(IProgressMonitor monitor) { -// CompilationUnit ast= JavaPlugin.getDefault().getASTProvider().getAST(inputElement, true, null); -// if (fOverrideIndicatorManager != null) // editor might have been closed in the meanwhile -// fOverrideIndicatorManager.reconciled(ast, true, monitor); -// return Status.OK_STATUS; -// } -// }; -// job.setPriority(Job.DECORATE); -// job.setSystem(true); -// job.schedule(); -// } - } - - /** - * Tells whether override indicators are shown. - * - * @return true if the override indicators are shown - * @since 3.0 - */ -// protected boolean isShowingOverrideIndicators() { -// AnnotationPreference preference= getAnnotationPreferenceLookup().getAnnotationPreference(OverrideIndicatorManager.ANNOTATION_TYPE); -// IPreferenceStore store= getPreferenceStore(); -// return getBoolean(store, preference.getHighlightPreferenceKey()) -// || getBoolean(store, preference.getVerticalRulerPreferenceKey()) -// || getBoolean(store, preference.getOverviewRulerPreferenceKey()) -// || getBoolean(store, preference.getTextPreferenceKey()); -// } + uninstallOverrideIndicator(); + IAnnotationModel model = getDocumentProvider().getAnnotationModel(getEditorInput()); + final IJavaElement inputElement = getInputJavaElement(); + + if (model == null || inputElement == null) + return; + + // fOverrideIndicatorManager= new OverrideIndicatorManager(model, inputElement, null); + // + // if (provideAST) { + // Job job= new Job(JavaEditorMessages.getString("OverrideIndicatorManager.intallJob")) { //$NON-NLS-1$ + // /* + // * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) + // * @since 3.0 + // */ + // protected IStatus run(IProgressMonitor monitor) { + // CompilationUnit ast= JavaPlugin.getDefault().getASTProvider().getAST(inputElement, true, null); + // if (fOverrideIndicatorManager != null) // editor might have been closed in the meanwhile + // fOverrideIndicatorManager.reconciled(ast, true, monitor); + // return Status.OK_STATUS; + // } + // }; + // job.setPriority(Job.DECORATE); + // job.setSystem(true); + // job.schedule(); + // } + } + + /** + * Tells whether override indicators are shown. + * + * @return true if the override indicators are shown + * @since 3.0 + */ + // protected boolean isShowingOverrideIndicators() { + // AnnotationPreference preference= + // getAnnotationPreferenceLookup().getAnnotationPreference(OverrideIndicatorManager.ANNOTATION_TYPE); + // IPreferenceStore store= getPreferenceStore(); + // return getBoolean(store, preference.getHighlightPreferenceKey()) + // || getBoolean(store, preference.getVerticalRulerPreferenceKey()) + // || getBoolean(store, preference.getOverviewRulerPreferenceKey()) + // || getBoolean(store, preference.getTextPreferenceKey()); + // } /** * Returns the boolean preference for the given key. * -- 1.7.1