Added new Option "Wrap PHPdocs and comments at print margin"

(disabled by default).

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 020ffd2..73543a2 100644 (file)
--- 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
@@ -473,6 +473,10 @@ public class JavaEditorPreferencePage extends PreferencePage implements IWorkben
     
     overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
         PreferenceConstants.EDITOR_ADD_JAVADOC_TAGS));
+    overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+        PreferenceConstants.EDITOR_FORMAT_JAVADOCS));
+    
+    
     overlayKeys
         .add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_SMART_HOME_END));
     overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
@@ -1113,6 +1117,11 @@ public class JavaEditorPreferencePage extends PreferencePage implements IWorkben
         //$NON-NLS-1$
         button = addCheckBox(group, label,
             PreferenceConstants.EDITOR_CLOSE_JAVADOCS, 1);
+        label = PreferencesMessages
+        .getString("JavaEditorPreferencePage.formatJavaDocs");
+    //$NON-NLS-1$
+    button = addCheckBox(group, label,
+        PreferenceConstants.EDITOR_FORMAT_JAVADOCS, 1);
     //
     //    label = PreferencesMessages
     //        .getString("JavaEditorPreferencePage.addJavaDocTags");

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages.properties b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages.properties
index 1e81929..5ba2d19 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages.properties
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages.properties
@@ -179,6 +179,7 @@ JavaEditorPreferencePage.closeStringsSQ= Close &single quoted strings
 JavaEditorPreferencePage.closeBrackets= Close &brackets and parenthesis
 JavaEditorPreferencePage.closeBraces= Cl&ose braces
 JavaEditorPreferencePage.closeJavaDocs= Close PHP&docs and comments
+JavaEditorPreferencePage.formatJavaDocs= &Wrap PHPdocs and comments at print margin
 JavaEditorPreferencePage.wrapWords= Wrap words
 JavaEditorPreferencePage.wrapStringsDQ= Wra&p double quoted PHP strings
 JavaEditorPreferencePage.escapeStringsDQ= &Escape text when pasting into a double quoted PHP string

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 98dccbb..01b7157 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
@@ -2395,7 +2395,7 @@ public class PreferenceConstants {
     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_FORMAT_JAVADOCS, false);
     store.setDefault(PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE, false);
 
     store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS_HTML, true);