lot of fixes about offsets

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / ui / PreferenceConstants.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
index 3647756..4c02619 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
@@ -699,13 +699,13 @@ public class PreferenceConstants {
 
   /**
    * A named preference that controls whether the 'close strings' feature
-   *  is   enabled.
+   *  is   enabled in PHP mode
    * <p>
    * Value is of type <code>Boolean</code>.
    * </p>
    * @since 2.1
    */
-  public final static String EDITOR_CLOSE_STRINGS = "closeStrings"; //$NON-NLS-1$
+  public final static String EDITOR_CLOSE_STRINGS_PHP = "closeStringsPHP"; //$NON-NLS-1$
 
   /**
    * A named preference that controls whether the 'wrap strings' feature is
@@ -719,13 +719,13 @@ public class PreferenceConstants {
 
   /**
    * A named preference that controls whether the 'close brackets' feature is
-   * enabled.
+   * enabled in PHP mode
    * <p>
    * Value is of type <code>Boolean</code>.
    * </p>
    * @since 2.1
    */
-  public final static String EDITOR_CLOSE_BRACKETS = "closeBrackets"; //$NON-NLS-1$
+  public final static String EDITOR_CLOSE_BRACKETS_PHP = "closeBracketsPHP"; //$NON-NLS-1$
 
   /**
    * A named preference that controls whether the 'close braces' feature is
@@ -778,6 +778,26 @@ public class PreferenceConstants {
   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
+   * <p>
+   * Value is of type <code>Boolean</code>.
+   * </p>
+   * @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
+   * <p>
+   * Value is of type <code>Boolean</code>.
+   * </p>
+   * @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.
    * <p>
@@ -1790,14 +1810,17 @@ public class PreferenceConstants {
 
     store.setDefault(PreferenceConstants.EDITOR_SMART_HOME_END, true);
     store.setDefault(PreferenceConstants.EDITOR_SMART_PASTE, true);
-    store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS, true);
-    store.setDefault(PreferenceConstants.EDITOR_CLOSE_BRACKETS, true);
+    store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS_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_ADD_JAVADOC_TAGS, true);
     store.setDefault(PreferenceConstants.EDITOR_FORMAT_JAVADOCS, true);
 
+    store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS_HTML, true);
+    store.setDefault(PreferenceConstants.EDITOR_CLOSE_BRACKETS_HTML, true);
+    
     // store.setDefault(PreferenceConstants.EDITOR_DEFAULT_HOVER, JavaPlugin.ID_BESTMATCH_HOVER);
     store.setDefault(PreferenceConstants.EDITOR_NONE_HOVER, PreferenceConstants.EDITOR_DEFAULT_HOVER_CONFIGURED_ID);
     //         store.setDefault(PreferenceConstants.EDITOR_CTRL_HOVER, JavaPlugin.ID_SOURCE_HOVER);