diff -r b43452695c7b editor.lib2/src/org/netbeans/modules/editor/lib2/view/DocumentView.java
--- a/editor.lib2/src/org/netbeans/modules/editor/lib2/view/DocumentView.java	Thu Jun 30 10:22:19 2011 +0200
+++ b/editor.lib2/src/org/netbeans/modules/editor/lib2/view/DocumentView.java	Thu Jun 30 15:41:52 2011 +0200
@@ -1361,6 +1361,9 @@
     }
 
     int getTextLimitWidth() {
+        Object prop = textComponent.getClientProperty("TextLimitLine"); //NOI18N
+        if (prop instanceof Integer)
+            return (Integer)prop;
         checkSettingsInfo();
         if (defaultLimitLineWidth > 0) {
             return defaultLimitLineWidth;
diff -r b43452695c7b java.source/apichanges.xml
--- a/java.source/apichanges.xml	Thu Jun 30 10:22:19 2011 +0200
+++ b/java.source/apichanges.xml	Thu Jun 30 15:41:52 2011 +0200
@@ -108,6 +108,24 @@
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
+        <change id="comments-reformat">
+             <api name="general"/>
+             <summary>Added several methods to <code>CodeStyle</code> to support reformatting of comments.</summary>
+             <version major="0" minor="83"/>
+             <date day="28" month="6" year="2011"/>
+             <author login="dbalek"/>
+             <compatibility addition="yes" binary="compatible" deletion="no" deprecation="no" modification="no" semantic="compatible" source="compatible"/>
+             <description>
+                 Added <code>CodeStyle.enableBlockCommentFormatting</code>, <code>CodeStyle.enableJavadocFormatting</code>,
+                 <code>CodeStyle.wrapCommentText</code>, <code>CodeStyle.wrapOneLineComments</code>,
+                 <code>CodeStyle.preserveNewLinesInCommentst</code>, <code>CodeStyle.blankLineAfterJavadocDescription</code>,
+                 <code>CodeStyle.blankLineAfterJavadocParameterDescriptions</code>, <code>CodeStyle.blankLineAfterJavadocReturnTag</code>,
+                 <code>CodeStyle.generateParagraphTagOnBlankLines</code>, <code>CodeStyle.alignJavadocParameterDescriptions</code>,
+                 <code>CodeStyle.alignJavadocReturnDescriptions</code>, <code>CodeStyle.alignJavadocExceptionDescriptions</code>,
+                 to support reformatting of comments.
+             </description>
+             <issue number="20672"/>
+        </change>
         <change id="ClassIndex-package-scope">
              <api name="general"/>
              <summary>Added package search scope into <code>ClassIndex</code> to restrict search in given packages</summary>
diff -r b43452695c7b java.source/nbproject/project.properties
--- a/java.source/nbproject/project.properties	Thu Jun 30 10:22:19 2011 +0200
+++ b/java.source/nbproject/project.properties	Thu Jun 30 15:41:52 2011 +0200
@@ -46,7 +46,7 @@
 javadoc.title=Java Source
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=0.82.0
+spec.version.base=0.83.0
 test.qa-functional.cp.extra=${refactoring.java.dir}/modules/ext/javac-api-nb-7.0-b07.jar
 test.unit.run.cp.extra=${o.n.core.dir}/core/core.jar:\
     ${o.n.core.dir}/lib/boot.jar:\
diff -r b43452695c7b java.source/src/org/netbeans/api/java/source/CodeStyle.java
--- a/java.source/src/org/netbeans/api/java/source/CodeStyle.java	Thu Jun 30 10:22:19 2011 +0200
+++ b/java.source/src/org/netbeans/api/java/source/CodeStyle.java	Thu Jun 30 15:41:52 2011 +0200
@@ -767,6 +767,56 @@
         return null;
     }
 
+    // Comments -----------------------------------------------------------------
+
+    public boolean enableBlockCommentFormatting() {
+        return preferences.getBoolean(enableCommentFormatting, getDefaultAsBoolean(enableCommentFormatting));
+    }
+
+    public boolean enableJavadocFormatting() {
+        return preferences.getBoolean(enableCommentFormatting, getDefaultAsBoolean(enableCommentFormatting));
+    }
+
+    public boolean wrapCommentText() {
+        return preferences.getBoolean(wrapCommentText, getDefaultAsBoolean(wrapCommentText));
+    }
+
+    public boolean wrapOneLineComments() {
+        return preferences.getBoolean(wrapOneLineComment, getDefaultAsBoolean(wrapOneLineComment));
+    }
+
+    public boolean preserveNewLinesInComments() {
+        return preferences.getBoolean(preserveNewLinesInComments, getDefaultAsBoolean(preserveNewLinesInComments));
+    }
+
+    public boolean blankLineAfterJavadocDescription() {
+        return preferences.getBoolean(blankLineAfterJavadocDescription, getDefaultAsBoolean(blankLineAfterJavadocDescription));
+    }
+
+    public boolean blankLineAfterJavadocParameterDescriptions() {
+        return preferences.getBoolean(blankLineAfterJavadocParameterDescriptions, getDefaultAsBoolean(blankLineAfterJavadocParameterDescriptions));
+    }
+
+    public boolean blankLineAfterJavadocReturnTag() {
+        return preferences.getBoolean(blankLineAfterJavadocReturnTag, getDefaultAsBoolean(blankLineAfterJavadocReturnTag));
+    }
+
+    public boolean generateParagraphTagOnBlankLines() {
+        return preferences.getBoolean(generateParagraphTagOnBlankLines, getDefaultAsBoolean(generateParagraphTagOnBlankLines));
+    }
+
+    public boolean alignJavadocParameterDescriptions() {
+        return preferences.getBoolean(alignJavadocParameterDescriptions, getDefaultAsBoolean(alignJavadocParameterDescriptions));
+    }
+
+    public boolean alignJavadocReturnDescription() {
+        return preferences.getBoolean(alignJavadocReturnDescription, getDefaultAsBoolean(alignJavadocReturnDescription));
+    }
+
+    public boolean alignJavadocExceptionDescriptions() {
+        return preferences.getBoolean(alignJavadocExceptionDescriptions, getDefaultAsBoolean(alignJavadocExceptionDescriptions));
+    }
+
     // Nested classes ----------------------------------------------------------
 
     public enum BracePlacement {
diff -r b43452695c7b java.source/src/org/netbeans/modules/java/source/resources/layer.xml
--- a/java.source/src/org/netbeans/modules/java/source/resources/layer.xml	Thu Jun 30 10:22:19 2011 +0200
+++ b/java.source/src/org/netbeans/modules/java/source/resources/layer.xml	Thu Jun 30 15:41:52 2011 +0200
@@ -205,6 +205,11 @@
                           <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtSpaces.getController"/>
                           <attr name="position" intvalue="600"/>
                       </file>
+                      <file name="Comments.instance">
+                          <attr name="instanceOf" stringvalue="org.netbeans.modules.options.editor.spi.PreferencesCustomizer$Factory"/>
+                          <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtComments.getController"/>
+                          <attr name="position" intvalue="700"/>
+                      </file>
 <!--
                       <file name="CodeGeneration.instance">
                           <attr name="instanceOf" stringvalue="org.netbeans.spi.options.OptionsPanelController"/>
diff -r b43452695c7b java.source/src/org/netbeans/modules/java/source/save/Reformatter.java
--- a/java.source/src/org/netbeans/modules/java/source/save/Reformatter.java	Thu Jun 30 10:22:19 2011 +0200
+++ b/java.source/src/org/netbeans/modules/java/source/save/Reformatter.java	Thu Jun 30 15:41:52 2011 +0200
@@ -50,6 +50,7 @@
 
 import org.netbeans.api.java.classpath.ClassPath;
 import org.netbeans.api.java.lexer.JavaTokenId;
+import org.netbeans.api.java.lexer.JavadocTokenId;
 import org.netbeans.api.java.platform.JavaPlatformManager;
 import static org.netbeans.api.java.lexer.JavaTokenId.*;
 import org.netbeans.api.java.source.*;
@@ -63,6 +64,7 @@
 import org.netbeans.modules.java.source.JavaSourceAccessor;
 import org.netbeans.modules.java.source.parsing.FileObjects;
 import org.netbeans.modules.java.source.parsing.JavacParser;
+import org.netbeans.modules.java.source.usages.Pair;
 import org.netbeans.modules.parsing.api.Embedding;
 import org.netbeans.modules.parsing.api.ParserManager;
 import org.netbeans.modules.parsing.api.ResultIterator;
@@ -369,6 +371,13 @@
         private static final String EMPTY = ""; //NOI18N
         private static final String SPACE = " "; //NOI18N
         private static final String NEWLINE = "\n"; //NOI18N
+        private static final String LEADING_STAR = "*"; //NOI18N
+        private static final String P_TAG = "<p/>"; //NOI18N
+        private static final String PRE_TAG = "<pre>"; //NOI18N
+        private static final String PRE_END_TAG = "</pre>"; //NOI18N
+        private static final String PARAM_TAG = "@param"; //NOI18N
+        private static final String RETURN_TAG = "@return"; //NOI18N
+        private static final String THROWS_TAG = "@throws"; //NOI18N
         private static final String ERROR = "<error>"; //NOI18N
         private static final int ANY_COUNT = -1;
 
@@ -400,6 +409,7 @@
         private int startOffset;
         private int endOffset;
         private int tpLevel;
+        private int lastCommentIndex = -1;
 
         private Pretty(CompilationInfo info, TreePath path, CodeStyle cs, int startOffset, int endOffset, boolean templateEdit) {
             this(info.getText(), info.getTokenHierarchy().tokenSequence(JavaTokenId.language()),
@@ -2508,7 +2518,7 @@
                         if (idx >= 0)
                             tokenText = tokenText.substring(idx + 1);
                         col += getCol(tokenText);
-                        indentComment();
+                        reformatComment();
                         after = 2; //javadoc comment
                         break;
                     case BLOCK_COMMENT:
@@ -2541,7 +2551,7 @@
                         if (idx >= 0)
                             tokenText = tokenText.substring(idx + 1);
                         col += getCol(tokenText);
-                        indentComment();
+                        reformatComment();
                         after = 0;
                         break;
                     default:
@@ -2653,7 +2663,7 @@
                         if (idx >= 0)
                             tokenText = tokenText.substring(idx + 1);
                         col += getCol(tokenText);
-                        indentComment();
+                        reformatComment();
                         after = 2; //javadoc comment
                         break;
                     case BLOCK_COMMENT:
@@ -2698,7 +2708,7 @@
                         if (idx >= 0)
                             tokenText = tokenText.substring(idx + 1);
                         col += getCol(tokenText);
-                        indentComment();
+                        reformatComment();
                         after = 0;
                         break;
                     default:
@@ -2795,13 +2805,14 @@
                                 lastIdx = idx + 1;
                             }
                             if (lastIdx > 0) {
-                                String indent = getIndent();
-                                if (!indent.contentEquals(text.substring(lastIdx)))
-                                    addDiff(new Diff(offset + lastIdx, tokens.offset(), indent));
+                                String ind = getIndent();
+                                if (!ind.contentEquals(text.substring(lastIdx)))
+                                    addDiff(new Diff(offset + lastIdx, tokens.offset(), ind));
+                                col = indent;
                             }
                             lastToken = null;
                         }
-                        indentComment();
+                        reformatComment();
                         after = 3;
                         break;
                     case JAVADOC_COMMENT:
@@ -2827,18 +2838,20 @@
                             if (lastIdx == 0 && count < 0 && after != 1) {
                                 count = count == ANY_COUNT ? 1 : 0;
                             }
-                            String indent = after == 3 ? SPACE : getNewlines(count) + getIndent();
-                            if (!indent.contentEquals(text.substring(lastIdx)))
-                                addDiff(new Diff(offset + lastIdx, tokens.offset(), indent));
+                            String ind = after == 3 ? SPACE : getNewlines(count) + getIndent();
+                            if (!ind.contentEquals(text.substring(lastIdx)))
+                                addDiff(new Diff(offset + lastIdx, tokens.offset(), ind));
                             lastToken = null;
+                            col = after == 3 ? col + 1 : indent;
                         } else {
                             if (lastBlankLines < 0 && count == ANY_COUNT)
                                 count = lastBlankLines = 1;
                             String text = getNewlines(count) + getIndent();
                             if (text.length() > 0)
                                 addDiff(new Diff(tokens.offset(), tokens.offset(), text));
+                            col = indent;
                         }
-                        indentComment();
+                        reformatComment();
                         count = 0;
                         after = 2;
                         break;
@@ -3253,22 +3266,376 @@
             }
         }
         
-        private void indentComment() {
-            if (tokens.token().id() != BLOCK_COMMENT && tokens.token().id() != JAVADOC_COMMENT)
+        private void reformatComment() {
+            if ((tokens.token().id() != BLOCK_COMMENT && tokens.token().id() != JAVADOC_COMMENT)
+                    || tokens.index() <= lastCommentIndex)
                 return;
-            String indent = getIndent();
+            lastCommentIndex = tokens.index();
             String text = tokens.token().text().toString();
-            int idx = 0;
-            while ((idx = text.indexOf('\n', idx)) >= 0) { //NOI18N
-                int i = idx + 1;
-                while(i < text.length() && text.charAt(i) <= ' ' && text.charAt(i) != '\n') //NOI18N
-                    i++;
-                if (i >= text.length())
-                    break;
-                String s = text.charAt(i) == '*' ? indent + SPACE : indent;
-                if (!s.equals(text.substring(idx + 1, i)))
-                    addDiff(new Diff(tokens.offset() + idx + 1, tokens.offset() + i, s)); //NOI18N
-                idx = i;
+            int offset = tokens.offset();
+            TokenSequence<JavadocTokenId> javadocTokens = tokens.embedded(JavadocTokenId.language());
+            LinkedList<Pair<Integer, Integer>> marks = new LinkedList<Pair<Integer, Integer>>();
+            int maxParamNameLength = 0;
+            int maxExcNameLength = 0;
+            if (javadocTokens != null) {
+                int state = 0; // 0 - initial text, 1 - after param tag, 2 - param description, 3 - return description,
+                               // 4 - after throws tag, 5 - exception description, 6 - after pre tag, 7 - after other tag
+                int lastWSOffset = -1;
+                while (javadocTokens.moveNext()) {
+                    switch (javadocTokens.token().id()) {
+                        case TAG:
+                            String tokenText = javadocTokens.token().text().toString();
+                            int newState;
+                            if (PARAM_TAG.equalsIgnoreCase(tokenText)) {
+                                newState = 1;
+                            } else if (RETURN_TAG.equalsIgnoreCase(tokenText)) {
+                                newState = 3;
+                            } else if (THROWS_TAG.equalsIgnoreCase(tokenText)) {
+                                newState = 4;
+                            } else {
+                                newState = 7;
+                            }
+                            if (lastWSOffset >= 0) {
+                                marks.add(Pair.of(lastWSOffset, state == 0 && cs.blankLineAfterJavadocDescription()
+                                        || state == 2 && newState != 1 && cs.blankLineAfterJavadocParameterDescriptions()
+                                        || state == 3 && cs.blankLineAfterJavadocReturnTag() ? 0 : 1));
+                            }
+                            state = newState;
+                            if (state == 3 && cs.alignJavadocReturnDescription()) {
+                                marks.add(Pair.of(javadocTokens.offset() + javadocTokens.token().length() - offset, 3));
+                            }
+                            lastWSOffset = -1;
+                            break;
+                        case IDENT:
+                            if (state == 1) {
+                                int len = javadocTokens.token().length();
+                                if (len > maxParamNameLength)
+                                    maxParamNameLength = len;
+                                if (cs.alignJavadocParameterDescriptions())
+                                    marks.add(Pair.of(javadocTokens.offset() + len - offset, 2));
+                                state = 2;
+                            } else if (state == 4) {
+                                int len = javadocTokens.token().length();
+                                if (len > maxExcNameLength)
+                                    maxExcNameLength = len;
+                                if (cs.alignJavadocExceptionDescriptions())
+                                    marks.add(Pair.of(javadocTokens.offset() + len - offset, 4));
+                                state = 5;
+                            }
+                            lastWSOffset = -1;
+                            break;
+                        case OTHER_TEXT:
+                            lastWSOffset = -1;
+                            CharSequence cseq = javadocTokens.token().text();
+                            int nlNum = 1;
+                            for (int i = cseq.length(); i >= 0; i--) {
+                                if (i == 0) {
+                                    lastWSOffset = javadocTokens.offset() - offset;
+                                } else {
+                                    char c = cseq.charAt(i - 1);
+                                    if (c == '\n') {
+                                        if (--nlNum < 0) {
+                                            break;
+                                        }
+                                    } else if (!Character.isWhitespace(c) && c != '*') {
+                                        lastWSOffset = javadocTokens.offset() + i - offset;
+                                        break;
+                                    }
+                                }
+                            }
+                            break;
+                        case HTML_TAG:
+                            tokenText = javadocTokens.token().text().toString();
+                            if (PRE_TAG.equalsIgnoreCase(tokenText)) {
+                                if (lastWSOffset >= 0) {
+                                    marks.add(Pair.of(lastWSOffset, 1));
+                                }
+                                marks.add(Pair.of(javadocTokens.offset() - offset, 5));
+                            } else if (PRE_END_TAG.equalsIgnoreCase(tokenText)) {
+                                marks.add(Pair.of(lastWSOffset >= 0 ? lastWSOffset : javadocTokens.offset() - offset, 6));
+                            }
+                            lastWSOffset = -1;
+                            break;
+                    }
+                }
+            }
+            int checkOffset, actionType; // 0 - add blank line, 1 - add newline, 2 - align params, 3 - align return,
+                                         // 4 - align exceptions, 5 - no format, 6 - format
+            Iterator<Pair<Integer, Integer>> it = marks.iterator();
+            if (it.hasNext()) {
+                Pair<Integer, Integer> next = it.next();
+                checkOffset = next.first;
+                actionType = next.second;
+            } else {
+                checkOffset = Integer.MAX_VALUE;
+                actionType = -1;
+            }
+            String indentString = getIndent();
+            String lineStartString = cs.addLeadingStarInComment() ? indentString + SPACE + LEADING_STAR + SPACE : indentString + SPACE;
+            String blankLineString;
+            if (cs.generateParagraphTagOnBlankLines()) {
+                blankLineString = cs.addLeadingStarInComment() ? indentString + SPACE + LEADING_STAR + SPACE + P_TAG : indentString + SPACE + P_TAG;
+            } else {
+                blankLineString = cs.addLeadingStarInComment() ? indentString + SPACE + LEADING_STAR : EMPTY;
+            }
+            int currNWSPos = -1;
+            int lastNWSPos = -1;
+            int currWSPos = -1;
+            int lastWSPos = -1;
+            int lastNewLinePos = -1;
+            Diff pendingDiff = null;
+            int start = javadocTokens != null ? 3 : 2;
+            col += start;
+            boolean preserveNewLines = true;
+            boolean firstLine = true;
+            boolean enableCommentFormatting = javadocTokens != null ? cs.enableJavadocFormatting() : cs.enableBlockCommentFormatting();
+            boolean noFormat = false;
+            int align = -1;
+            for (int i = start; i < text.length(); i++) {
+                char c = text.charAt(i);
+                if (Character.isWhitespace(c)) {
+                    if (enableCommentFormatting) {
+                        if (currNWSPos >= 0) {
+                            lastNWSPos = currNWSPos;
+                            currNWSPos = -1;
+                        }
+                        if (currWSPos < 0) {
+                            currWSPos = i;
+                            if (col > cs.getRightMargin() && cs.wrapCommentText() && !noFormat && lastWSPos >= 0) {
+                                int endOff = pendingDiff != null ? pendingDiff.getEndOffset() - offset : lastWSPos + 1;
+                                String s = NEWLINE + lineStartString;
+                                col = getCol(lineStartString) + i - endOff;
+                                if (align > 0) {
+                                    int num = align - lineStartString.length();
+                                    if (num > 0) {
+                                        s += getSpaces(num);
+                                        col += num;
+                                    }
+                                }
+                                addDiff(new Diff(offset + lastWSPos, offset + endOff, s));
+                            } else if (pendingDiff != null) {
+                                addDiff(pendingDiff);
+                                col++;
+                            } else {
+                                col++;
+                            }
+                            pendingDiff = null;
+                        }
+                    }
+                    if (c == '\n') {
+                        if (lastNewLinePos >= 0) {
+                            if (enableCommentFormatting) {
+                                String subs = text.substring(lastNewLinePos + 1, i);
+                                if (!blankLineString.equals(subs)) {
+                                    addDiff(new Diff(offset + lastNewLinePos + 1, offset + i, blankLineString));
+                                }
+                            }
+                            preserveNewLines = true;
+                        }
+                        firstLine = false;
+                        lastNewLinePos = i;
+                    }
+                } else {
+                    if (enableCommentFormatting) {
+                        if (currNWSPos < 0) {
+                            currNWSPos = i;
+                        }
+                        if (i >= checkOffset) {
+                            noFormat = false;                                    
+                            switch (actionType) {
+                                case 0:
+                                    addDiff(new Diff(currWSPos >= 0 ? offset + currWSPos : offset + i, offset + i, NEWLINE + blankLineString + NEWLINE));
+                                    lastNewLinePos = currWSPos >= 0 ? currWSPos : i - 1;
+                                    preserveNewLines = true;
+                                    align = -1;
+                                    break;
+                                case 1:
+                                    addDiff(new Diff(currWSPos >= 0 ? offset + currWSPos : offset + i, offset + i, NEWLINE));
+                                    lastNewLinePos = currWSPos >= 0 ? currWSPos : i - 1;
+                                    preserveNewLines = true;
+                                    align = -1;
+                                    break;
+                                case 2:
+                                    int num = maxParamNameLength + lastNWSPos - currWSPos;
+                                    if (num > 0) {
+                                        addDiff(new Diff(offset + i, offset + i, getSpaces(num)));
+                                        col += num;
+                                    }
+                                    align = col;
+                                    break;
+                                case 3:
+                                    align = col;
+                                    break;
+                                case 4:
+                                    num = maxExcNameLength + lastNWSPos - currWSPos;
+                                    if (num > 0) {
+                                        addDiff(new Diff(offset + i, offset + i, getSpaces(num)));
+                                        col += num;
+                                    }
+                                    align = col;
+                                    break;
+                                case 5:
+                                    noFormat = true;
+                                    align = -1;
+                                    break;
+                                case 6:
+                                    preserveNewLines = true;
+                                    align = -1;
+                                    break;
+                            }
+                            if (it.hasNext()) {
+                                Pair<Integer, Integer> next = it.next();
+                                checkOffset = next.first;
+                                actionType = next.second;
+                            } else {
+                                checkOffset = Integer.MAX_VALUE;
+                                actionType = -1;
+                            }
+                        }
+                    }
+                    if (lastNewLinePos >= 0) {
+                        if (pendingDiff != null) {
+                            addDiff(pendingDiff);
+                            pendingDiff = null;
+                        }
+                        if (!preserveNewLines && !noFormat && i < text.length() - 2 && enableCommentFormatting && !cs.preserveNewLinesInComments() && cs.wrapCommentText()) {
+                            lastWSPos = lastNewLinePos;
+                            pendingDiff = new Diff(offset + lastNewLinePos, offset + i, SPACE);
+                            lastNewLinePos = -1;
+                            if (c == '*') {
+                                while(++i < text.length()) {
+                                    col++;
+                                    c = text.charAt(i);
+                                    if (c == '\n') {
+                                        pendingDiff.start++;
+                                        pendingDiff.text = blankLineString;
+                                        preserveNewLines = true;
+                                        lastNewLinePos = i;
+                                        break;
+                                    } else if (!Character.isWhitespace(c)) {
+                                        break;
+                                    }
+                                }
+                                if (pendingDiff != null)
+                                    pendingDiff.end = offset + i;
+                            }
+                        } else {
+                            String s = indentString + SPACE;
+                            String subs = text.substring(lastNewLinePos + 1, i);
+                            if (!s.equals(subs))
+                                pendingDiff = new Diff(offset + lastNewLinePos + 1, offset + i, s);
+                            lastWSPos = currWSPos = -1;
+                            lastNewLinePos = -1;
+                            col = getCol(s);
+                            if (enableCommentFormatting) {
+                                if (c == '*') {
+                                    col++;
+                                    while (++i < text.length()) {
+                                        c = text.charAt(i);
+                                        if (c == '\n') {
+                                            if (!cs.addLeadingStarInComment()) {
+                                                if (pendingDiff != null) {
+                                                    pendingDiff.end = offset + i;
+                                                    pendingDiff.text = blankLineString;
+                                                } else {
+                                                    pendingDiff = new Diff(offset + lastNewLinePos + 1, offset + i, blankLineString);
+                                                }
+                                            } else if (currWSPos >= 0) {
+                                                if (pendingDiff != null) {
+                                                    addDiff(pendingDiff);
+                                                }
+                                                pendingDiff = new Diff(offset + currWSPos, offset + i, cs.generateParagraphTagOnBlankLines() ? SPACE + P_TAG : EMPTY);
+                                            }
+                                            currWSPos = -1;
+                                            lastNewLinePos = i;
+                                            break;
+                                        } else if (Character.isWhitespace(c)) {
+                                            if (currWSPos < 0) {
+                                                currWSPos = i;
+                                                col++;
+                                            }
+                                        } else if (c == '*' || c == '/') {
+                                            col++;
+                                            break;
+                                        } else {
+                                            if (!cs.addLeadingStarInComment()) {
+                                                if (noFormat) {
+                                                    if (pendingDiff != null) {
+                                                        pendingDiff.end = currWSPos >= 0 ? offset + currWSPos + 1 : pendingDiff.end + 1;
+                                                    } else {
+                                                        pendingDiff = new Diff(offset + lastNewLinePos + 1, currWSPos >= 0 ? offset + currWSPos + 1 : offset + i, indentString);
+                                                    }
+                                                    
+                                                } else {
+                                                    if (pendingDiff != null) {
+                                                        pendingDiff.end = offset + i;
+                                                    } else {
+                                                        pendingDiff = new Diff(offset + lastNewLinePos + 1, offset + i, indentString);
+                                                    }
+                                                    col = indent;
+                                                }
+                                            } else { 
+                                                if (currWSPos < 0) {
+                                                    currWSPos = i;
+                                                    col++;
+                                                }
+                                                subs = text.substring(currWSPos, i);
+                                                if (!noFormat && !SPACE.equals(subs)) {
+                                                    if (pendingDiff != null)
+                                                        addDiff(pendingDiff);
+                                                    pendingDiff = new Diff(offset + currWSPos, offset + i, SPACE);                                                    
+                                                }
+                                            }
+                                            currWSPos = -1;
+                                            break;
+                                        }
+                                    }
+                                } else if (cs.addLeadingStarInComment()) {
+                                    if (pendingDiff != null) {
+                                        pendingDiff.text += (LEADING_STAR + SPACE);
+                                    } else {
+                                        pendingDiff = new Diff(offset + i, offset + i, LEADING_STAR + SPACE);
+                                    }
+                                    col += 2;
+                                }
+                            }
+                            if (pendingDiff != null) {
+                                addDiff(pendingDiff);
+                                pendingDiff = null;
+                            }
+                        }
+                    } else if (enableCommentFormatting) {
+                        if (firstLine) {
+                            String s = cs.wrapOneLineComments() ? NEWLINE + lineStartString : SPACE;
+                            String sub = currWSPos >= 0 ? text.substring(currWSPos, i) : null;
+                            if (!s.equals(sub))
+                                addDiff(new Diff(currWSPos >= 0 ? offset + currWSPos : offset + i, offset + i, s));
+                            col = getCol(s);
+                            firstLine = false;
+                        } else if (currWSPos >= 0) {
+                            lastWSPos = currWSPos;
+                            if (currWSPos < i - 1)
+                                pendingDiff = new Diff(offset + currWSPos + 1, offset + i, null);
+                        } else if (c != '*') {
+                            preserveNewLines = false;
+                        }
+                    } else if (c != '*') {
+                        preserveNewLines = false;
+                    }
+                    currWSPos = -1;
+                    col++;
+                }
+            }
+            if (enableCommentFormatting) {
+                for (int i = text.length() - 3; i >= 0; i--) {
+                    char c = text.charAt(i);
+                    if (c == '\n') {
+                        break;
+                    } else if (!Character.isWhitespace(c)) {
+                        addDiff(new Diff(offset + i + 1, offset + text.length() - 2, cs.wrapOneLineComments() ? NEWLINE + indentString + SPACE : SPACE));
+                        break;
+                    }
+                }
             }
         }
 
diff -r b43452695c7b java.source/src/org/netbeans/modules/java/ui/Bundle.properties
--- a/java.source/src/org/netbeans/modules/java/ui/Bundle.properties	Thu Jun 30 10:22:19 2011 +0200
+++ b/java.source/src/org/netbeans/modules/java/ui/Bundle.properties	Thu Jun 30 15:41:52 2011 +0200
@@ -226,6 +226,22 @@
 
 LBL_IndentCasesFromSwitch=Indent Case Statements In &Switch
 
+LBL_Comments=Comments
+LBL_doc_enableCommentFormat=Enable Comments Formatting
+LBL_doc_generalLabel=General
+LBL_doc_addLeadingStar=Add Leading Star
+LBL_doc_wrapCommentText=Wrap Text At Right Margin
+LBL_doc_wrapOneLineCheckBox=Wrap One Line Comments
+LBL_doc_preserveNewLinesCheckBox=Preserve New Lines
+LBL_doc_javadocLabel=Javadoc
+LBL_doc_blankLineAfterDescCheckBox=Add Blank Line After Description
+LBL_doc_blankLineAfterParamsCheckBox=Add Blank Line After Parameter Descriptions
+LBL_doc_blankLineAfterReturnCheckBox=Add Blank Line After Return Tag
+LBL_doc_generatePCheckBox=Genarete "<p/>" On Blank Lines
+LBL_doc_alignParamsCheckBox=Align Parameter Descriptions
+LBL_doc_alignReturnCheckBox=Align Return Value Descriptions
+LBL_doc_alignExceptionsCheckBox=Align Exception Descriptions
+
 # Following entries (marked) as samples are used as examples in the formating
 # options. It is highly discourage to localize them unless absolutely necessary.
 
@@ -402,11 +418,27 @@
 }\
 } }
 
+SAMPLE_Comments=public class ClassA {\n\
+/**\n\
+This  is  the first part of a  sample  method  description.\n\
+The second part is placed after a manual newline.\n\
+\n\
+The last part is placed after an empty line.\n\
+@param text the first parameter description\n\
+@param number the second parameter description\n\
+@return this is the return value description\n\
+@throws ExcepA the first exception description\n\
+@throws ExcB the second exception description\n\
+*/\n\
+public String meth(String text, int number) throws ExceptionA, ExcB {\n\
+/*This is one line comment*/\n\
+return number > 0 ? text : null;\n\
+}\n\
+}
 
 
 nlFinallyCheckBox1.text="finall&y"
 
-
 AN_Preview=Preview
 AD_Preview=Preview
 FmtTabsIndents.absoluteLabelIndentCheckBox.AccessibleContext.accessibleDescription=Indent Labels absolutely
diff -r b43452695c7b java.source/src/org/netbeans/modules/java/ui/FmtComments.form
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java.source/src/org/netbeans/modules/java/ui/FmtComments.form	Thu Jun 30 15:41:52 2011 +0200
@@ -0,0 +1,221 @@
+<?xml version="1.1" encoding="UTF-8" ?>
+
+<Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <Properties>
+    <Property name="name" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+      <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_Comments" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+    </Property>
+  </Properties>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+  </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" attributes="0">
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="enableCommentFormatCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="generalLabel" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="jSeparator1" pref="329" max="32767" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace min="12" pref="12" max="12" attributes="0"/>
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="wrapCommentTextCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="addLeadingStarCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="wrapOneLineCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="preserveNewLinesCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="javadocLabel" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="jSeparator2" pref="328" max="32767" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace min="12" pref="12" max="12" attributes="0"/>
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="blankLineAfterParamsCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="blankLineAfterDescCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="blankLineAfterReturnCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="generatePCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="alignParamsCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="alignReturnCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="alignExceptionsCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                  </Group>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
+              <Component id="enableCommentFormatCheckBox" min="-2" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Group type="102" attributes="0">
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="generalLabel" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="1" attributes="0">
+                      <EmptySpace min="-2" pref="16" max="-2" attributes="0"/>
+                      <Component id="jSeparator1" min="-2" pref="7" max="-2" attributes="0"/>
+                  </Group>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="addLeadingStarCheckBox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="wrapCommentTextCheckBox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="wrapOneLineCheckBox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="preserveNewLinesCheckBox" min="-2" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Group type="102" attributes="0">
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="javadocLabel" min="-2" max="-2" attributes="1"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace min="-2" pref="15" max="-2" attributes="0"/>
+                      <Component id="jSeparator2" min="-2" max="-2" attributes="1"/>
+                  </Group>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="blankLineAfterDescCheckBox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="blankLineAfterParamsCheckBox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="blankLineAfterReturnCheckBox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="generatePCheckBox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="alignParamsCheckBox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="alignReturnCheckBox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="alignExceptionsCheckBox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace pref="20" max="32767" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+  <SubComponents>
+    <Component class="javax.swing.JCheckBox" name="enableCommentFormatCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_enableCommentFormat" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="enableCommentFormatCheckBoxActionPerformed"/>
+      </Events>
+    </Component>
+    <Component class="javax.swing.JLabel" name="generalLabel">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_generalLabel" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JSeparator" name="jSeparator1">
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="addLeadingStarCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_addLeadingStar" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="wrapCommentTextCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_wrapCommentText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="wrapOneLineCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_wrapOneLineCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="preserveNewLinesCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_preserveNewLinesCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="javadocLabel">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_javadocLabel" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JSeparator" name="jSeparator2">
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="blankLineAfterDescCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_blankLineAfterDescCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="blankLineAfterParamsCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_blankLineAfterParamsCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="blankLineAfterReturnCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_blankLineAfterReturnCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="generatePCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_generatePCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="alignParamsCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_alignParamsCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="alignReturnCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_alignReturnCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="alignExceptionsCheckBox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_doc_alignExceptionsCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+  </SubComponents>
+</Form>
diff -r b43452695c7b java.source/src/org/netbeans/modules/java/ui/FmtComments.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java.source/src/org/netbeans/modules/java/ui/FmtComments.java	Thu Jun 30 15:41:52 2011 +0200
@@ -0,0 +1,258 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2011 Sun Microsystems, Inc.
+ */
+
+package org.netbeans.modules.java.ui;
+
+import static org.netbeans.modules.java.ui.FmtOptions.*;
+import static org.netbeans.modules.java.ui.FmtOptions.CategorySupport.OPTION_ID;
+import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
+
+/**
+ *
+ * @author Dusan Balek
+ */
+public class FmtComments extends javax.swing.JPanel implements Runnable {
+
+    /** Creates new form FmtComments */
+    public FmtComments() {
+        initComponents();
+        enableCommentFormatCheckBox.putClientProperty(OPTION_ID, enableCommentFormatting);
+        addLeadingStarCheckBox.putClientProperty(OPTION_ID, addLeadingStarInComment);
+        wrapCommentTextCheckBox.putClientProperty(OPTION_ID, wrapCommentText);
+        wrapOneLineCheckBox.putClientProperty(OPTION_ID, wrapOneLineComment);
+        preserveNewLinesCheckBox.putClientProperty(OPTION_ID, preserveNewLinesInComments);
+        blankLineAfterDescCheckBox.putClientProperty(OPTION_ID, blankLineAfterJavadocDescription);
+        blankLineAfterParamsCheckBox.putClientProperty(OPTION_ID, blankLineAfterJavadocParameterDescriptions);
+        blankLineAfterReturnCheckBox.putClientProperty(OPTION_ID, blankLineAfterJavadocReturnTag);
+        generatePCheckBox.putClientProperty(OPTION_ID, generateParagraphTagOnBlankLines);
+        alignParamsCheckBox.putClientProperty(OPTION_ID, alignJavadocParameterDescriptions);
+        alignReturnCheckBox.putClientProperty(OPTION_ID, alignJavadocReturnDescription);
+        alignExceptionsCheckBox.putClientProperty(OPTION_ID, alignJavadocExceptionDescriptions);
+    }
+
+    public static PreferencesCustomizer.Factory getController() {
+        return new CategorySupport.Factory("comments", FmtComments.class, //NOI18N
+                org.openide.util.NbBundle.getMessage(FmtComments.class, "SAMPLE_Comments"), // NOI18N
+                new String[] { FmtOptions.rightMargin, "45" }, //NOI18N
+                new String[] { FmtOptions.blankLinesBeforeClass, "0" }); //NOI18N
+    }    
+
+    @Override
+    public void run() {
+        enableControls(enableCommentFormatCheckBox.isSelected());
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    @SuppressWarnings("unchecked")
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        enableCommentFormatCheckBox = new javax.swing.JCheckBox();
+        generalLabel = new javax.swing.JLabel();
+        jSeparator1 = new javax.swing.JSeparator();
+        addLeadingStarCheckBox = new javax.swing.JCheckBox();
+        wrapCommentTextCheckBox = new javax.swing.JCheckBox();
+        wrapOneLineCheckBox = new javax.swing.JCheckBox();
+        preserveNewLinesCheckBox = new javax.swing.JCheckBox();
+        javadocLabel = new javax.swing.JLabel();
+        jSeparator2 = new javax.swing.JSeparator();
+        blankLineAfterDescCheckBox = new javax.swing.JCheckBox();
+        blankLineAfterParamsCheckBox = new javax.swing.JCheckBox();
+        blankLineAfterReturnCheckBox = new javax.swing.JCheckBox();
+        generatePCheckBox = new javax.swing.JCheckBox();
+        alignParamsCheckBox = new javax.swing.JCheckBox();
+        alignReturnCheckBox = new javax.swing.JCheckBox();
+        alignExceptionsCheckBox = new javax.swing.JCheckBox();
+
+        setName(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_Comments")); // NOI18N
+
+        enableCommentFormatCheckBox.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_enableCommentFormat")); // NOI18N
+        enableCommentFormatCheckBox.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                enableCommentFormatCheckBoxActionPerformed(evt);
+            }
+        });
+
+        generalLabel.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_generalLabel")); // NOI18N
+
+        addLeadingStarCheckBox.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_addLeadingStar")); // NOI18N
+
+        wrapCommentTextCheckBox.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_wrapCommentText")); // NOI18N
+
+        wrapOneLineCheckBox.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_wrapOneLineCheckBox")); // NOI18N
+
+        preserveNewLinesCheckBox.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_preserveNewLinesCheckBox")); // NOI18N
+
+        javadocLabel.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_javadocLabel")); // NOI18N
+
+        blankLineAfterDescCheckBox.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_blankLineAfterDescCheckBox")); // NOI18N
+
+        blankLineAfterParamsCheckBox.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_blankLineAfterParamsCheckBox")); // NOI18N
+
+        blankLineAfterReturnCheckBox.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_blankLineAfterReturnCheckBox")); // NOI18N
+
+        generatePCheckBox.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_generatePCheckBox")); // NOI18N
+
+        alignParamsCheckBox.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_alignParamsCheckBox")); // NOI18N
+
+        alignReturnCheckBox.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_alignReturnCheckBox")); // NOI18N
+
+        alignExceptionsCheckBox.setText(org.openide.util.NbBundle.getMessage(FmtComments.class, "LBL_doc_alignExceptionsCheckBox")); // NOI18N
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+        this.setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(enableCommentFormatCheckBox)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(generalLabel)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 329, Short.MAX_VALUE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(12, 12, 12)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(wrapCommentTextCheckBox)
+                            .addComponent(addLeadingStarCheckBox)
+                            .addComponent(wrapOneLineCheckBox)
+                            .addComponent(preserveNewLinesCheckBox)))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(javadocLabel)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(jSeparator2, javax.swing.GroupLayout.DEFAULT_SIZE, 328, Short.MAX_VALUE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(12, 12, 12)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(blankLineAfterParamsCheckBox)
+                            .addComponent(blankLineAfterDescCheckBox)
+                            .addComponent(blankLineAfterReturnCheckBox)
+                            .addComponent(generatePCheckBox)
+                            .addComponent(alignParamsCheckBox)
+                            .addComponent(alignReturnCheckBox)
+                            .addComponent(alignExceptionsCheckBox))))
+                .addContainerGap())
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(enableCommentFormatCheckBox)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(generalLabel))
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                        .addGap(16, 16, 16)
+                        .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 7, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(addLeadingStarCheckBox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(wrapCommentTextCheckBox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(wrapOneLineCheckBox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(preserveNewLinesCheckBox)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(javadocLabel))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(15, 15, 15)
+                        .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(blankLineAfterDescCheckBox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(blankLineAfterParamsCheckBox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(blankLineAfterReturnCheckBox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(generatePCheckBox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(alignParamsCheckBox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(alignReturnCheckBox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(alignExceptionsCheckBox)
+                .addContainerGap(20, Short.MAX_VALUE))
+        );
+    }// </editor-fold>//GEN-END:initComponents
+
+private void enableCommentFormatCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_enableCommentFormatCheckBoxActionPerformed
+    enableControls(enableCommentFormatCheckBox.isSelected());
+}//GEN-LAST:event_enableCommentFormatCheckBoxActionPerformed
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JCheckBox addLeadingStarCheckBox;
+    private javax.swing.JCheckBox alignExceptionsCheckBox;
+    private javax.swing.JCheckBox alignParamsCheckBox;
+    private javax.swing.JCheckBox alignReturnCheckBox;
+    private javax.swing.JCheckBox blankLineAfterDescCheckBox;
+    private javax.swing.JCheckBox blankLineAfterParamsCheckBox;
+    private javax.swing.JCheckBox blankLineAfterReturnCheckBox;
+    private javax.swing.JCheckBox enableCommentFormatCheckBox;
+    private javax.swing.JLabel generalLabel;
+    private javax.swing.JCheckBox generatePCheckBox;
+    private javax.swing.JSeparator jSeparator1;
+    private javax.swing.JSeparator jSeparator2;
+    private javax.swing.JLabel javadocLabel;
+    private javax.swing.JCheckBox preserveNewLinesCheckBox;
+    private javax.swing.JCheckBox wrapCommentTextCheckBox;
+    private javax.swing.JCheckBox wrapOneLineCheckBox;
+    // End of variables declaration//GEN-END:variables
+
+    private void enableControls(boolean b) {
+        addLeadingStarCheckBox.setEnabled(b);
+        alignExceptionsCheckBox.setEnabled(b);
+        alignParamsCheckBox.setEnabled(b);
+        blankLineAfterDescCheckBox.setEnabled(b);
+        blankLineAfterParamsCheckBox.setEnabled(b);
+        blankLineAfterReturnCheckBox.setEnabled(b);
+        generatePCheckBox.setEnabled(b);
+        preserveNewLinesCheckBox.setEnabled(b);
+        wrapCommentTextCheckBox.setEnabled(b);
+        wrapOneLineCheckBox.setEnabled(b);
+    }
+}
diff -r b43452695c7b java.source/src/org/netbeans/modules/java/ui/FmtOptions.java
--- a/java.source/src/org/netbeans/modules/java/ui/FmtOptions.java	Thu Jun 30 10:22:19 2011 +0200
+++ b/java.source/src/org/netbeans/modules/java/ui/FmtOptions.java	Thu Jun 30 15:41:52 2011 +0200
@@ -239,6 +239,18 @@
     public static final String packagesForStarImport = "packagesForStarImport"; //NOI18N
     public static final String importsOrder = "importsOrder"; //NOI18N
     
+    public static final String enableCommentFormatting = "enableCommentFormatting"; //NOI18N
+    public static final String wrapCommentText = "wrapCommentText"; //NOI18N
+    public static final String wrapOneLineComment = "wrapOneLineComment"; //NOI18N
+    public static final String preserveNewLinesInComments = "preserveNewLinesInComments"; //NOI18N
+    public static final String blankLineAfterJavadocDescription = "blankLineAfterJavadocDescription"; //NOI18N
+    public static final String blankLineAfterJavadocParameterDescriptions = "blankLineAfterJavadocParameterDescriptions"; //NOI18N
+    public static final String blankLineAfterJavadocReturnTag = "blankLineAfterJavadocReturnTag"; //NOI18N
+    public static final String generateParagraphTagOnBlankLines = "generateParagraphTagOnBlankLines"; //NOI18N
+    public static final String alignJavadocParameterDescriptions = "alignJavadocParameterDescriptions"; //NOI18N
+    public static final String alignJavadocReturnDescription = "alignJavadocReturnDescription"; //NOI18N
+    public static final String alignJavadocExceptionDescriptions = "alignJavadocExceptionDescriptions"; //NOI18N
+
     public static CodeStyleProducer codeStyleProducer;
     
     static final String CODE_STYLE_PROFILE = "CodeStyle"; // NOI18N
@@ -477,6 +489,18 @@
             { countForUsingStaticStarImport, "3"}, //NOI18N // XXX
             { packagesForStarImport, ""}, //NOI18N // XXX
             { importsOrder, ""}, //NOI18N // XXX
+            
+            { enableCommentFormatting, TRUE}, //NOI18N
+            { wrapCommentText, TRUE}, //NOI18N
+            { wrapOneLineComment, TRUE}, //NOI18N
+            { preserveNewLinesInComments, FALSE}, //NOI18N
+            { blankLineAfterJavadocDescription, TRUE}, //NOI18N
+            { blankLineAfterJavadocParameterDescriptions, FALSE}, //NOI18N
+            { blankLineAfterJavadocReturnTag, FALSE}, //NOI18N
+            { generateParagraphTagOnBlankLines, TRUE}, //NOI18N
+            { alignJavadocParameterDescriptions, FALSE}, //NOI18N
+            { alignJavadocReturnDescription, FALSE}, //NOI18N
+            { alignJavadocExceptionDescriptions, FALSE}, //NOI18N                        
         };
         
         defaults = new HashMap<String,String>();
@@ -543,7 +567,7 @@
             for (String[] option : forcedOptions) {
                 forcedPrefs.put( option[0], option[1]);
             }
-            this.previewPrefs = new ProxyPreferences(preferences, forcedPrefs);
+            this.previewPrefs = new ProxyPreferences(forcedPrefs, preferences);
 
             // Load and hook up all the components
             loadFrom(preferences);
@@ -671,7 +695,10 @@
 
             public PreferencesCustomizer create(Preferences preferences) {
                 try {
-                    return new CategorySupport(preferences, id, panelClass.newInstance(), previewText, forcedOptions);
+                    CategorySupport categorySupport = new CategorySupport(preferences, id, panelClass.newInstance(), previewText, forcedOptions);
+                    if (categorySupport.panel instanceof Runnable)
+                        ((Runnable)categorySupport.panel).run();
+                    return categorySupport;
                 } catch (Exception e) {
                     return null;
                 }
diff -r b43452695c7b java.source/src/org/netbeans/modules/java/ui/FmtTabsIndents.form
--- a/java.source/src/org/netbeans/modules/java/ui/FmtTabsIndents.form	Thu Jun 30 10:22:19 2011 +0200
+++ b/java.source/src/org/netbeans/modules/java/ui/FmtTabsIndents.form	Thu Jun 30 15:41:52 2011 +0200
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
 
 <Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <Properties>
@@ -7,9 +7,6 @@
     </Property>
     <Property name="opaque" type="boolean" value="false"/>
   </Properties>
-  <SyntheticProperties>
-    <SyntheticProperty name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,-60,0,0,0,-14"/>
-  </SyntheticProperties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
@@ -39,10 +36,6 @@
           <Component id="indentCasesFromSwitchCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
           <Component id="indentTopLevelClassMembersCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
           <Component id="absoluteLabelIndentCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
-          <Group type="102" alignment="0" attributes="0">
-              <Component id="addLeadingStarInCommentCheckBox" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
-          </Group>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
@@ -64,9 +57,7 @@
               <Component id="indentTopLevelClassMembersCheckBox" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="indentCasesFromSwitchCheckBox" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="addLeadingStarInCommentCheckBox" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="32767" attributes="0"/>
+              <EmptySpace pref="33" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -157,22 +148,5 @@
         </Property>
       </AccessibilityProperties>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="addLeadingStarInCommentCheckBox">
-      <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_AddLeadingStarInComment" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-          <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
-            <EmptyBorder bottom="0" left="0" right="0" top="0"/>
-          </Border>
-        </Property>
-      </Properties>
-      <AccessibilityProperties>
-        <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="FmtTabsIndents.addLeadingStarInCommentCheckBox.AccessibleContext.accessibleDescription" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </AccessibilityProperties>
-    </Component>
   </SubComponents>
 </Form>
diff -r b43452695c7b java.source/src/org/netbeans/modules/java/ui/FmtTabsIndents.java
--- a/java.source/src/org/netbeans/modules/java/ui/FmtTabsIndents.java	Thu Jun 30 10:22:19 2011 +0200
+++ b/java.source/src/org/netbeans/modules/java/ui/FmtTabsIndents.java	Thu Jun 30 15:41:52 2011 +0200
@@ -44,7 +44,6 @@
 
 package org.netbeans.modules.java.ui;
 
-import org.netbeans.api.java.source.CodeStyle.WrapStyle;
 import static org.netbeans.modules.java.ui.FmtOptions.*;
 import static org.netbeans.modules.java.ui.FmtOptions.CategorySupport.OPTION_ID;
 import org.netbeans.modules.java.ui.FmtOptions.CategorySupport;
@@ -68,7 +67,6 @@
         absoluteLabelIndentCheckBox.putClientProperty(OPTION_ID, absoluteLabelIndent);
         indentTopLevelClassMembersCheckBox.putClientProperty(OPTION_ID, indentTopLevelClassMembers);
         indentCasesFromSwitchCheckBox.putClientProperty(OPTION_ID, indentCasesFromSwitch);
-        addLeadingStarInCommentCheckBox.putClientProperty(OPTION_ID, addLeadingStarInComment);
 //        rightMarginField.putClientProperty(OPTION_ID, rightMargin);
     }
     
@@ -94,7 +92,6 @@
         absoluteLabelIndentCheckBox = new javax.swing.JCheckBox();
         indentTopLevelClassMembersCheckBox = new javax.swing.JCheckBox();
         indentCasesFromSwitchCheckBox = new javax.swing.JCheckBox();
-        addLeadingStarInCommentCheckBox = new javax.swing.JCheckBox();
 
         setName(org.openide.util.NbBundle.getMessage(FmtTabsIndents.class, "LBL_TabsAndIndents")); // NOI18N
         setOpaque(false);
@@ -114,9 +111,6 @@
         org.openide.awt.Mnemonics.setLocalizedText(indentCasesFromSwitchCheckBox, org.openide.util.NbBundle.getMessage(FmtTabsIndents.class, "LBL_IndentCasesFromSwitch")); // NOI18N
         indentCasesFromSwitchCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
 
-        org.openide.awt.Mnemonics.setLocalizedText(addLeadingStarInCommentCheckBox, org.openide.util.NbBundle.getMessage(FmtTabsIndents.class, "LBL_AddLeadingStarInComment")); // NOI18N
-        addLeadingStarInCommentCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
-
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -132,12 +126,9 @@
             .addComponent(indentCasesFromSwitchCheckBox)
             .addComponent(indentTopLevelClassMembersCheckBox)
             .addComponent(absoluteLabelIndentCheckBox)
-            .addGroup(layout.createSequentialGroup()
-                .addComponent(addLeadingStarInCommentCheckBox)
-                .addContainerGap())
         );
 
-        layout.linkSize( javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[]{continuationIndentSizeField, labelIndentField});
+        layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {continuationIndentSizeField, labelIndentField});
 
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -156,9 +147,7 @@
                 .addComponent(indentTopLevelClassMembersCheckBox)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(indentCasesFromSwitchCheckBox)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(addLeadingStarInCommentCheckBox)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addContainerGap(33, Short.MAX_VALUE))
         );
 
         continuationIndentSizeField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FmtTabsIndents.class, "FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription")); // NOI18N
@@ -166,13 +155,11 @@
         absoluteLabelIndentCheckBox.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FmtTabsIndents.class, "FmtTabsIndents.absoluteLabelIndentCheckBox.AccessibleContext.accessibleDescription")); // NOI18N
         indentTopLevelClassMembersCheckBox.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FmtTabsIndents.class, "FmtTabsIndents.indentTopLevelClassMembersCheckBox.AccessibleContext.accessibleDescription")); // NOI18N
         indentCasesFromSwitchCheckBox.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FmtTabsIndents.class, "FmtTabsIndents.indentCasesFromSwitchCheckBox.AccessibleContext.accessibleDescription")); // NOI18N
-        addLeadingStarInCommentCheckBox.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(FmtTabsIndents.class, "FmtTabsIndents.addLeadingStarInCommentCheckBox.AccessibleContext.accessibleDescription")); // NOI18N
     }// </editor-fold>//GEN-END:initComponents
     
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JCheckBox absoluteLabelIndentCheckBox;
-    private javax.swing.JCheckBox addLeadingStarInCommentCheckBox;
     private javax.swing.JTextField continuationIndentSizeField;
     private javax.swing.JLabel continuationIndentSizeLabel;
     private javax.swing.JCheckBox indentCasesFromSwitchCheckBox;
diff -r b43452695c7b java.source/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
--- a/java.source/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java	Thu Jun 30 10:22:19 2011 +0200
+++ b/java.source/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java	Thu Jun 30 15:41:52 2011 +0200
@@ -3041,6 +3041,485 @@
         preferences.putBoolean("absoluteLabelIndent", false);
     }
 
+    public void testJavadoc() throws Exception {
+        testFile = new File(getWorkDir(), "Test.java");
+        TestUtilities.copyStringToFile(testFile,
+                "package hierbas.del.litoral;\n\n"
+                + "public class Test {\n"
+                + "    public void taragui(CharSequence cs, Object obj) {\n"
+                + "    }\n"
+                + "}\n");
+        FileObject testSourceFO = FileUtil.toFileObject(testFile);
+        DataObject testSourceDO = DataObject.find(testSourceFO);
+        EditorCookie ec = (EditorCookie)testSourceDO.getCookie(EditorCookie.class);
+        final Document doc = ec.openDocument();
+        doc.putProperty(Language.class, JavaTokenId.language());
+        String content =
+                "package hierbas.del.litoral;\n"
+                + "public class Test{\n"
+                + "/**\n"
+                + "*This is a test JavaDoc  for the taragui method.\n"
+                + "*  Method description is here.\n"
+                + "*<pre>\n"
+                + "* Test t = new Test();\n"
+                + "* try {\n"
+                + "*     t.taragui(\"TEST\", t);\n"
+                + "* } catch (Exception e) {}\n"
+                + "*</pre>\n"
+                + "* @param cs this is the first parameter description.\n"
+                + "* @param obj this is the second parameter description.\n"
+                + "*@return this is the return value description.\n"
+                + "*  @throws MyRuntimeException the first exception description.\n"
+                + "* @throws AnException the second exception description.\n"
+                + "*/\n"
+                + "public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "/*  This is a block comment.*/\n"
+                + "return null;\n"
+                + "}\n"
+                + "}\n";
+
+        Preferences preferences = MimeLookup.getLookup(JavaTokenId.language().mimeType()).lookup(Preferences.class);
+        preferences.putInt("text-limit-width", 45);
+
+        String golden =
+                "package hierbas.del.litoral;\n"
+                + "\n"
+                + "public class Test {\n"
+                + "\n"
+                + "    /**\n"
+                + "     * This is a test JavaDoc for the taragui\n"
+                + "     * method. Method description is here.\n"
+                + "     * <pre>\n"
+                + "     * Test t = new Test();\n"
+                + "     * try {\n"
+                + "     *     t.taragui(\"TEST\", t);\n"
+                + "     * } catch (Exception e) {}\n"
+                + "     * </pre>\n"
+                + "     * <p/>\n"
+                + "     * @param cs this is the first parameter\n"
+                + "     * description.\n"
+                + "     * @param obj this is the second\n"
+                + "     * parameter description.\n"
+                + "     * @return this is the return value\n"
+                + "     * description.\n"
+                + "     * @throws MyRuntimeException the first\n"
+                + "     * exception description.\n"
+                + "     * @throws AnException the second\n"
+                + "     * exception description.\n"
+                + "     */\n"
+                + "    public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "        /*\n"
+                + "         * This is a block comment.\n"
+                + "         */\n"
+                + "        return null;\n"
+                + "    }\n"
+                + "}\n";        
+        reformat(doc, content, golden);
+        
+        golden =
+                "package hierbas.del.litoral;\n"
+                + "\n"
+                + "public class Test {\n"
+                + "\n"
+                + "    /**\n"
+                + "     *This is a test JavaDoc  for the taragui method.\n"
+                + "     *  Method description is here.\n"
+                + "     *<pre>\n"
+                + "     * Test t = new Test();\n"
+                + "     * try {\n"
+                + "     *     t.taragui(\"TEST\", t);\n"
+                + "     * } catch (Exception e) {}\n"
+                + "     *</pre>\n"
+                + "     * @param cs this is the first parameter description.\n"
+                + "     * @param obj this is the second parameter description.\n"
+                + "     *@return this is the return value description.\n"
+                + "     *  @throws MyRuntimeException the first exception description.\n"
+                + "     * @throws AnException the second exception description.\n"
+                + "     */\n"
+                + "    public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "        /*  This is a block comment.*/\n"
+                + "        return null;\n"
+                + "    }\n"
+                + "}\n";        
+        preferences.putBoolean("enableCommentFormatting", false);
+        reformat(doc, content, golden);
+        preferences.remove("enableCommentFormatting");
+        
+        golden =
+                "package hierbas.del.litoral;\n"
+                + "\n"
+                + "public class Test {\n"
+                + "\n"
+                + "    /**\n"
+                + "     * This is a test JavaDoc for the taragui method.\n"
+                + "     * Method description is here.\n"
+                + "     * <pre>\n"
+                + "     * Test t = new Test();\n"
+                + "     * try {\n"
+                + "     *     t.taragui(\"TEST\", t);\n"
+                + "     * } catch (Exception e) {}\n"
+                + "     * </pre>\n"
+                + "     * <p/>\n"
+                + "     * @param cs this is the first parameter description.\n"
+                + "     * @param obj this is the second parameter description.\n"
+                + "     * @return this is the return value description.\n"
+                + "     * @throws MyRuntimeException the first exception description.\n"
+                + "     * @throws AnException the second exception description.\n"
+                + "     */\n"
+                + "    public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "        /*\n"
+                + "         * This is a block comment.\n"
+                + "         */\n"
+                + "        return null;\n"
+                + "    }\n"
+                + "}\n";        
+        preferences.putBoolean("wrapCommentText", false);
+        reformat(doc, content, golden);
+        preferences.remove("wrapCommentText");
+        
+        golden =
+                "package hierbas.del.litoral;\n"
+                + "\n"
+                + "public class Test {\n"
+                + "\n"
+                + "    /**\n"
+                + "     This is a test JavaDoc for the taragui\n"
+                + "     method. Method description is here.\n"
+                + "     <pre>\n"
+                + "     Test t = new Test();\n"
+                + "     try {\n"
+                + "         t.taragui(\"TEST\", t);\n"
+                + "     } catch (Exception e) {}\n"
+                + "     </pre>\n"
+                + "     <p/>\n"
+                + "     @param cs this is the first parameter\n"
+                + "     description.\n"
+                + "     @param obj this is the second parameter\n"
+                + "     description.\n"
+                + "     @return this is the return value\n"
+                + "     description.\n"
+                + "     @throws MyRuntimeException the first\n"
+                + "     exception description.\n"
+                + "     @throws AnException the second exception\n"
+                + "     description.\n"
+                + "     */\n"
+                + "    public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "        /*\n"
+                + "         This is a block comment.\n"
+                + "         */\n"
+                + "        return null;\n"
+                + "    }\n"
+                + "}\n";        
+        preferences.putBoolean("addLeadingStarInComment", false);
+        reformat(doc, content, golden);
+
+        golden =
+                "package hierbas.del.litoral;\n"
+                + "\n"
+                + "public class Test {\n"
+                + "\n"
+                + "    /**\n"
+                + "     This is a test JavaDoc for the taragui\n"
+                + "     method.\n"
+                + "     Method description is here.\n"
+                + "     <pre>\n"
+                + "     Test t = new Test();\n"
+                + "     try {\n"
+                + "         t.taragui(\"TEST\", t);\n"
+                + "     } catch (Exception e) {}\n"
+                + "     </pre>\n"
+                + "     <p/>\n"
+                + "     @param cs this is the first parameter\n"
+                + "     description.\n"
+                + "     @param obj this is the second parameter\n"
+                + "     description.\n"
+                + "     @return this is the return value\n"
+                + "     description.\n"
+                + "     @throws MyRuntimeException the first\n"
+                + "     exception description.\n"
+                + "     @throws AnException the second exception\n"
+                + "     description.\n"
+                + "     */\n"
+                + "    public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "        /*\n"
+                + "         This is a block comment.\n"
+                + "         */\n"
+                + "        return null;\n"
+                + "    }\n"
+                + "}\n";        
+        preferences.putBoolean("preserveNewLinesInComments", true);
+        reformat(doc, content, golden);
+        preferences.remove("addLeadingStarInComment");
+
+        golden =
+                "package hierbas.del.litoral;\n"
+                + "\n"
+                + "public class Test {\n"
+                + "\n"
+                + "    /**\n"
+                + "     * This is a test JavaDoc for the taragui\n"
+                + "     * method.\n"
+                + "     * Method description is here.\n"
+                + "     * <pre>\n"
+                + "     * Test t = new Test();\n"
+                + "     * try {\n"
+                + "     *     t.taragui(\"TEST\", t);\n"
+                + "     * } catch (Exception e) {}\n"
+                + "     * </pre>\n"
+                + "     * <p/>\n"
+                + "     * @param cs this is the first parameter\n"
+                + "     * description.\n"
+                + "     * @param obj this is the second\n"
+                + "     * parameter description.\n"
+                + "     * @return this is the return value\n"
+                + "     * description.\n"
+                + "     * @throws MyRuntimeException the first\n"
+                + "     * exception description.\n"
+                + "     * @throws AnException the second\n"
+                + "     * exception description.\n"
+                + "     */\n"
+                + "    public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "        /*\n"
+                + "         * This is a block comment.\n"
+                + "         */\n"
+                + "        return null;\n"
+                + "    }\n"
+                + "}\n";        
+        reformat(doc, content, golden);
+        preferences.remove("preserveNewLinesInComments");
+
+        golden =
+                "package hierbas.del.litoral;\n"
+                + "\n"
+                + "public class Test {\n"
+                + "\n"
+                + "    /**\n"
+                + "     * This is a test JavaDoc for the taragui\n"
+                + "     * method. Method description is here.\n"
+                + "     * <pre>\n"
+                + "     * Test t = new Test();\n"
+                + "     * try {\n"
+                + "     *     t.taragui(\"TEST\", t);\n"
+                + "     * } catch (Exception e) {}\n"
+                + "     * </pre>\n"
+                + "     *\n"
+                + "     * @param cs this is the first parameter\n"
+                + "     * description.\n"
+                + "     * @param obj this is the second\n"
+                + "     * parameter description.\n"
+                + "     * @return this is the return value\n"
+                + "     * description.\n"
+                + "     * @throws MyRuntimeException the first\n"
+                + "     * exception description.\n"
+                + "     * @throws AnException the second\n"
+                + "     * exception description.\n"
+                + "     */\n"
+                + "    public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "        /*\n"
+                + "         * This is a block comment.\n"
+                + "         */\n"
+                + "        return null;\n"
+                + "    }\n"
+                + "}\n";        
+        preferences.putBoolean("generateParagraphTagOnBlankLines", false);
+        reformat(doc, content, golden);
+
+        golden =
+                "package hierbas.del.litoral;\n"
+                + "\n"
+                + "public class Test {\n"
+                + "\n"
+                + "    /**\n"
+                + "     This is a test JavaDoc for the taragui\n"
+                + "     method. Method description is here.\n"
+                + "     <pre>\n"
+                + "     Test t = new Test();\n"
+                + "     try {\n"
+                + "         t.taragui(\"TEST\", t);\n"
+                + "     } catch (Exception e) {}\n"
+                + "     </pre>\n"
+                + "\n"
+                + "     @param cs this is the first parameter\n"
+                + "     description.\n"
+                + "     @param obj this is the second parameter\n"
+                + "     description.\n"
+                + "     @return this is the return value\n"
+                + "     description.\n"
+                + "     @throws MyRuntimeException the first\n"
+                + "     exception description.\n"
+                + "     @throws AnException the second exception\n"
+                + "     description.\n"
+                + "     */\n"
+                + "    public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "        /*\n"
+                + "         This is a block comment.\n"
+                + "         */\n"
+                + "        return null;\n"
+                + "    }\n"
+                + "}\n";        
+        preferences.putBoolean("addLeadingStarInComment", false);
+        reformat(doc, content, golden);
+        preferences.remove("addLeadingStarInComment");
+        preferences.remove("generateParagraphTagOnBlankLines");
+        
+        golden =
+                "package hierbas.del.litoral;\n"
+                + "\n"
+                + "public class Test {\n"
+                + "\n"
+                + "    /**\n"
+                + "     * This is a test JavaDoc for the taragui\n"
+                + "     * method. Method description is here.\n"
+                + "     * <pre>\n"
+                + "     * Test t = new Test();\n"
+                + "     * try {\n"
+                + "     *     t.taragui(\"TEST\", t);\n"
+                + "     * } catch (Exception e) {}\n"
+                + "     * </pre>\n"
+                + "     * <p/>\n"
+                + "     * @param cs this is the first parameter\n"
+                + "     * description.\n"
+                + "     * @param obj this is the second\n"
+                + "     * parameter description.\n"
+                + "     * @return this is the return value\n"
+                + "     * description.\n"
+                + "     * @throws MyRuntimeException the first\n"
+                + "     * exception description.\n"
+                + "     * @throws AnException the second\n"
+                + "     * exception description.\n"
+                + "     */\n"
+                + "    public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "        /* This is a block comment. */\n"
+                + "        return null;\n"
+                + "    }\n"
+                + "}\n";        
+        preferences.putBoolean("wrapOneLineComment", false);
+        reformat(doc, content, golden);
+        preferences.remove("wrapOneLineComment");
+        
+        golden =
+                "package hierbas.del.litoral;\n"
+                + "\n"
+                + "public class Test {\n"
+                + "\n"
+                + "    /**\n"
+                + "     * This is a test JavaDoc for the taragui\n"
+                + "     * method. Method description is here.\n"
+                + "     * <pre>\n"
+                + "     * Test t = new Test();\n"
+                + "     * try {\n"
+                + "     *     t.taragui(\"TEST\", t);\n"
+                + "     * } catch (Exception e) {}\n"
+                + "     * </pre>\n"
+                + "     * @param cs this is the first parameter\n"
+                + "     * description.\n"
+                + "     * @param obj this is the second\n"
+                + "     * parameter description.\n"
+                + "     * @return this is the return value\n"
+                + "     * description.\n"
+                + "     * @throws MyRuntimeException the first\n"
+                + "     * exception description.\n"
+                + "     * @throws AnException the second\n"
+                + "     * exception description.\n"
+                + "     */\n"
+                + "    public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "        /*\n"
+                + "         * This is a block comment.\n"
+                + "         */\n"
+                + "        return null;\n"
+                + "    }\n"
+                + "}\n";        
+        preferences.putBoolean("blankLineAfterJavadocDescription", false);
+        reformat(doc, content, golden);
+        preferences.remove("blankLineAfterJavadocDescription");
+        
+        golden =
+                "package hierbas.del.litoral;\n"
+                + "\n"
+                + "public class Test {\n"
+                + "\n"
+                + "    /**\n"
+                + "     * This is a test JavaDoc for the taragui\n"
+                + "     * method. Method description is here.\n"
+                + "     * <pre>\n"
+                + "     * Test t = new Test();\n"
+                + "     * try {\n"
+                + "     *     t.taragui(\"TEST\", t);\n"
+                + "     * } catch (Exception e) {}\n"
+                + "     * </pre>\n"
+                + "     * <p/>\n"
+                + "     * @param cs  this is the first parameter\n"
+                + "     *            description.\n"
+                + "     * @param obj this is the second\n"
+                + "     *            parameter description.\n"
+                + "     * @return this is the return value\n"
+                + "     *         description.\n"
+                + "     * @throws MyRuntimeException the first\n"
+                + "     *                            exception\n"
+                + "     *                            description.\n"
+                + "     * @throws AnException        the second\n"
+                + "     *                            exception\n"
+                + "     *                            description.\n"
+                + "     */\n"
+                + "    public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "        /*\n"
+                + "         * This is a block comment.\n"
+                + "         */\n"
+                + "        return null;\n"
+                + "    }\n"
+                + "}\n";        
+        preferences.putBoolean("alignJavadocParameterDescriptions", true);
+        preferences.putBoolean("alignJavadocReturnDescription", true);
+        preferences.putBoolean("alignJavadocExceptionDescriptions", true);
+        reformat(doc, content, golden);
+        preferences.remove("alignJavadocExceptionDescriptions");
+        preferences.remove("alignJavadocReturnDescription");
+        preferences.remove("alignJavadocParameterDescriptions");
+        
+        golden =
+                "package hierbas.del.litoral;\n"
+                + "\n"
+                + "public class Test {\n"
+                + "\n"
+                + "    /**\n"
+                + "     * This is a test JavaDoc for the taragui\n"
+                + "     * method. Method description is here.\n"
+                + "     * <pre>\n"
+                + "     * Test t = new Test();\n"
+                + "     * try {\n"
+                + "     *     t.taragui(\"TEST\", t);\n"
+                + "     * } catch (Exception e) {}\n"
+                + "     * </pre>\n"
+                + "     * <p/>\n"
+                + "     * @param cs this is the first parameter\n"
+                + "     * description.\n"
+                + "     * @param obj this is the second\n"
+                + "     * parameter description.\n"
+                + "     * <p/>\n"
+                + "     * @return this is the return value\n"
+                + "     * description.\n"
+                + "     * <p/>\n"
+                + "     * @throws MyRuntimeException the first\n"
+                + "     * exception description.\n"
+                + "     * @throws AnException the second\n"
+                + "     * exception description.\n"
+                + "     */\n"
+                + "    public String taragui(CharSequence cs, Object obj) throws MyRuntimeException, AnExeption {\n"
+                + "        /*\n"
+                + "         * This is a block comment.\n"
+                + "         */\n"
+                + "        return null;\n"
+                + "    }\n"
+                + "}\n";        
+        preferences.putBoolean("blankLineAfterJavadocParameterDescriptions", true);
+        preferences.putBoolean("blankLineAfterJavadocReturnTag", true);
+        reformat(doc, content, golden);
+        preferences.remove("blankLineAfterJavadocReturnTag");
+        preferences.remove("blankLineAfterJavadocParameterDescriptions");
+        
+        preferences.remove("text-limit-width");
+    }
+
     /**
      * Do not put spaces to parenthesis when method declaration has no
      * parameters. The same rule should be applied to method invocation.
@@ -3281,7 +3760,7 @@
                 + "    /**\n"
                 + "     *\n"
                 + "     *\n"
-                + "    }\n";
+                + "     * }\n";
         reformat(doc, content, golden);
     }