@@ -351,8 +354,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 
@@ -385,43 +388,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$
 
   /**
@@ -435,8 +437,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
@@ -455,8 +456,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
@@ -475,8 +475,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
@@ -492,8 +491,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
@@ -504,9 +502,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$
@@ -514,18 +511,19 @@ 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$
+  public final static String EDITOR_TAB_WIDTH = AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH; //"net.sourceforge.phpdt.ui.editor.tab.width";
+                                                                                                                 // //$NON-NLS-1$
 
   /**
-   * A named preference that controls whether the outline view selection
-   * should stay in sync with with the element at the current 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$
@@ -539,49 +537,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.
    * 
@@ -591,8 +584,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
@@ -602,11 +594,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$
@@ -614,10 +606,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
@@ -626,11 +617,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$
@@ -638,10 +629,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
@@ -650,23 +640,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
@@ -675,204 +663,241 @@ 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.
    * 
-   * @since 2.1
    */
-  public final static String EDITOR_CLOSE_STRINGS_PHP = "closeStringsPHP"; //$NON-NLS-1$
+  public final static String EDITOR_CLOSE_STRINGS_DQ_PHP = "closeStringsPHPDQ"; //$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 strings' feature is enabled in PHP mode
    * 
    * Value is of type Boolean.
    * 
+   */
+  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
+   * 
+   * 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= "wrapStrings"; //$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= "escapeStrings"; //$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.
    * 
@@ -900,8 +925,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
@@ -913,8 +937,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
@@ -925,8 +948,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
@@ -935,8 +957,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.
    * 
@@ -946,8 +967,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
@@ -956,10 +976,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;
@@ -973,11 +992,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
@@ -986,18 +1005,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;
@@ -1005,8 +1023,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
@@ -1017,87 +1034,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_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 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 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 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;
 
   /**
@@ -1111,8 +1158,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
@@ -1129,11 +1175,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
@@ -1142,8 +1186,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.
    * 
@@ -1151,11 +1194,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
@@ -1174,8 +1215,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
@@ -1194,8 +1234,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
@@ -1214,8 +1253,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
@@ -1234,8 +1272,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
@@ -1252,32 +1289,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
@@ -1296,8 +1332,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
@@ -1316,8 +1351,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
@@ -1336,8 +1370,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
@@ -1356,10 +1389,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
@@ -1375,13 +1407,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
@@ -1390,13 +1422,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
@@ -1405,13 +1437,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
@@ -1420,13 +1452,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
@@ -1435,13 +1467,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
@@ -1450,13 +1482,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
@@ -1465,13 +1497,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
@@ -1480,24 +1512,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.
    * 
@@ -1512,14 +1544,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$
 
   /**
@@ -1531,278 +1564,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 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 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 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 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.
@@ -1830,31 +1859,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$	
@@ -1870,15 +1900,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.
    * 
@@ -1886,41 +1916,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$
@@ -1928,8 +1953,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
@@ -1940,8 +1964,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
@@ -1952,8 +1975,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
@@ -1964,8 +1986,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
@@ -1974,13 +1995,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
@@ -1988,13 +2007,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
@@ -2002,12 +2019,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.
    * 
@@ -2056,8 +2071,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.
    * 
@@ -2088,15 +2102,25 @@ 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 whether annotation roll over is used or not.
+   * 
+   * Value is of type Boolean. If true the annotation ruler column
+   * uses a roll over to display multiple annotations
+   * 
+   * 
+   * @since 3.0
+   */
+  public static final String EDITOR_ANNOTATION_ROLL_OVER = "editor_annotation_roll_over"; //$NON-NLS-1$
+
+  /**
+   * A named preference that controls the key modifier mask for browser like links. The value is only used if the value of
+   * EDITOR_BROWSER_LIKE_LINKS cannot be resolved to valid SWT modifier bits.
    * 
    * Value is of type String.
    * 
@@ -2107,77 +2131,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);
 
@@ -2221,35 +2243,17 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t
     store.setDefault(PreferenceConstants.CODEGEN_USE_GETTERSETTER_SUFFIX, false);
     store.setDefault(PreferenceConstants.CODEGEN_GETTERSETTER_PREFIX, "fg, f, _$, _, m_"); //$NON-NLS-1$
     store.setDefault(PreferenceConstants.CODEGEN_GETTERSETTER_SUFFIX, "_"); //$NON-NLS-1$
-    store.setDefault(PreferenceConstants.CODEGEN__JAVADOC_STUBS, true);
+    store.setDefault(PreferenceConstants.CODEGEN_ADD_COMMENTS, true);
     store.setDefault(PreferenceConstants.CODEGEN__NON_JAVADOC_COMMENTS, false);
     store.setDefault(PreferenceConstants.CODEGEN__FILE_COMMENTS, false);
 
     // MembersOrderPreferencePage
     store.setDefault(PreferenceConstants.APPEARANCE_MEMBER_SORT_ORDER, "T,SI,SF,SM,I,F,C,M"); //$NON-NLS-1$
     // must add here to guarantee that it is the first in the listener list
-    //	store.addPropertyChangeListener(PHPeclipsePlugin.getDefault().getMemberOrderPreferenceCache());
-
-    // PHPEditorPreferencePage
-    /*
-     * Ensure that the display is accessed only in the UI thread.
-     * Ensure that there are no side effects of switching the thread.
-     */
-    final RGB[] rgbs = new RGB[3];
-    final Display display = Display.getDefault();
-    display.syncExec(new Runnable() {
-      public void run() {
-        Color c = display.getSystemColor(SWT.COLOR_GRAY);
-        rgbs[0] = c.getRGB();
-        c = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);
-        rgbs[1] = c.getRGB();
-        c = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-        rgbs[2] = c.getRGB();
-      }
-    });
+    store.addPropertyChangeListener(PHPeclipsePlugin.getDefault().getMemberOrderPreferenceCache());
 
     store.setDefault(PreferenceConstants.EDITOR_MATCHING_BRACKETS, true);
-    PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR, rgbs[0]);
+    PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR, new RGB(192, 192,192));
 
     store.setDefault(PreferenceConstants.EDITOR_CURRENT_LINE, true);
     PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_CURRENT_LINE_COLOR, new RGB(225, 235, 224));
@@ -2260,32 +2264,32 @@ 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, false);
+    store.setDefault(PreferenceConstants.EDITOR_SYNC_OUTLINE_ON_CURSOR_MOVE, true);
 
     store.setDefault(PreferenceConstants.EDITOR_EVALUTE_TEMPORARY_PROBLEMS, true);
 
@@ -2294,15 +2298,13 @@ 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));
 
-    PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_FOREGROUND_COLOR, rgbs[1]);
     store.setDefault(PreferenceConstants.EDITOR_FOREGROUND_DEFAULT_COLOR, true);
 
-    PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_BACKGROUND_COLOR, rgbs[2]);
     store.setDefault(PreferenceConstants.EDITOR_BACKGROUND_DEFAULT_COLOR, true);
 
     store.setDefault(PreferenceConstants.EDITOR_TAB_WIDTH, 4);
@@ -2373,17 +2375,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_PHP, 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_STRINGS, true);
-    store.setDefault(PreferenceConstants.EDITOR_ESCAPE_STRINGS, false);
+    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_FORMAT_JAVADOCS, false);
+    store.setDefault(PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE, false);
 
     store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS_HTML, true);
     store.setDefault(PreferenceConstants.EDITOR_CLOSE_BRACKETS_HTML, true);
@@ -2398,36 +2404,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, false);
-	store.setDefault(PreferenceConstants.EDITOR_FOLDING_INNERTYPES, true);
-	store.setDefault(PreferenceConstants.EDITOR_FOLDING_METHODS, false);
-	store.setDefault(PreferenceConstants.EDITOR_FOLDING_IMPORTS, false);
+    //  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);
   }
 
   /**
@@ -2440,12 +2450,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) {
@@ -2454,9 +2464,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) {
@@ -2465,9 +2475,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) {
@@ -2480,11 +2490,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