From 07fec081b845925c6cb230fe09a759e457d4d494 Mon Sep 17 00:00:00 2001
From: toshihiro <toshihiro>
Date: Fri, 6 Apr 2007 04:49:43 +0000
Subject: [PATCH] 1. Fix #1589403 - wrap double/single quoted strings
2. Suppress 'Empty input' error message when opening preferences.
---
.../ui/preferences/JavaEditorPreferencePage.java | 4 +++-
.../sourceforge/phpdt/ui/PreferenceConstants.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
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 bfe24b5..c088d4e 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
@@ -1381,7 +1381,8 @@ public class JavaEditorPreferencePage extends PreferencePage implements
label = PreferencesMessages
.getString("JavaEditorPreferencePage.wrapStringsSQ");//$NON-NLS-1$
- addCheckBox(group, label, PreferenceConstants.EDITOR_WRAP_STRINGS_SQ, 1);
+ button = addCheckBox(group, label,
+ PreferenceConstants.EDITOR_WRAP_STRINGS_SQ, 1);
label = PreferencesMessages
.getString("JavaEditorPreferencePage.escapeStringsSQ");
@@ -1967,6 +1968,7 @@ public class JavaEditorPreferencePage extends PreferencePage implements
fTextFields.put(textControl, key);
if (isNumber) {
fNumberFields.add(textControl);
+ textControl.setText("0");
textControl.addModifyListener(fNumberFieldListener);
} else {
textControl.addModifyListener(fTextFieldListener);
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 c2b546c..16ea7d9 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
@@ -948,7 +948,7 @@ public class PreferenceConstants {
*
* @since 2.1
*/
- public final static String EDITOR_WRAP_STRINGS_SQ = "wrapStringsDQ"; //$NON-NLS-1$
+ public final static String EDITOR_WRAP_STRINGS_SQ = "wrapStringsSQ"; //$NON-NLS-1$
/**
* A named preference that controls whether the 'escape strings' feature is
--
1.7.1