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 c7e7b17..30cbe67 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
@@ -27,20 +27,19 @@ import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds;
 import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
 import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
+import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
 import net.sourceforge.phpdt.internal.ui.text.PreferencesAdapter;
 import net.sourceforge.phpdt.internal.ui.util.TabFolderLayout;
 import net.sourceforge.phpdt.ui.PreferenceConstants;
 import net.sourceforge.phpdt.ui.text.JavaTextTools;
+import net.sourceforge.phpdt.ui.text.PHPSourceViewerConfiguration;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.EditorUtility;
 import net.sourceforge.phpeclipse.phpeditor.JavaSourceViewer;
-import net.sourceforge.phpeclipse.phpeditor.PHPSourceViewerConfiguration;
 import net.sourceforge.phpeclipse.preferences.ColorEditor;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Preferences;
-import net.sourceforge.phpdt.internal.ui.preferences.FoldingConfigurationBlock;
-import net.sourceforge.phpdt.internal.ui.preferences.PreferencesMessages;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
@@ -52,7 +51,6 @@ import org.eclipse.jface.text.source.SourceViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Color;
@@ -309,7 +307,7 @@ public class JavaEditorPreferencePage extends PreferencePage implements
 
 //  private Button fAddJavaDocTagsButton;
 
-//  private Button fEscapeStringsButton;
+  private Button fEscapeStringsButton;
 
   //	private Button fGuessMethodArgumentsButton;
   private SourceViewer fPreviewViewer;
@@ -609,13 +607,13 @@ public class JavaEditorPreferencePage extends PreferencePage implements
     overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
         OverlayPreferenceStore.BOOLEAN,
         PreferenceConstants.EDITOR_CLOSE_BRACKETS_PHP));
-    overlayKeys
-        .add(new OverlayPreferenceStore.OverlayKey(
-            OverlayPreferenceStore.BOOLEAN,
-            PreferenceConstants.EDITOR_CLOSE_BRACES));
-    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
-        OverlayPreferenceStore.BOOLEAN,
-        PreferenceConstants.EDITOR_CLOSE_JAVADOCS));
+//    overlayKeys
+//        .add(new OverlayPreferenceStore.OverlayKey(
+//            OverlayPreferenceStore.BOOLEAN,
+//            PreferenceConstants.EDITOR_CLOSE_BRACES));
+//    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+//        OverlayPreferenceStore.BOOLEAN,
+//        PreferenceConstants.EDITOR_CLOSE_JAVADOCS));
     overlayKeys
         .add(new OverlayPreferenceStore.OverlayKey(
             OverlayPreferenceStore.BOOLEAN,
@@ -901,7 +899,7 @@ public class JavaEditorPreferencePage extends PreferencePage implements
         SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER, store);
 
     fPreviewViewer.configure(new PHPSourceViewerConfiguration(fJavaTextTools,
-        null));
+        null, IPHPPartitions.PHP_PARTITIONING));
     //		Font font= JFaceResources.getFont(PreferenceConstants.EDITOR_TEXT_FONT);
     //		fPreviewViewer.getTextWidget().setFont(font);
     fPreviewViewer.getTextWidget().setFont(
@@ -910,7 +908,8 @@ public class JavaEditorPreferencePage extends PreferencePage implements
     fPreviewViewer.setEditable(false);
     String content = loadPreviewContentFromFile("ColorSettingPreviewCode.txt"); //$NON-NLS-1$
     IDocument document = new Document(content);
-    fJavaTextTools.setupJavaDocumentPartitioner(document, ".php", null); //IJavaPartitions.JAVA_PARTITIONING);
+//    fJavaTextTools.setupJavaDocumentPartitioner(document, ".php", null); //IJavaPartitions.JAVA_PARTITIONING);
+    fJavaTextTools.setupJavaDocumentPartitioner(document, IPHPPartitions.PHP_PARTITIONING);
     fPreviewViewer.setDocument(document);
     return fPreviewViewer.getControl();
   }
@@ -1287,23 +1286,23 @@ public class JavaEditorPreferencePage extends PreferencePage implements
     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.escapeStrings");
-//    //$NON-NLS-1$
-//    fEscapeStringsButton = addCheckBox(group, label,
-//        PreferenceConstants.EDITOR_ESCAPE_STRINGS, 1);
-//    createDependency(button, fEscapeStringsButton);
+    label = PreferencesMessages
+        .getString("JavaEditorPreferencePage.wrapStrings");
+    //$NON-NLS-1$
+    Button button = addCheckBox(group, label,
+        PreferenceConstants.EDITOR_WRAP_STRINGS, 1);
 
-//    label = PreferencesMessages
-//        .getString("JavaEditorPreferencePage.smartPaste");
-//    //$NON-NLS-1$
-//    addCheckBox(group, label, PreferenceConstants.EDITOR_SMART_PASTE, 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.smartPaste");
+    //$NON-NLS-1$
+    addCheckBox(group, label, PreferenceConstants.EDITOR_SMART_PASTE, 1);
 
     label = PreferencesMessages
         .getString("JavaEditorPreferencePage.insertSpaceForTabs");
@@ -1324,7 +1323,7 @@ public class JavaEditorPreferencePage extends PreferencePage implements
 //        .getString("JavaEditorPreferencePage.closeBraces");
 //    //$NON-NLS-1$
 //    addCheckBox(group, label, PreferenceConstants.EDITOR_CLOSE_BRACES, 1);
-//
+
 //    label = PreferencesMessages
 //        .getString("JavaEditorPreferencePage.closeJavaDocs");
 //    //$NON-NLS-1$
@@ -1677,8 +1676,8 @@ public class JavaEditorPreferencePage extends PreferencePage implements
 //    boolean closeJavaDocs = fOverlayStore
 //        .getBoolean(PreferenceConstants.EDITOR_CLOSE_JAVADOCS);
 //    fAddJavaDocTagsButton.setEnabled(closeJavaDocs);
-//    fEscapeStringsButton.setEnabled(fOverlayStore
-//        .getBoolean(PreferenceConstants.EDITOR_WRAP_STRINGS));
+    fEscapeStringsButton.setEnabled(fOverlayStore
+        .getBoolean(PreferenceConstants.EDITOR_WRAP_STRINGS));
     //		boolean fillMethodArguments=
     // fOverlayStore.getBoolean(PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES);
     //		fGuessMethodArgumentsButton.setEnabled(fillMethodArguments);