X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
index 2ac2f8b..ec2fb75 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
@@ -740,9 +740,16 @@ public class PreferenceConstants {
    * <p>
    * Value is of type <code>Boolean</code>.
    * </p>
-   * @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 strings' feature
+   *  is   enabled in PHP mode
+   * <p>
+   * Value is of type <code>Boolean</code>.
+   * </p>
+   */
+  public final static String EDITOR_CLOSE_STRINGS_SQ_PHP = "closeStringsPHPSQ"; //$NON-NLS-1$
 
   /**
    * A named preference that controls whether the 'close brackets' feature is
@@ -762,7 +769,26 @@ public class PreferenceConstants {
 	 * </p>
 	 * @since 2.1
 	 */
-	public final static String EDITOR_WRAP_STRINGS= "wrapStrings"; //$NON-NLS-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.
+	 * <p>
+	 * Value is of type <code>Boolean</code>.
+	 * </p>
+	 * @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.
+	 * <p>
+	 * Value is of type <code>Boolean</code>.
+	 * </p>
+	 * @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
@@ -772,7 +798,8 @@ public class PreferenceConstants {
 	 * </p>
 	 * @since 3.0
 	 */
-	public final static String EDITOR_ESCAPE_STRINGS= "escapeStrings"; //$NON-NLS-1$
+	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.
@@ -2383,12 +2410,15 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t
     store.setDefault(PreferenceConstants.EDITOR_SMART_HOME_END, 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_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);