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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java
index 89a22b3..69d820c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java
@@ -238,7 +238,9 @@ public class JavaEditorPreferencePage extends PreferencePage implements IWorkben
 
   //  private Button fAddJavaDocTagsButton;
 
-  private Button fEscapeStringsButton;
+  private Button fEscapeStringsButtonDQ;
+  
+  private Button fEscapeStringsButtonSQ;
 
   //	private Button fGuessMethodArgumentsButton;
   private SourceViewer fPreviewViewer;
@@ -455,9 +457,13 @@ public class JavaEditorPreferencePage extends PreferencePage implements IWorkben
     //    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
     //        OverlayPreferenceStore.BOOLEAN,
     //        PreferenceConstants.EDITOR_CLOSE_JAVADOCS));
-    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_WRAP_STRINGS));
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_WRAP_STRINGS_DQ));
     overlayKeys
-        .add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_ESCAPE_STRINGS));
+        .add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_ESCAPE_STRINGS_DQ));
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_WRAP_STRINGS_SQ));
+    overlayKeys
+        .add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_ESCAPE_STRINGS_SQ));
+    
     overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
         PreferenceConstants.EDITOR_ADD_JAVADOC_TAGS));
     overlayKeys
@@ -1053,15 +1059,21 @@ public class JavaEditorPreferencePage extends PreferencePage implements IWorkben
     group.setLayout(layout);
     group.setText(PreferencesMessages.getString("JavaEditorPreferencePage.typing.description")); //$NON-NLS-1$
 
-    label = PreferencesMessages.getString("JavaEditorPreferencePage.wrapStrings");
-    //$NON-NLS-1$
-    Button button = addCheckBox(group, label, PreferenceConstants.EDITOR_WRAP_STRINGS, 1);
+    label = PreferencesMessages.getString("JavaEditorPreferencePage.wrapStringsDQ");//$NON-NLS-1$
+    Button button = addCheckBox(group, label, PreferenceConstants.EDITOR_WRAP_STRINGS_DQ, 1);
 
-    label = PreferencesMessages.getString("JavaEditorPreferencePage.escapeStrings");
-    //$NON-NLS-1$
-    fEscapeStringsButton = addCheckBox(group, label, PreferenceConstants.EDITOR_ESCAPE_STRINGS, 1);
-    createDependency(button, fEscapeStringsButton);
+    label = PreferencesMessages.getString("JavaEditorPreferencePage.escapeStringsDQ");//$NON-NLS-1$
+    fEscapeStringsButtonDQ = addCheckBox(group, label, PreferenceConstants.EDITOR_ESCAPE_STRINGS_DQ, 1);
+    createDependency(button, fEscapeStringsButtonDQ);
 
+    label = PreferencesMessages.getString("JavaEditorPreferencePage.wrapStringsSQ");//$NON-NLS-1$
+    addCheckBox(group, label, PreferenceConstants.EDITOR_WRAP_STRINGS_SQ, 1);
+
+    label = PreferencesMessages.getString("JavaEditorPreferencePage.escapeStringsSQ");
+    //$NON-NLS-1$
+    fEscapeStringsButtonSQ = addCheckBox(group, label, PreferenceConstants.EDITOR_ESCAPE_STRINGS_SQ, 1);
+    createDependency(button, fEscapeStringsButtonSQ);
+    
     label = PreferencesMessages.getString("JavaEditorPreferencePage.smartPaste");
     //$NON-NLS-1$
     addCheckBox(group, label, PreferenceConstants.EDITOR_SMART_PASTE, 1);
@@ -1426,7 +1438,8 @@ public class JavaEditorPreferencePage extends PreferencePage implements IWorkben
     //    boolean closeJavaDocs = fOverlayStore
     //        .getBoolean(PreferenceConstants.EDITOR_CLOSE_JAVADOCS);
     //    fAddJavaDocTagsButton.setEnabled(closeJavaDocs);
-    fEscapeStringsButton.setEnabled(fOverlayStore.getBoolean(PreferenceConstants.EDITOR_WRAP_STRINGS));
+    fEscapeStringsButtonDQ.setEnabled(fOverlayStore.getBoolean(PreferenceConstants.EDITOR_WRAP_STRINGS_DQ));
+    fEscapeStringsButtonSQ.setEnabled(fOverlayStore.getBoolean(PreferenceConstants.EDITOR_WRAP_STRINGS_SQ));
     //		boolean fillMethodArguments=
     // fOverlayStore.getBoolean(PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES);
     //		fGuessMethodArgumentsButton.setEnabled(fillMethodArguments);