Bug 542964 - [formatter] javadoc: no indent of @return description - UI
diff --git a/org.eclipse.jdt.ui/preview/formatter.java b/org.eclipse.jdt.ui/preview/formatter.java
index d3ce991..6d460ff 100644
--- a/org.eclipse.jdt.ui/preview/formatter.java
+++ b/org.eclipse.jdt.ui/preview/formatter.java
@@ -975,7 +975,7 @@
* between 0 and 100.
* @param second The second parameter.
* @throws Exception when the foo operation cannot be performed for one reason or another.
- * @return The result of the foo operation, usually within 0 and 1000.
+ * @return The result of the foo operation, usually an even number within 0 and 1000.
*/ int foo(int first, int second) throws Exception;
}
class Test {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java
index afafc74..2a7a199 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java
@@ -74,6 +74,7 @@
public static String FormatterModifyDialog_comments_pref_format_html;
public static String FormatterModifyDialog_comments_pref_format_line_comments_on_first_column;
public static String FormatterModifyDialog_comments_pref_indent_description_after_param;
+ public static String FormatterModifyDialog_comments_pref_indent_other_tag_descriptions;
public static String FormatterModifyDialog_comments_pref_javadoc_align;
public static String FormatterModifyDialog_comments_pref_javadoc_align_none;
public static String FormatterModifyDialog_comments_pref_javadoc_align_names_and_descriptions;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties
index af35cec..61e15b4 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties
@@ -296,6 +296,7 @@
FormatterModifyDialog_comments_pref_javadoc_align_descriptions_grouped=Align descriptions, grouped by type
FormatterModifyDialog_comments_pref_javadoc_align_descriptions_to_tag=Align descriptions to tag width
FormatterModifyDialog_comments_pref_indent_description_after_param=Indent wrapped @param/@throws descriptions
+FormatterModifyDialog_comments_pref_indent_other_tag_descriptions=Indent other tag descriptions when wrapped
FormatterModifyDialog_comments_pref_new_line_after_param_tags=New line before @param/@throws descriptions
FormatterModifyDialog_comments_pref_line_width=Maximum width for comments:
FormatterModifyDialog_comments_pref_line_width_count_from_starting_position=Count width from comment's starting position
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java
index 6b5f73a..84850eb 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java
@@ -1417,10 +1417,12 @@
alignPref.addLabel(FormatterMessages.FormatterModifyDialog_comments_pref_javadoc_align, true, fTree.getIndent(parent));
fTree.addChild(parent, alignPref);
- fTree.addCheckbox(alignPref, FormatterMessages.FormatterModifyDialog_comments_pref_indent_description_after_param,
- DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_PARAMETER_DESCRIPTION, CheckboxPreference.FALSE_TRUE);
fTree.addCheckbox(alignPref, FormatterMessages.FormatterModifyDialog_comments_pref_new_line_after_param_tags,
DefaultCodeFormatterConstants.FORMATTER_COMMENT_INSERT_NEW_LINE_FOR_PARAMETER, CheckboxPreference.DO_NOT_INSERT_INSERT);
+ fTree.addCheckbox(alignPref, FormatterMessages.FormatterModifyDialog_comments_pref_indent_description_after_param,
+ DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_PARAMETER_DESCRIPTION, CheckboxPreference.FALSE_TRUE);
+ fTree.addCheckbox(alignPref, FormatterMessages.FormatterModifyDialog_comments_pref_indent_other_tag_descriptions,
+ DefaultCodeFormatterConstants.FORMATTER_COMMENT_INDENT_TAG_DESCRIPTION, CheckboxPreference.FALSE_TRUE);
return alignPref;
}
};
