### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: formatter/org/eclipse/jdt/internal/formatter/Scribe.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Scribe.java,v
retrieving revision 1.135
diff -u -r1.135 Scribe.java
--- formatter/org/eclipse/jdt/internal/formatter/Scribe.java	8 May 2008 19:03:36 -0000	1.135
+++ formatter/org/eclipse/jdt/internal/formatter/Scribe.java	11 May 2008 18:02:17 -0000
@@ -92,15 +92,13 @@
 	/** indent empty lines*/
 	private final boolean indentEmptyLines;
 	
-//	boolean formatJavadocComment;
-//	boolean formatBlockComment;
-//	boolean formatLineComment;
-//	boolean includeComments;
-	private int formatComments = 0; // false
+	/* Comments formatting */
 	private static final int INCLUDE_BLOCK_COMMENTS = CodeFormatter.F_INCLUDE_COMMENTS | CodeFormatter.K_MULTI_LINE_COMMENT;
 	private static final int INCLUDE_JAVA_DOC = CodeFormatter.F_INCLUDE_COMMENTS | CodeFormatter.K_JAVA_DOC;
 	private static final int INCLUDE_LINE_COMMENTS = CodeFormatter.F_INCLUDE_COMMENTS | CodeFormatter.K_SINGLE_LINE_COMMENT;
+	private int formatComments = 0;
 	private int headerEndPosition = -1;
+	int commentIndentationLevel; // indentation requested in comments (usually in javadoc root tags description)
 	
 	// New way to format javadoc
 	private FormatterCommentParser formatterCommentParser; // specialized parser to format comments
@@ -1598,9 +1596,6 @@
 			formattedSnippet= CommentFormatterUtil.evaluateFormatterEdit(convertedSnippet, edit, null);
 		}
 
-		// remove trailing spaces
-		formattedSnippet= formattedSnippet.trim();
-
 		// 4 - add the content prefix (@see JavaDocRegion#postprocessCodeSnippet)
 		StringBuffer outputBuffer= new StringBuffer();
 		tracker= new DefaultLineTracker();
@@ -2137,70 +2132,54 @@
 
 		// Compute indentation
 		boolean headerLine = block.isHeaderLine() && this.lastNumberOfNewLines == 0;
-		int firstColumn = 1 + this.indentationLevel + BLOCK_LINE_PREFIX_LENGTH;
 		int maxColumn = this.formatter.preferences.comment_line_length + 1;
 		if (headerLine) {
-			firstColumn++;
 			maxColumn++;
 		}
-		StringBuffer indentationBuffer = printJavadocIndentationBuffer(block, firstColumn);
 
 		// format tag section if necessary
 		boolean clearBlankLines = this.formatter.preferences.comment_clear_blank_lines_in_javadoc_comment;
 		if (!block.isInlined()) {
 			this.lastNumberOfNewLines = 0;
 		}
-		if (!block.isDescription()) {
-			this.column += previousEnd - block.sourceStart + 1;
+		if (block.isDescription()) {
+			if (!block.isInlined()) {
+			    this.commentIndentationLevel = 0;
+			}
+		} else {
+			int tagLength = previousEnd - block.sourceStart + 1;
+			this.column += tagLength;
+			if (!block.isInlined()) {
+			    boolean indentRootTags = this.formatter.preferences.comment_indent_root_tags && !block.isInDescription();
+				if (indentRootTags) {
+				    this.commentIndentationLevel = tagLength + 1;
+					boolean indentParamTag = this.formatter.preferences.comment_indent_parameter_description && block.isInParamTag();
+					if (indentParamTag) {
+						this.commentIndentationLevel += this.indentationSize;
+					}
+				} else {
+				    this.commentIndentationLevel = 0;
+				}
+			}
 			FormatJavadocReference reference= block.reference;
 			if (reference != null) {
 				// format reference
-				StringBuffer buffer = new StringBuffer();
-				printJavadocBlockReference(buffer, reference, block);
-			    addReplaceEdit(previousEnd+1, reference.sourceEnd, buffer.toString());
+				printJavadocBlockReference(block, reference);
 				previousEnd = reference.sourceEnd;
 			}
 
 			// Nothing else to do if the tag has no node
 			if (maxNodes < 0)  {
 				if (block.isInlined()) {
-					// Need to print the closing brace
-					StringBuffer buffer = new StringBuffer();
-					if ((this.column+1) > maxColumn) {
-						this.lastNumberOfNewLines++;
-						this.line++;
-				    	buffer.append(this.lineSeparator);
-				    	this.column = 1;
-				    	printIndentationIfNecessary(buffer);
-			    		buffer.append(BLOCK_LINE_PREFIX);
-				    	this.column = headerLine ? firstColumn-1 : firstColumn;
-				    	if (indentationBuffer != null) {
-							buffer.append(indentationBuffer);
-							this.column += indentationBuffer.length();
-				    	}
-				    	headerLine = false;
-				    	maxColumn--;
-					}
-					this.scanner.resetTo(previousEnd+1, block.sourceEnd+1);
-					try {
-	                    int token = this.scanner.getNextToken();
-	                    while (token == TerminalTokens.TokenNameWHITESPACE || token == TerminalTokens.TokenNameMULTIPLY) {
-	                    	token = this.scanner.getNextToken();
-	                    }
-	                    if (token == TerminalTokens.TokenNameRBRACE) {
-		                    buffer.append(this.scanner.source, this.scanner.startPosition, this.scanner.currentPosition-this.scanner.startPosition);
-					    	this.column += (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - this.scanner.startPosition;
-	                    }
-                    } catch (InvalidInputException e) {
-						buffer.append('}');
-                    }
-                    addReplaceEdit(previousEnd+1, block.sourceEnd, buffer.toString());
+					this.column++;
 				}
 				return;
 			}
 		}
 		
 		// tag section: iterate through the blocks composing this tag but the last one
+		StringBuffer indentationBuffer = null;
+		int previousLine = 0;
 		for (int i=0; i<=maxNodes; i++) {
 			FormatJavadocNode node = block.nodes[i];
 			int nodeStart = node.sourceStart;
@@ -2214,7 +2193,7 @@
 					if (newLines == 0) {
 						newLines = printJavadocBlockNodesNewLines(block, node, previousEnd);
 					}
-			   		printJavadocGapLines(previousEnd+1, nodeStart-1, newLines, clearBlankLines, false, null);
+					printJavadocGapLines(previousEnd+1, nodeStart-1, newLines, clearBlankLines, false, null);
 				} else {
 					StringBuffer buffer = new StringBuffer();
 					if (newLines > 0) {
@@ -2226,6 +2205,7 @@
 				}
 			} else {
 				newLines = this.column > maxColumn ? 1 : 0;
+				if (!clearBlankLines && node.lineStart > (previousLine+1)) newLines = node.lineStart - previousLine;
 				if (newLines < node.linesBefore) newLines = node.linesBefore;
 				if (newLines == 0) {
 					newLines = printJavadocBlockNodesNewLines(block, node, previousEnd);
@@ -2249,8 +2229,10 @@
 							textLength = getTextLength(block, text, false);
 						}
 						// Indent if new line was added
-						int additionalLength = printJavadocHtmlImmutableTag(text, block, newLines > 0);
-						this.column += textLength - additionalLength;
+						int currentColumn = this.column;
+						printJavadocHtmlImmutableTag(text, block, newLines > 0);
+						this.column = currentColumn + textLength;
+						if (newLines > 0) this.column += this.commentIndentationLevel;
 					} else {
 						printJavadocHtmlTag(text, block, newLines>0);
 					}
@@ -2258,15 +2240,24 @@
 					printJavadocText(text, block, newLines>0);
 				}
 			} else {
-				if (newLines > 0 && indentationBuffer != null) {
-					addInsertEdit(node.sourceStart, indentationBuffer.toString());
-					this.column += indentationBuffer.length();
+				if (newLines > 0) {
+					if (this.commentIndentationLevel > 0) {
+						if (indentationBuffer == null) {
+							indentationBuffer = new StringBuffer();
+					    	for (int j=0; j<this.commentIndentationLevel; j++) {
+								indentationBuffer.append(' ');
+					    	}
+						}
+						addInsertEdit(node.sourceStart, indentationBuffer.toString());
+						this.column += this.commentIndentationLevel;
+					}
 				}
 				printJavadocBlock((FormatJavadocBlock)node);
 			}
 
 			// Print empty lines before the node
 			previousEnd = node.sourceEnd;
+			previousLine = Util.getLineNumber(previousEnd, this.lineEnds, node.lineStart > 1 ? node.lineStart-2 : 0, this.maxLines);
 		}
 		this.lastNumberOfNewLines = 0;
 	}
@@ -2276,22 +2267,21 @@
     	int nodeStart = node.sourceStart;
  	    try {
 			this.scanner.resetTo(nodeStart , node.sourceEnd);
-	    	int token = this.scanner.getNextToken();
-	    	int length = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - this.scanner.startPosition;
+	    	int length = 0;
 	    	int newLines = 0;
 	    	boolean newLine = false;
 			boolean headerLine = block.isHeaderLine() && this.lastNumberOfNewLines == 0;
+			int firstColumn = 1 + this.indentationLevel + BLOCK_LINE_PREFIX_LENGTH + this.commentIndentationLevel;
+			if (headerLine) maxColumn++;
 	    	if (node.isText()) {
 	    		FormatJavadocText text = (FormatJavadocText)node;
-				int firstColumn = 1 + this.indentationLevel + BLOCK_LINE_PREFIX_LENGTH;
-				if (headerLine) firstColumn++;
     			if (text.isImmutableHtmlTag()) {
 			    	if (nodeStart > (previousEnd+1)) {
 			    		length++; // include space between nodes
 			    	}
-    				int col = this.column + length;
+    				int lastColumn = this.column + length;
 	    			while (!this.scanner.atEnd()) {
-	    				token = this.scanner.getNextToken();
+	    				int token = this.scanner.getNextToken();
 	    				switch (token) {
 	    					case TerminalTokens.TokenNameWHITESPACE:
 	    						if (CharOperation.indexOf('\n', this.scanner.source, this.scanner.startPosition, this.scanner.currentPosition) >= 0) {
@@ -2310,23 +2300,25 @@
 				    			length = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - this.scanner.startPosition;
 	    						break;
 	    				}
-	    				col += length;
-			    		if (headerLine) { // special case when text is on the same line of the javadoc's header
-			    			if ((col-1) > maxColumn)  {
-								newLines++;
-								col = firstColumn;
-								firstColumn--;
+	    				lastColumn += length;
+	    				if (lastColumn > maxColumn) {
+							newLines++;
+				    		if (headerLine) {
+								maxColumn--;
 								headerLine = false;
 			    			}
-			    		} else if (col > maxColumn) {
-							newLines++;
-							col = firstColumn;
+							lastColumn = firstColumn;
 						}
 	    			}
 	    			return newLines;
     			}
     			if (text.isHtmlTag()) {
+    				if (text.getHtmlTagID() == JAVADOC_SINGLE_BREAK_TAG_ID) {
+    					// never break before single break tag
+    					return 0;
+    				}
 	    			// read the html tag
+    				this.scanner.getNextToken();
 	    			if (this.scanner.getNextToken() == TerminalTokens.TokenNameDIVIDE) {
 	    				length++;
 	    				this.scanner.getNextToken();
@@ -2336,22 +2328,53 @@
 	    			length++;
 	    		} else {
 	    			while (true) {
-	    				token = this.scanner.getNextToken();
+	    				int token = this.scanner.getNextToken();
 	    				if (token == TerminalTokens.TokenNameWHITESPACE || token == TerminalTokens.TokenNameEOF) break;
 		    			int tokenLength = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - this.scanner.startPosition;
-		    			if ((firstColumn + length + tokenLength) >= maxColumn) {
+		    			length += tokenLength;
+		    			if ((this.column + length) >= maxColumn) {
 		    				break;
 		    			}
-		    			length += tokenLength;
 	    			}
 	    		}
 	    	} else {
 	    		FormatJavadocBlock inlinedBlock = (FormatJavadocBlock) node;
-	    		length += inlinedBlock.tagEnd - inlinedBlock.sourceStart + 1;
+	    		length += inlinedBlock.tagEnd - inlinedBlock.sourceStart + 1;  // tag length
+	    		if (inlinedBlock.reference != null) {
+		    		length++; // space between tag and reference
+					this.scanner.resetTo(inlinedBlock.reference.sourceStart, inlinedBlock.reference.sourceEnd);
+					int previousToken = -1;
+					loop: while (!this.scanner.atEnd()) {
+						int token = this.scanner.getNextToken();
+			    		int tokenLength = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - this.scanner.startPosition;
+						switch (token) {
+							case TerminalTokens.TokenNameWHITESPACE:
+								if (previousToken == TerminalTokens.TokenNameCOMMA) { // space between method arguments
+									length++;
+								}
+								break;
+							case TerminalTokens.TokenNameMULTIPLY:
+								break;
+							default:
+								length += tokenLength;
+								if ((this.column+length) > maxColumn) {
+									break loop;
+								}
+					    		break;
+						}
+						previousToken = token;
+		    		}
+	    		}
+	    		length++; // one more for closing brace
 	    	}
 	    	if (nodeStart > (previousEnd+1)) {
 	    		length++; // include space between nodes
 	    	}
+    		if ((firstColumn + length) >= maxColumn && node == block.nodes[0]) {
+    			// Do not split in this peculiar case as length would be also over the max
+    			// length on next line
+    			return 0;
+    		}
 			if ((this.column + length) > maxColumn) {
 	    		return 1;
 	    	}
@@ -2368,131 +2391,80 @@
 	    return 0;
     }
 
-	private void printJavadocBlockReference(StringBuffer buffer, FormatJavadocReference reference, FormatJavadocBlock block) {
-
-		boolean indentRootTags = this.formatter.preferences.comment_indent_root_tags && !block.isInDescription();
-		boolean indentParamTag = this.formatter.preferences.comment_indent_parameter_description && block.isInParamTag();
+	private void printJavadocBlockReference(FormatJavadocBlock block, FormatJavadocReference reference) {
+		int maxColumn = this.formatter.preferences.comment_line_length + 1;
 		boolean headerLine = block.isHeaderLine();
-		StringBuffer tokensBuffer = new StringBuffer();
+		boolean inlined = block.isInlined();
+		if (headerLine) maxColumn++;
 		
 		// First we need to know what is the indentation
-		int firstColumn = 1 + this.indentationLevel + BLOCK_LINE_PREFIX_LENGTH;
-		if (headerLine) firstColumn++;
-		StringBuffer indentationBuffer = null;
-		if (indentRootTags) {
-			int indentLevel = this.indentationLevel;
-			int indentations = this.numberOfIndentations;
-			this.numberOfIndentations += (BLOCK_LINE_PREFIX_LENGTH / this.indentationSize) + 1;
-			this.indentationLevel = this.numberOfIndentations * this.indentationSize;
-			int currentColumn = this.column;
-			this.column = firstColumn;
-			if (indentParamTag) {
-				this.indentationLevel += this.indentationSize;
-				this.numberOfIndentations++;
-			}
-			printIndentationIfNecessary(indentationBuffer = new StringBuffer());
-			firstColumn = this.indentationLevel + 1;
-			this.column = currentColumn;
-			this.indentationLevel = indentLevel;
-			this.numberOfIndentations = indentations;
-		}
-
-		// Scan the text token per token to compact it and size it the max line length
-		int maxColumn = this.formatter.preferences.comment_line_length + 1;
+		this.scanner.resetTo(block.tagEnd+1, reference.sourceEnd);
+		StringBuffer buffer = new StringBuffer();
+		boolean needFormat = false;
 		int previousToken = -1;
-		this.scanner.resetTo(reference.sourceStart, reference.sourceEnd);
+		int spacePosition = -1;
+		String newLine = null;
+		StringBuffer newLineBuffer = null;
+		int firstColumn = -1;
 		while (!this.scanner.atEnd()) {
 			int token;
 			try {
 				token = this.scanner.getNextToken();
+	    		int tokenLength = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - this.scanner.startPosition;
 				switch (token) {
 					case TerminalTokens.TokenNameWHITESPACE:
-						buffer.append(tokensBuffer);
-						this.column += tokensBuffer.length();
-						tokensBuffer.setLength(0);
-						if (CharOperation.indexOf('\n', this.scanner.source, this.scanner.startPosition, this.scanner.getCurrentTokenEndPosition()) >= 0) {
-							// consume line break
-							loop: while (true) {
-								token = this.scanner.getNextToken();
-								switch (token) {
-									case TerminalTokens.TokenNameWHITESPACE:
-									case TerminalTokens.TokenNameMULTIPLY:
-										previousToken = token; // will not insert space
-										continue;
-									default:
-										break loop;
-								}
-							}
-							break;
+						if (previousToken != -1 || tokenLength > 1 || this.scanner.currentCharacter != ' ') needFormat = true;
+						if (previousToken == -1) { // space before reference
+							buffer.append(' ');
+							this.column++;
 						}
-						previousToken = token;
-						continue;
+						if (previousToken == TerminalTokens.TokenNameCOMMA) { // space between method arguments
+							spacePosition = buffer.length();
+							buffer.append(' ');
+							this.column++; // space before reference
+						}
+						break;
 					case TerminalTokens.TokenNameMULTIPLY:
-						previousToken = token;
-						continue;
+						break;
+					default:
+						if (!inlined && spacePosition > 0 && (this.column+tokenLength) > maxColumn) {
+							// not enough space on the line
+							this.lastNumberOfNewLines++;
+							this.line++;
+							boolean firstNewLine = newLine == null;
+							if (firstNewLine) {
+								newLineBuffer = new StringBuffer(this.lineSeparator);
+						    	this.column = 1;
+						    	printIndentationIfNecessary(newLineBuffer);
+					    		newLineBuffer.append(BLOCK_LINE_PREFIX);
+					    		this.column += BLOCK_LINE_PREFIX_LENGTH;
+						    	for (int i=0; i<this.commentIndentationLevel; i++) {
+									newLineBuffer.append(' ');
+									this.column ++;
+						    	}
+						    	newLine = newLineBuffer.substring(0, newLineBuffer.length()-1); // remove last space as buffer will be inserted before a space
+						    	firstColumn = this.column;
+							} else {
+								this.column = firstColumn;
+							}
+							this.column = firstColumn + buffer.length() - spacePosition - 1;
+							buffer.insert(spacePosition, newLine);
+							if (headerLine) {
+								headerLine = false;
+								maxColumn--;
+							}
+						}
+						buffer.append(this.scanner.source, this.scanner.startPosition, tokenLength);
+			    		this.column += tokenLength;
+			    		break;
 				}
+				previousToken = token;
 			} catch (InvalidInputException iie) {
-				continue;
-			}
-			int tokenStart = this.scanner.getCurrentTokenStartPosition();
-    		int tokenLength = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - tokenStart;
-    		int lastColumn = this.column + tokensBuffer.length() + tokenLength;
-    		boolean insertSpace = previousToken == TerminalTokens.TokenNameWHITESPACE || previousToken == -1;
-    		if (insertSpace) lastColumn++;
-    		if (headerLine) {
-    			// special case when text is on the same line of the javadoc's header
-    			if (lastColumn > maxColumn)  {
-    				lastColumn--; // new line gives an extra character
-    			}
-    		}
-			if (lastColumn > maxColumn) {
-		    	String tokensString = tokensBuffer.toString().trim();
-		    	int indentLength = indentationBuffer==null ? 0 : indentationBuffer.length();
-				if ((firstColumn-1+indentLength+tokensString.length()+tokenLength) > maxColumn) {
-					// there won't be enough room even if we break the line before the buffered tokens
-					// So add the buffered tokens now
-					if (buffer.length() == 0) {
-						buffer.append(' ');
-						this.column++;
-					}
-					buffer.append(tokensString);
-					this.column += tokensString.length();
-					tokensBuffer.setLength(0);
-				}
-				// not enough space on the line
-				this.lastNumberOfNewLines++;
-				this.line++;
-		    	buffer.append(this.lineSeparator);
-		    	this.column = 1;
-		    	printIndentationIfNecessary(buffer);
-	    		buffer.append(BLOCK_LINE_PREFIX);
-		    	this.column = headerLine ? firstColumn-1 : firstColumn;
-		    	if (indentationBuffer != null) {
-		    		buffer.append(indentationBuffer);
-		    	}
-		    	if (tokensBuffer.length() > 0) {
-					buffer.append(tokensString);
-					this.column += tokensString.length();
-					tokensBuffer.setLength(0);
-		    	}
-				buffer.append(this.scanner.source, tokenStart, tokenLength);
-				this.column += tokenLength;
-				if (headerLine) {
-					firstColumn--;
-					headerLine = false;
-				}
-			} else {
-				// append token to the line
-				if (insertSpace) {
-					tokensBuffer.append(' ');
-				}
-				tokensBuffer.append(this.scanner.source, tokenStart, tokenLength);
+				// does not happen as syntax is correct
 			}
-			previousToken = token;
 		}
-		if (tokensBuffer.length() > 0) {
-			buffer.append(tokensBuffer);
-			this.column += tokensBuffer.length();
+		if (needFormat) {
+		    addReplaceEdit(block.tagEnd+1, reference.sourceEnd, buffer.toString());
 		}
     }
 
@@ -2509,15 +2481,24 @@
 						if (CharOperation.indexOf('\n', this.scanner.source, this.scanner.startPosition, this.scanner.currentPosition) >= 0) {
 							if (immutableEnd) {
 								textLength = 0;
-							} else {
-								return textLength;
+								this.scanner.getNextChar();
+								if (this.scanner.currentCharacter == '*') {
+									this.scanner.getNextChar();
+									if (this.scanner.currentCharacter != ' ') {
+										textLength++;
+									}
+								} else {
+									textLength++;
+								}
+								continue;
 							}
+							return textLength;
 						}
 	    			}
+	    			textLength += (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - this.scanner.startPosition;
                 } catch (InvalidInputException e) {
 	                return textLength;
                 }
-    			textLength += (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - this.scanner.startPosition;
 			}
 			return textLength;
 		}
@@ -2801,18 +2782,15 @@
 		}
 	}
 
-	private int printJavadocHtmlImmutableTag(FormatJavadocText text, FormatJavadocBlock block, boolean textOnNewLine) {
+	private void printJavadocHtmlImmutableTag(FormatJavadocText text, FormatJavadocBlock block, boolean textOnNewLine) {
 
-		int additionalLength = 0;
 		try {
 			// Indent if necessary
 			if (textOnNewLine) {
-				int col = this.column;
 				StringBuffer buffer = new StringBuffer();
 				int textEnd = text.separatorsPtr == -1 ? text.sourceEnd : (int) (text.separators[0] >>> 32);
 				printJavadocTextLine(buffer, text.sourceStart, textEnd, block, true, true, true);
 				addReplaceEdit(text.sourceStart, textEnd, buffer.toString());
-				additionalLength = this.column - col;
 			}
 	
 			// Iterate on text line separators
@@ -2838,7 +2816,7 @@
 						case TerminalTokens.TokenNameMULTIPLY_EQUAL:
 							break;
 						default:
-							return 0;
+							return;
 					}
 					if (this.scanner.currentCharacter == ' ') {
 						this.scanner.getNextChar();
@@ -2857,7 +2835,6 @@
 			this.scanner.tokenizeWhiteSpace = true;
 			this.scanner.resetTo(text.sourceEnd+1, this.scannerEndPosition - 1);
 		}
-		return text.separatorsPtr<2 ? additionalLength : 0;
 	}
 
 	private int printJavadocHtmlTag(FormatJavadocText text, FormatJavadocBlock block, boolean textOnNewLine) {
@@ -2881,137 +2858,183 @@
 		int previousEnd = -1;
 	    boolean isHtmlBreakTag = htmlTagID == JAVADOC_SINGLE_BREAK_TAG_ID;
 		boolean isHtmlSeparatorTag = htmlTagID == JAVADOC_SEPARATOR_TAGS_ID;
-		if (!isHtmlBreakTag) {
+		if (isHtmlBreakTag) {
+			return 1;
+		}
 
-			// Iterate on text line separators
-			boolean isCode = htmlTagID == JAVADOC_CODE_TAGS_ID;
-			for (int idx=0, ptr=0; idx<=max || (text.htmlNodesPtr != -1 && ptr <= text.htmlNodesPtr); idx++) {
+		// Iterate on text line separators
+		StringBuffer indentationBuffer = null;
+		boolean isCode = htmlTagID == JAVADOC_CODE_TAGS_ID;
+		for (int idx=0, ptr=0; idx<=max || (text.htmlNodesPtr != -1 && ptr <= text.htmlNodesPtr); idx++) {
 
-				// append text to buffer realigning with the line length
-				int end = (idx > max) ? text.sourceEnd : (int) (text.separators[idx] >>> 32);
-				int nodeKind = 0; // text break
-				if (text.htmlNodesPtr >= 0 && ptr <= text.htmlNodesPtr && end > text.htmlNodes[ptr].sourceStart) {
-					FormatJavadocNode node = text.htmlNodes[ptr];
-					FormatJavadocText htmlTag = node.isText() ? (FormatJavadocText) node : null;
-					int newLines = htmlTag == null ? 0 : htmlTag.linesBefore;
-					if (linesAfter > newLines) {
-						newLines = linesAfter;
-						if (newLines > 1 && clearBlankLines) newLines = 1;
-					}
-					if (textStart < previousEnd) {
-						addReplaceEdit(textStart, previousEnd, buffer.toString());
-					}
-					boolean immutable = htmlTag == null ? false : htmlTag.isImmutableHtmlTag();
-					boolean overEndLine = false;
-					if (immutable) {
-						overEndLine = (this.column + getTextLength(block, htmlTag, false)) > (this.formatter.preferences.comment_line_length+1);
-						if (overEndLine) {
-							if (newLines < 1) newLines = 1;
+			// append text to buffer realigning with the line length
+			int end = (idx > max) ? text.sourceEnd : (int) (text.separators[idx] >>> 32);
+			int nodeKind = 0; // text break
+			if (text.htmlNodesPtr >= 0 && ptr <= text.htmlNodesPtr && end > text.htmlNodes[ptr].sourceStart) {
+				FormatJavadocNode node = text.htmlNodes[ptr];
+				FormatJavadocText htmlTag = node.isText() ? (FormatJavadocText) node : null;
+				int newLines = htmlTag == null ? 0 : htmlTag.linesBefore;
+				if (linesAfter > newLines) {
+					newLines = linesAfter;
+					if (newLines > 1 && clearBlankLines) {
+						if (idx < 2 || (text.htmlIndexes[idx-2] & JAVADOC_TAGS_ID_MASK) != JAVADOC_CODE_TAGS_ID) {
+							newLines = 1;
 						}
 					}
-					if (newLines == 0) {
-						newLines = printJavadocBlockNodesNewLines(block, node, previousEnd);
-					}
-					int nodeStart = node.sourceStart;
-					if (newLines > 0 || (idx > 1 && nodeStart > (previousEnd+1))) {
-						printJavadocGapLines(previousEnd+1, nodeStart-1, newLines, clearBlankLines, false, null);
+				}
+				if (textStart < previousEnd) {
+					addReplaceEdit(textStart, previousEnd, buffer.toString());
+				}
+				boolean immutable = htmlTag == null ? false : htmlTag.isImmutableHtmlTag();
+				boolean overEndLine = false;
+				int nodeStart = node.sourceStart;
+				if (immutable) {
+					int textLength = getTextLength(block, htmlTag, false);
+					if (nodeStart > (previousEnd+1)) textLength++;
+					overEndLine = (this.column + textLength) > (this.formatter.preferences.comment_line_length+1);
+					if (overEndLine) {
+						if (newLines < 1) newLines = 1;
 					}
-					if (newLines > 0) textOnNewLine = true;
-					buffer = new StringBuffer();
-					if (node.isText()) {
-						if (immutable) {
-							// do not change immutable tags, just increment column
-							int additionalLength = printJavadocHtmlImmutableTag(htmlTag, block, overEndLine);
-							this.column += getTextLength(block, htmlTag, true) - additionalLength;
-							linesAfter = 0;
-						} else {
-							linesAfter = printJavadocHtmlTag(htmlTag, block, textOnNewLine);
-						}
-						nodeKind = 1; // text
-					} else {
-						printJavadocBlock((FormatJavadocBlock)node);
+				}
+				if (newLines == 0) {
+					newLines = printJavadocBlockNodesNewLines(block, node, previousEnd);
+				}
+				if (newLines > 0 || (idx > 1 && nodeStart > (previousEnd+1))) {
+					printJavadocGapLines(previousEnd+1, nodeStart-1, newLines, clearBlankLines, false, null);
+				}
+				if (newLines > 0) {
+					textOnNewLine = true;
+				}
+				buffer = new StringBuffer();
+				if (node.isText()) {
+					if (immutable) {
+						// do not change immutable tags, just increment column
+						int currentColumn = this.column;
+						printJavadocHtmlImmutableTag(htmlTag, block, overEndLine);
+						this.column = currentColumn + getTextLength(block, htmlTag, true);
+						if (overEndLine) this.column += this.commentIndentationLevel;
 						linesAfter = 0;
-						nodeKind = 2; // block
-					}
-					textStart = node.sourceEnd+1;
-					ptr++;
-					if (idx > max)  {
-						return linesAfter;
+					} else {
+						linesAfter = printJavadocHtmlTag(htmlTag, block, textOnNewLine);
 					}
+					nodeKind = 1; // text
 				} else {
-					if (idx > 0 && linesAfter > 0) {
-						printJavadocGapLines(previousEnd+1, nextStart, linesAfter, clearBlankLines, false, buffer);
-						textOnNewLine = true;
-					}
-					boolean needIndentation = textOnNewLine;
-					if (idx > 0) {
-						if (!needIndentation && text.isTextAfterHtmlSeparatorTag(idx-1)) {
-							needIndentation = true;
-						}
-					}
-					boolean firstText = idx==1;
-					if (idx > 1 && (previousEnd+1) > (nextStart-1)) {
-						// There's no space between text and html tag or inline block => do not insert space a the beginning of the text
-						firstText = true;
+					if (textOnNewLine) {
+						if (this.commentIndentationLevel > 0) {
+							if (indentationBuffer == null) {
+								indentationBuffer = new StringBuffer();
+						    	for (int j=0; j<this.commentIndentationLevel; j++) {
+									indentationBuffer.append(' ');
+						    	}
+							}
+							addInsertEdit(nodeStart, indentationBuffer.toString());
+							this.column += this.commentIndentationLevel;
+						}
 					}
-					printJavadocTextLine(buffer, nextStart, end, block, firstText, needIndentation, idx==0/* opening html tag?*/ || text.htmlIndexes[idx-1] != -1);
+					printJavadocBlock((FormatJavadocBlock)node);
 					linesAfter = 0;
-				    if (idx==0) {
-				    	if (isHtmlSeparatorTag) {
-					    	linesAfter = 1;
-					    }
-					} else if (text.htmlIndexes[idx-1] == JAVADOC_SINGLE_BREAK_TAG_ID) {
+					nodeKind = 2; // block
+				}
+				textStart = node.sourceEnd+1;
+				ptr++;
+				if (idx > max)  {
+					return linesAfter;
+				}
+			} else {
+				if (idx > 0 && linesAfter > 0) {
+					printJavadocGapLines(previousEnd+1, nextStart, linesAfter, clearBlankLines, false, buffer);
+					textOnNewLine = true;
+				}
+				boolean needIndentation = textOnNewLine;
+				if (idx > 0) {
+					if (!needIndentation && text.isTextAfterHtmlSeparatorTag(idx-1)) {
+						needIndentation = true;
+					}
+				}
+				this.needSpace = idx > 1 && (previousEnd+1) < nextStart; // There's no space between text and html tag or inline block => do not insert space a the beginning of the text
+				printJavadocTextLine(buffer, nextStart, end, block, idx==0, needIndentation, idx==0/* opening html tag?*/ || text.htmlIndexes[idx-1] != -1);
+				linesAfter = 0;
+			    if (idx==0) {
+			    	if (isHtmlSeparatorTag) {
 				    	linesAfter = 1;
 				    }
-				}
+				} else if (text.htmlIndexes[idx-1] == JAVADOC_SINGLE_BREAK_TAG_ID) {
+			    	linesAfter = 1;
+			    }
+			}
 
-				// Replace with current buffer if there are several empty lines between text lines
-				nextStart = (int) text.separators[idx];
-				int endLine = Util.getLineNumber(end, this.lineEnds, startLine-1, this.maxLines);
-				startLine = Util.getLineNumber(nextStart, this.lineEnds, endLine-1, this.maxLines);
-				int linesGap = startLine - endLine;
-				if (linesGap > 0) {
-					if (clearBlankLines && linesGap > 1) {
-						// keep previously computed lines after
-					} else {
-						if (idx==0 || (idx==max && ((text.htmlIndexes[max] & JAVADOC_TAGS_ID_MASK) == htmlTagID)) || (idx < max && nodeKind==1 && (text.htmlIndexes[idx-1] & JAVADOC_TAGS_ID_MASK) != JAVADOC_IMMUTABLE_TAGS_ID)) {
-							if (linesAfter < linesGap) {
-								linesAfter = linesGap;
-							}
+			// Replace with current buffer if there are several empty lines between text lines
+			nextStart = (int) text.separators[idx];
+			int endLine = Util.getLineNumber(end, this.lineEnds, startLine-1, this.maxLines);
+			startLine = Util.getLineNumber(nextStart, this.lineEnds, endLine-1, this.maxLines);
+			int linesGap = startLine - endLine;
+			if (linesGap > 0) {
+				if (clearBlankLines) {
+					// keep previously computed lines after
+				} else {
+					if (idx==0 || linesGap > 1 || (idx < max && nodeKind==1 && (text.htmlIndexes[idx-1] & JAVADOC_TAGS_ID_MASK) != JAVADOC_IMMUTABLE_TAGS_ID)) {
+						if (linesAfter < linesGap) {
+							linesAfter = linesGap;
 						}
 					}
 				}
-				textOnNewLine = linesAfter > 0;
-
-				// print <pre> tag
-				if (isCode) {
-	    			int codeEnd = (int) (text.separators[max] >>> 32);
-	    			if (codeEnd > end) {
-	    				if (this.formatter.preferences.comment_format_source) {
-							if (textStart < end) addReplaceEdit(textStart, end, buffer.toString());
-			    			printJavadocGapLines(end+1, nextStart-1, 1, false/* never clear blank lines inside <pre> tag*/, false, null);
-							printCodeSnippet(nextStart, codeEnd);
-							nextStart = (int) text.separators[max];
-		    				printJavadocGapLines(codeEnd+1, nextStart-1, 1, false/* never clear blank lines inside <pre> tag*/, false, null);
-		    				return 2;
-	    				}
-	    			} else {
-						nextStart = (int) text.separators[max];
-						if ((nextStart-1) > (end+1)) {
-							int line1 = Util.getLineNumber(end+1, this.lineEnds, startLine-1, this.maxLines);
-							int line2 = Util.getLineNumber(nextStart-1, this.lineEnds, line1-1, this.maxLines);
-		    				int gapLines = line2-line1-1;
-							printJavadocGapLines(end+1, nextStart-1, gapLines, false/* never clear blank lines inside <pre> tag*/, false, null);
-							if (gapLines > 0) textOnNewLine = true;
+			}
+			textOnNewLine = linesAfter > 0;
+
+			// print <pre> tag
+			if (isCode) {
+    			int codeEnd = (int) (text.separators[max] >>> 32);
+    			if (codeEnd > end) {
+    				if (this.formatter.preferences.comment_format_source) {
+						if (textStart < end) addReplaceEdit(textStart, end, buffer.toString());
+						// Count the lines until the exact start position of the code
+						this.scanner.resetTo(end+1, nextStart-1);
+						int newLines = 0;
+						try {
+							int token = this.scanner.getNextToken();
+							loop: while (true) {
+								switch (token) {
+									case TerminalTokens.TokenNameWHITESPACE:
+										if (CharOperation.indexOf('\n', this.scanner.source, this.scanner.startPosition, this.scanner.currentPosition) < 0) {
+											break loop;
+										}
+										newLines++;
+										break;
+									case TerminalTokens.TokenNameMULTIPLY:
+										nextStart = this.scanner.currentPosition + 1;
+										break;
+									default:
+										break loop;
+								}
+								token = this.scanner.getNextToken();
+							}
 						}
-	    			}
-					return 1;
-				}
-
-				// store previous end
-				previousEnd = end;
+						catch (InvalidInputException iie) {
+							// skip
+						}
+						if (newLines == 0) newLines=1;
+		    			printJavadocGapLines(end+1, nextStart-1, newLines, false/* clear first blank lines inside <pre> tag as done by old formatter */, false, null);
+						printCodeSnippet(nextStart, codeEnd);
+						nextStart = (int) text.separators[max];
+	    				printJavadocGapLines(codeEnd+1, nextStart-1, 1, false/* clear blank lines inside <pre> tag as done by old formatter */, false, null);
+	    				return 2;
+    				}
+    			} else {
+					nextStart = (int) text.separators[max];
+					if ((nextStart-1) > (end+1)) {
+						int line1 = Util.getLineNumber(end+1, this.lineEnds, startLine-1, this.maxLines);
+						int line2 = Util.getLineNumber(nextStart-1, this.lineEnds, line1-1, this.maxLines);
+	    				int gapLines = line2-line1-1;
+						printJavadocGapLines(end+1, nextStart-1, gapLines, false/* never clear blank lines inside <pre> tag*/, false, null);
+						if (gapLines > 0) textOnNewLine = true;
+					}
+    			}
+				return 1;
 			}
-	    }
+
+			// store previous end
+			previousEnd = end;
+		}
 
 		// Insert last gap
 	    boolean closingTag = isHtmlBreakTag || (text.htmlIndexes != null && (text.htmlIndexes[max] & JAVADOC_TAGS_ID_MASK) == htmlTagID);
@@ -3021,7 +3044,7 @@
 			}
 			if (linesAfter > 0) {
 				printJavadocGapLines(previousEnd+1, nextStart-1, linesAfter, clearBlankLines, false, buffer);
-				textOnNewLine = true;
+				textOnNewLine = linesAfter > 0;
 			}
 		}
 
@@ -3030,15 +3053,15 @@
 		if (!needIndentation && !isHtmlBreakTag && text.htmlIndexes != null && text.isTextAfterHtmlSeparatorTag(max)) {
 			needIndentation = true;
 		}
-		boolean firstText = max <= 0 // single tag (e.g. <br>)
-			|| (previousEnd+1) > (nextStart-1); // There's no space between text and html tag or inline block => do not insert space a the beginning of the text
-		printJavadocTextLine(buffer, nextStart, text.sourceEnd, block, firstText, needIndentation, closingTag/* closing html tag*/);
+		this.needSpace = !closingTag && max > 0 // not a single or not closed tag (e.g. <br>)
+			&& (previousEnd+1) < nextStart; // There's no space between text and html tag or inline block => do not insert space a the beginning of the text
+		printJavadocTextLine(buffer, nextStart, text.sourceEnd, block, max <= 0, needIndentation, closingTag/* closing html tag*/);
 		if (textStart < text.sourceEnd) {
 			addReplaceEdit(textStart, text.sourceEnd, buffer.toString());
 		}
 
 		// Reset
-		needSpace = false;
+		this.needSpace = false;
 		this.scanner.resetTo(text.sourceEnd+1, this.scannerEndPosition - 1);
 
 		// Return the new lines to insert after
@@ -3048,29 +3071,6 @@
 	    return 0;
     }
 
-	private StringBuffer printJavadocIndentationBuffer(FormatJavadocBlock block, int firstColumn) {
-	    boolean indentRootTags = this.formatter.preferences.comment_indent_root_tags && !block.isInDescription();
-		boolean indentParamTag = this.formatter.preferences.comment_indent_parameter_description && block.isInParamTag();
-		StringBuffer indentationBuffer = null;
-		if (indentRootTags) {
-			int indentLevel = this.indentationLevel;
-			int indentations = this.numberOfIndentations;
-			this.numberOfIndentations += (BLOCK_LINE_PREFIX_LENGTH / this.indentationSize) + 1;
-			this.indentationLevel = this.numberOfIndentations * this.indentationSize;
-			int currentColumn = this.column;
-			this.column = firstColumn;
-			if (indentParamTag) {
-				this.indentationLevel += this.indentationSize;
-				this.numberOfIndentations++;
-			}
-			printIndentationIfNecessary(indentationBuffer = new StringBuffer());
-			this.column = currentColumn;
-			this.indentationLevel = indentLevel;
-			this.numberOfIndentations = indentations;
-		}
-	    return indentationBuffer;
-    }
-
 	private void printJavadocNewLine(StringBuffer buffer) {
 	    buffer.append(this.lineSeparator);
 	    this.column = 1;
@@ -3094,13 +3094,15 @@
 
 			// append text to buffer realigning with the line length
 			int end = (int) (text.separators[idx] >>> 32);
-			boolean needIndentation = buffer.length() == 0 && textOnNewLine;
+			boolean needIndentation = textOnNewLine;
 			if (idx > 0) {
 				if (!needIndentation && text.isTextAfterHtmlSeparatorTag(idx-1)) {
 					needIndentation = true;
 				}
 			}
+			this.needSpace = idx > 0;
 			printJavadocTextLine(buffer, nextStart, end, block, idx==0 /*first text?*/, needIndentation, false /*not an html tag*/);
+			textOnNewLine = false;
 
 			// Replace with current buffer if there are several empty lines between text lines
 			nextStart = (int) text.separators[idx];
@@ -3118,9 +3120,10 @@
 		}
 		
 		// Replace remaining line
-		boolean needIndentation = buffer.length() == 0 && textOnNewLine;
+		boolean needIndentation = textOnNewLine;
+		this.needSpace = text.separatorsPtr >= 0;
 		printJavadocTextLine(buffer, nextStart, text.sourceEnd, block, text.separatorsPtr==-1 /* first text?*/, needIndentation, false /*not an html tag*/);
-		// TODO (eric) Bring back following optimization
+		// TODO Bring back following optimization
 		// if (lastNewLines != this.lastNumberOfNewLines || (this.column - currentColumn) != (text.sourceEnd - text.sourceStart + 1)) {
 			addReplaceEdit(textStart, text.sourceEnd, buffer.toString());
 		// }
@@ -3135,46 +3138,32 @@
 	 */
 	private void printJavadocTextLine(StringBuffer buffer, int textStart, int textEnd, FormatJavadocBlock block, boolean firstText, boolean needIndentation, boolean isHtmlTag) {
 
-		boolean indentRootTags = this.formatter.preferences.comment_indent_root_tags && !block.isInDescription();
-		boolean indentParamTag = this.formatter.preferences.comment_indent_parameter_description && block.isInParamTag();
 		boolean headerLine = block.isHeaderLine() && this.lastNumberOfNewLines == 0;
 		
 		// First we need to know what is the indentation
 		StringBuffer tokensBuffer = new StringBuffer();
 		int firstColumn = 1 + this.indentationLevel + BLOCK_LINE_PREFIX_LENGTH;
-		if (headerLine) firstColumn++;
-		StringBuffer indentationBuffer = null;
-		if (indentRootTags) {
-			int indentLevel = this.indentationLevel;
-			int indentations = this.numberOfIndentations;
-			this.numberOfIndentations += (BLOCK_LINE_PREFIX_LENGTH / this.indentationSize) + 1;
-			this.indentationLevel = this.numberOfIndentations * this.indentationSize;
-			int currentColumn = this.column;
-			this.column = firstColumn;
-			if (indentParamTag) {
-				this.indentationLevel += this.indentationSize;
-				this.numberOfIndentations++;
-			}
-			printIndentationIfNecessary(indentationBuffer = new StringBuffer());
-			if (needIndentation) {
-				this.column = firstColumn;
-				printIndentationIfNecessary(buffer);
-			}
-			firstColumn = this.indentationLevel + 1;
-			this.column = currentColumn < firstColumn ? firstColumn : currentColumn;
-			this.indentationLevel = indentLevel;
-			this.numberOfIndentations = indentations;
-		} else if (this.column < firstColumn) {
+		int maxColumn = this.formatter.preferences.comment_line_length + 1;
+		if (headerLine) {
+			firstColumn++;
+			maxColumn++;
+		}
+		if (needIndentation) {
+	    	for (int i=0; i<this.commentIndentationLevel; i++) {
+				buffer.append(' ');
+				this.column++;
+	    	}
+		}
+		if (this.column < firstColumn) {
 			this.column = firstColumn;
 		}
 
 		// Scan the text token per token to compact it and size it the max line length
-		int maxColumn = this.formatter.preferences.comment_line_length + 1;
+		String newLine = null;
 		try {
 			this.scanner.resetTo(textStart, textEnd);
 			this.scanner.skipComments = true;
 			int previousToken = -1;
-			boolean openedString  =false;
 			boolean textOnNewLine = needIndentation;
 
 			// Consume text token per token
@@ -3183,44 +3172,76 @@
 				try {
 					token = this.scanner.getNextToken();
 				} catch (InvalidInputException iie) {
-					boolean insertSpace = (previousToken == TerminalTokens.TokenNameWHITESPACE || (this.scanner.startPosition == textStart && this.column > firstColumn && !firstText)) && !isHtmlTag;
-					String msg = iie.getMessage();
-					if (msg == Scanner.INVALID_CHARACTER_CONSTANT) {
-						if (insertSpace) {
-							tokensBuffer.append(' ');
-						}
-						tokensBuffer.append('\'');
-					} else if (msg == Scanner.INVALID_CHAR_IN_STRING) {
-						if (openedString) {
-							openedString = false;
-						} else {
-							if (insertSpace) {
-								tokensBuffer.append(' ');
-							}
-							openedString = true;
+					boolean insertSpace = (previousToken == TerminalTokens.TokenNameWHITESPACE || this.needSpace) && !isHtmlTag && !textOnNewLine;
+		    		if (insertSpace) {
+		    			tokensBuffer.append(' ');
+		    		}
+					int restart = this.scanner.startPosition;
+					this.scanner.resetTo(restart, textEnd);
+		    		char ch = (char) this.scanner.getNextChar();
+					while (!this.scanner.atEnd() && !ScannerHelper.isWhitespace(ch)) {
+						tokensBuffer.append(ch);
+						if (this.scanner.atEnd()) {
+							previousToken = TerminalTokens.TokenNameEOF;
+							break;
 						}
-						tokensBuffer.append('"');
+						restart = this.scanner.currentPosition;
+						ch = (char) this.scanner.getNextChar();
+					}
+					// restart at the beginning of the whitespace
+					if (this.scanner.atEnd()) {
+						tokensBuffer.append(ch);
 					} else {
-						// skip failure
+						this.scanner.resetTo(restart, textEnd);
 					}
-					// Need to retrieve correct position
-					this.scanner.resetTo(this.scanner.startPosition, textEnd);
-					this.scanner.getNextChar();
-					previousToken = 1;
 					continue;
 				}
 	    		int tokensBufferLength = tokensBuffer.length();
     			int tokenStart = this.scanner.getCurrentTokenStartPosition();
-	    		boolean insertSpace = previousToken == TerminalTokens.TokenNameWHITESPACE || (tokenStart == textStart && this.column > firstColumn && !(firstText || isHtmlTag));
+	    		int tokenLength = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - tokenStart;
+				boolean insertSpace = (previousToken == TerminalTokens.TokenNameWHITESPACE || this.needSpace) && !textOnNewLine;
+				String tokensBufferString = tokensBuffer.toString().trim();
 				switch (token) {
 					case TerminalTokens.TokenNameWHITESPACE:
-						previousToken = token;
 						if (tokensBufferLength > 0) {
-							buffer.append(tokensBuffer);
-							this.column += tokensBufferLength;
+							boolean shouldSplit = (this.column+tokensBufferLength) > maxColumn // the max length is reached
+								&& !isHtmlTag
+								&& (insertSpace || tokensBufferLength > 1) // allow to split at the beginning only when starting with an identifier or a token with a length > 1
+								&& token != TerminalTokens.TokenNameAT && (tokensBufferString.length() == 0 || tokensBufferString.charAt(0) != '@'); // avoid to split just before a '@'
+							if (shouldSplit) {
+								this.lastNumberOfNewLines++;
+								this.line++;
+								if (newLine == null) {
+									StringBuffer newLineBuffer = new StringBuffer(this.lineSeparator);
+							    	this.column = 1;
+							    	printIndentationIfNecessary(newLineBuffer);
+						    		newLineBuffer.append(BLOCK_LINE_PREFIX);
+							    	this.column += BLOCK_LINE_PREFIX_LENGTH;
+						    		for (int i=0; i<this.commentIndentationLevel; i++) {
+										newLineBuffer.append(' ');
+										this.column ++;
+				    				}
+						    		firstColumn = this.column;
+						    		newLine = newLineBuffer.toString();
+								} else {
+									this.column = firstColumn;
+								}
+								buffer.append(newLine);
+								buffer.append(tokensBufferString);
+								this.column += tokensBufferString.length();
+								if (headerLine) {
+									firstColumn--;
+									maxColumn--;
+									headerLine = false;
+								}
+							} else {
+								buffer.append(tokensBuffer);
+								this.column += tokensBufferLength;
+							}
 							tokensBuffer.setLength(0);
 						}
 						textOnNewLine = false;
+						previousToken = token;
 						continue;
 					case TerminalTokens.TokenNameCharacterLiteral:
 						if (this.scanner.currentPosition > this.scanner.eofPosition) {
@@ -3230,20 +3251,14 @@
 						}
 						break;
 				}
-	    		int tokenLength = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - tokenStart;
 	    		int lastColumn = this.column + tokensBufferLength + tokenLength;
 	    		if (insertSpace) lastColumn++;
-	    		if (headerLine) {
-	    			// special case when text is on the same line of the javadoc's header
-	    			if (lastColumn > maxColumn)  {
-	    				lastColumn--; // new line gives an extra character
-	    				this.lastNumberOfNewLines++; // the javadoc will become multi lines
-	    				this.line++;
-	    			}
-	    		}
-				if (lastColumn > maxColumn && token != TerminalTokens.TokenNameAT && (tokensBufferLength == 0 || tokensBuffer.charAt(tokensBufferLength-1) != '@')) {
+				boolean shouldSplit = lastColumn > maxColumn // the max length is reached
+					&& (!isHtmlTag || previousToken == -1) // not an html tag or just at the beginning of it
+					&& token != TerminalTokens.TokenNameAT && (tokensBufferLength == 0 || tokensBuffer.charAt(tokensBufferLength-1) != '@'); // avoid to split just before a '@'
+				if (shouldSplit) {
 					// not enough space on the line
-					if (!isHtmlTag && tokensBufferLength > 0 && (firstColumn+tokensBufferLength+tokenLength) >= maxColumn) {
+					if ((tokensBufferLength > 0 || tokenLength < maxColumn) && !isHtmlTag && tokensBufferLength > 0 && (firstColumn+tokensBufferLength+tokenLength) >= maxColumn) {
 						// there won't be enough room even if we break the line before the buffered tokens
 						// So add the buffered tokens now
 						buffer.append(tokensBuffer);
@@ -3252,22 +3267,28 @@
 						tokensBufferLength = 0;
 						textOnNewLine = false;
 					}
-					if (!textOnNewLine) {
-						if (headerLine && lastColumn == this.column) {
-							this.lastNumberOfNewLines++;
-							this.line++;
+					if ((tokensBufferLength > 0 || tokenLength < maxColumn) && (!textOnNewLine || !firstText)) {
+						this.lastNumberOfNewLines++;
+						this.line++;
+						if (newLine == null) {
+							StringBuffer newLineBuffer = new StringBuffer(this.lineSeparator);
+					    	this.column = 1;
+					    	printIndentationIfNecessary(newLineBuffer);
+				    		newLineBuffer.append(BLOCK_LINE_PREFIX);
+					    	this.column += BLOCK_LINE_PREFIX_LENGTH;
+				    		for (int i=0; i<this.commentIndentationLevel; i++) {
+								newLineBuffer.append(' ');
+								this.column ++;
+		    				}
+				    		firstColumn = this.column;
+				    		newLine = newLineBuffer.toString();
+						} else {
+							this.column = firstColumn;
 						}
-				    	buffer.append(this.lineSeparator);
-				    	this.column = 1;
-				    	printIndentationIfNecessary(buffer);
-			    		buffer.append(BLOCK_LINE_PREFIX);
-				    	this.column = headerLine ? firstColumn-1 : firstColumn;
-				    	if (indentationBuffer != null) {
-				    		buffer.append(indentationBuffer);
-				    	}
+						buffer.append(newLine);
 					}
 			    	if (tokensBufferLength > 0) {
-			    		String tokensString = tokensBuffer.toString().trim();
+			    		String tokensString = tokensBufferString;
 						buffer.append(tokensString);
 						this.column += tokensString.length();
 						tokensBuffer.setLength(0);
@@ -3278,6 +3299,7 @@
 					textOnNewLine = false;
 					if (headerLine) {
 						firstColumn--;
+						maxColumn--;
 						headerLine = false;
 					}
     			} else {
@@ -3288,6 +3310,11 @@
 					tokensBuffer.append(this.scanner.source, tokenStart, tokenLength);
     			}
 				previousToken = token;
+    			this.needSpace = false;
+    			if (lastColumn == maxColumn && this.scanner.atEnd()) {
+					this.lastNumberOfNewLines++;
+					this.line++;
+    			}
     		}
 		}
 		finally {
Index: formatter/org/eclipse/jdt/internal/formatter/FormatJavadocBlock.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/FormatJavadocBlock.java,v
retrieving revision 1.6
diff -u -r1.6 FormatJavadocBlock.java
--- formatter/org/eclipse/jdt/internal/formatter/FormatJavadocBlock.java	28 Apr 2008 16:30:00 -0000	1.6
+++ formatter/org/eclipse/jdt/internal/formatter/FormatJavadocBlock.java	11 May 2008 18:02:16 -0000
@@ -179,7 +179,17 @@
 			// Text breakage
 			if (lastText.isHtmlTag() && text != null) {
 				// Set some lines before if previous was specific html tag
-				if (lastText.separatorsPtr == -1 || lastText.isClosingHtmlTag()) {
+				// The added text is concerned if the parent has no child yet or is top level and closing html tag
+				boolean setLinesBefore = lastText.separatorsPtr == -1 || (ptr == 0 && lastText.isClosingHtmlTag());
+				if (!setLinesBefore && ptr > 0 && lastText.isClosingHtmlTag()) {
+					// for non-top level closing html tag, text is concerned only if no new text has been written after
+					FormatJavadocText parentText = textHierarchy[ptr-1];
+					int textStart = (int) parentText.separators[parentText.separatorsPtr];
+					if (textStart < lastText.sourceStart) {
+						setLinesBefore = true;
+					}
+				}
+				if (setLinesBefore) {
 					switch (lastText.getHtmlTagID()) {
 						case JAVADOC_CODE_TAGS_ID:
 							if (text.linesBefore < 2) {
Index: formatter/org/eclipse/jdt/internal/formatter/comment/IJavaDocTagConstants.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/comment/IJavaDocTagConstants.java,v
retrieving revision 1.10
diff -u -r1.10 IJavaDocTagConstants.java
--- formatter/org/eclipse/jdt/internal/formatter/comment/IJavaDocTagConstants.java	28 Apr 2008 16:30:00 -0000	1.10
+++ formatter/org/eclipse/jdt/internal/formatter/comment/IJavaDocTagConstants.java	11 May 2008 18:02:17 -0000
@@ -31,7 +31,6 @@
 		"li".toCharArray(), //$NON-NLS-1$
 		"td".toCharArray(), //$NON-NLS-1$
 		"th".toCharArray(), //$NON-NLS-1$
-		"tr".toCharArray(), //$NON-NLS-1$
 		"h1".toCharArray(), //$NON-NLS-1$
 		"h2".toCharArray(), //$NON-NLS-1$
 		"h3".toCharArray(), //$NON-NLS-1$
@@ -87,6 +86,7 @@
 			"ul".toCharArray(), //$NON-NLS-1$
 			"ol".toCharArray(), //$NON-NLS-1$
 			"table".toCharArray(), //$NON-NLS-1$
+			"tr".toCharArray(), //$NON-NLS-1$
 	};
 
 	/**
#P org.eclipse.jdt.core.tests.model
Index: workspace/FormatterJavadoc/test/wksp/ganymede/out/clear_blank_lines/X03.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/ganymede/out/clear_blank_lines/X03.java,v
retrieving revision 1.1
diff -u -r1.1 X03.java
--- workspace/FormatterJavadoc/test/wksp/ganymede/out/clear_blank_lines/X03.java	6 May 2008 08:47:47 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/ganymede/out/clear_blank_lines/X03.java	11 May 2008 18:02:22 -0000
@@ -15,8 +15,7 @@
  * </p>
  * 
  * @see org.eclipse.gmf.mappings.GMFMapPackage#getAuditedMetricTarget()
- * @model annotation=
- * 	"http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='\'ecore::EDoubleObject\''"
+ * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='\'ecore::EDoubleObject\''"
  * @generated
  */
 public class X03 {
Index: workspace/FormatterJavadoc/test/wksp/ganymede/out/clear_blank_lines/X04.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/ganymede/out/clear_blank_lines/X04.java,v
retrieving revision 1.1
diff -u -r1.1 X04.java
--- workspace/FormatterJavadoc/test/wksp/ganymede/out/clear_blank_lines/X04.java	6 May 2008 08:47:46 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/ganymede/out/clear_blank_lines/X04.java	11 May 2008 18:02:22 -0000
@@ -8,9 +8,9 @@
  * 
  * @see org.eclipse.gmf.mappings.GMFMapPackage#getFeatureValueSpec()
  * @model annotation=
- * 	"http://www.eclipse.org/gmf/2005/constraints/meta def='ValueSpec'"
- * 	annotation=
- * 	"http://www.eclipse.org/gmf/2005/constraints/meta def='type' ocl='feature'"
+ *        "http://www.eclipse.org/gmf/2005/constraints/meta def='ValueSpec'"
+ *        annotation=
+ *        "http://www.eclipse.org/gmf/2005/constraints/meta def='type' ocl='feature'"
  * @generated
  */
 public class X04 {
Index: workspace/FormatterJavadoc/test/example/out/default/X17c.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X17c.java,v
retrieving revision 1.2
diff -u -r1.2 X17c.java
--- workspace/FormatterJavadoc/test/example/out/default/X17c.java	28 Apr 2008 16:29:56 -0000	1.2
+++ workspace/FormatterJavadoc/test/example/out/default/X17c.java	11 May 2008 18:02:21 -0000
@@ -10,14 +10,15 @@
 	 * </p>
 	 * 
 	 * @exception Exception
-	 * 		in one of the corresponding situation:
-	 * 		<ul>
-	 * 		<li>this element does not exist</li>
-	 * 		<li>an exception occurs while accessing its corresponding resource
-	 * 		</li>
-	 * 		<li>a classpath variable or classpath container was not resolvable
-	 * 		and <code>ignoreUnresolvedEntry</code> is <code>false</code>.</li>
-	 * 		</ul>
+	 *                in one of the corresponding situation:
+	 *                <ul>
+	 *                <li>this element does not exist</li>
+	 *                <li>an exception occurs while accessing its corresponding
+	 *                resource</li>
+	 *                <li>a classpath variable or classpath container was not
+	 *                resolvable and <code>ignoreUnresolvedEntry</code> is
+	 *                <code>false</code>.</li>
+	 *                </ul>
 	 * @see String
 	 */
 	String getResolvedClasspath(boolean ignoreUnresolvedEntry) throws Exception;
Index: workspace/FormatterJavadoc/test/example/out/default/X09.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X09.java,v
retrieving revision 1.2
diff -u -r1.2 X09.java
--- workspace/FormatterJavadoc/test/example/out/default/X09.java	27 Apr 2008 10:01:23 -0000	1.2
+++ workspace/FormatterJavadoc/test/example/out/default/X09.java	11 May 2008 18:02:21 -0000
@@ -3,12 +3,12 @@
 public class X09 {
 	/**
 	 * @param parent
-	 * 		the parent control under which the control must be created
+	 *            the parent control under which the control must be created
 	 * @param direction
-	 * 		the layout direction of the contents, either
-	 * 		<code>SWT.HORIZONTAL</code> or <code>SWT.VERTICAL</code>
+	 *            the layout direction of the contents, either
+	 *            <code>SWT.HORIZONTAL</code> or <code>SWT.VERTICAL</code>
 	 * @return the SWT control hierarchy for the outline part of the compare
-	 * 	editor
+	 *         editor
 	 * @since 3.0
 	 */
 	String foo(Object parent, int direction) {
Index: workspace/FormatterJavadoc/test/example/out/default/X14b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X14b.java,v
retrieving revision 1.1
diff -u -r1.1 X14b.java
--- workspace/FormatterJavadoc/test/example/out/default/X14b.java	16 Apr 2008 11:55:43 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/default/X14b.java	11 May 2008 18:02:21 -0000
@@ -1,11 +1,11 @@
-package test.example;
+package test.prefs.example;
 
 public class X14b {
 	/**
 	 * Tests a new (<code>DiffNode</code>) code syntax
 	 * 
 	 * @param kind
-	 * 		of difference (defined in <code>Differencer</code>)
+	 *            of difference (defined in <code>Differencer</code>)
 	 */
 	public void foo() {
 
Index: workspace/FormatterJavadoc/test/example/out/default/X01.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X01.java,v
retrieving revision 1.1
diff -u -r1.1 X01.java
--- workspace/FormatterJavadoc/test/example/out/default/X01.java	14 Apr 2008 21:52:17 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/default/X01.java	11 May 2008 18:02:21 -0000
@@ -33,10 +33,10 @@
 	 * the javadoc comment.
 	 * 
 	 * @param a
-	 * 		The first parameter. For an optimum result, this should be an odd
-	 * 		number between 0 and 100.
+	 *            The first parameter. For an optimum result, this should be an
+	 *            odd number between 0 and 100.
 	 * @param b
-	 * 		The second parameter.
+	 *            The second parameter.
 	 * @return The result of the foo operation, usually within 0 and 1000.
 	 */
 	int foo(int a, int b);
Index: workspace/FormatterJavadoc/test/example/out/default/X16a.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X16a.java,v
retrieving revision 1.1
diff -u -r1.1 X16a.java
--- workspace/FormatterJavadoc/test/example/out/default/X16a.java	23 Apr 2008 10:13:40 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/default/X16a.java	11 May 2008 18:02:21 -0000
@@ -10,7 +10,7 @@
 	 * failure has occurred).
 	 * 
 	 * @return <code>true</code> if the checkIn failed, and <code>false</code>
-	 * 	otherwise.
+	 *         otherwise.
 	 */
 	boolean foo() {
 		return false;
Index: workspace/FormatterJavadoc/test/example/out/default/X14c.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X14c.java,v
retrieving revision 1.1
diff -u -r1.1 X14c.java
--- workspace/FormatterJavadoc/test/example/out/default/X14c.java	16 Apr 2008 11:55:43 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/default/X14c.java	11 May 2008 18:02:21 -0000
@@ -1,11 +1,11 @@
-package test.example;
+package test.prefs.example;
 
 public class X14c {
 	/**
 	 * Tests a new (<code>DiffNode</code>) code syntax
 	 * 
 	 * @param kind
-	 * 		of difference (defined in <code>Differencer</code>)
+	 *            of difference (defined in <code>Differencer</code>)
 	 */
 	public void foo() {
 
Index: workspace/FormatterJavadoc/test/example/out/default/X17b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X17b.java,v
retrieving revision 1.1
diff -u -r1.1 X17b.java
--- workspace/FormatterJavadoc/test/example/out/default/X17b.java	23 Apr 2008 10:13:40 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/default/X17b.java	11 May 2008 18:02:21 -0000
@@ -8,7 +8,7 @@
 	 * not resolvable).
 	 * 
 	 * @param entry
-	 * 		the given entry
+	 *            the given entry
 	 * @return the existing package fragment roots identified by the given entry
 	 */
 	Object findPackageFragmentRoots(String entry);
Index: workspace/FormatterJavadoc/test/example/out/default/X03.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X03.java,v
retrieving revision 1.2
diff -u -r1.2 X03.java
--- workspace/FormatterJavadoc/test/example/out/default/X03.java	27 Apr 2008 10:01:23 -0000	1.2
+++ workspace/FormatterJavadoc/test/example/out/default/X03.java	11 May 2008 18:02:21 -0000
@@ -1,8 +1,7 @@
 package test.prefs.example;
 
 /**
- * A test case defines the fixture to run multiple tests. To define a test case
- * <br>
+ * A test case defines the fixture to run multiple tests. To define a test case<br>
  * 1) implement a subclass of TestCase<br>
  * 2) define instance variables that store the state of the fixture<br>
  * 3) initialize the fixture state by overriding <code>setUp</code><br>
Index: workspace/FormatterJavadoc/test/example/out/default/X08.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X08.java,v
retrieving revision 1.2
diff -u -r1.2 X08.java
--- workspace/FormatterJavadoc/test/example/out/default/X08.java	27 Apr 2008 10:01:23 -0000	1.2
+++ workspace/FormatterJavadoc/test/example/out/default/X08.java	11 May 2008 18:02:21 -0000
@@ -3,12 +3,12 @@
 public class X08 {
 	/**
 	 * @param parent
-	 * 		the parent control under which the control must be created
+	 *            the parent control under which the control must be created
 	 * @param direction
-	 * 		the layout direction of the contents, either </code>SWT.HORIZONTAL
-	 * 		<code> or </code>SWT.VERTICAL<code>
+	 *            the layout direction of the contents, either
+	 *            </code>SWT.HORIZONTAL<code> or </code>SWT.VERTICAL<code>
 	 * @return the SWT control hierarchy for the outline part of the compare
-	 * 	editor
+	 *         editor
 	 * @since 3.0
 	 */
 	String foo(Object parent, int direction) {
Index: workspace/FormatterJavadoc/test/example/out/default/X07.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/example/out/default/X07.java
diff -N workspace/FormatterJavadoc/test/example/out/default/X07.java
--- workspace/FormatterJavadoc/test/example/out/default/X07.java	14 Apr 2008 21:52:18 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-package test.prefs.example;
-
-public class X07 {
-
-	/**
-	 * Don't format this:
-	 *    it has been formatted by the user!
-	 * 
-	 * @param param
-	 * 		format this comment
-	 */
-	void foo(String param) {
-	}
-}
Index: workspace/FormatterJavadoc/test/example/out/default/X05.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X05.java,v
retrieving revision 1.1
diff -u -r1.1 X05.java
--- workspace/FormatterJavadoc/test/example/out/default/X05.java	14 Apr 2008 21:52:17 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/default/X05.java	11 May 2008 18:02:21 -0000
@@ -7,7 +7,7 @@
 	 * set.
 	 * 
 	 * @param str
-	 * 		The input string
+	 *            The input string
 	 */
 	void foo(String str) {
 	}
Index: workspace/FormatterJavadoc/test/example/out/default/X14.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X14.java,v
retrieving revision 1.1
diff -u -r1.1 X14.java
--- workspace/FormatterJavadoc/test/example/out/default/X14.java	23 Apr 2008 10:13:40 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/default/X14.java	11 May 2008 18:02:21 -0000
@@ -3,7 +3,7 @@
 public class X14 {
 	/**
 	 * @param kind
-	 * 		of difference (defined in <code>Differencer</code>)
+	 *            of difference (defined in <code>Differencer</code>)
 	 */
 	public void foo() {
 
Index: workspace/FormatterJavadoc/test/example/out/default/X16b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X16b.java,v
retrieving revision 1.1
diff -u -r1.1 X16b.java
--- workspace/FormatterJavadoc/test/example/out/default/X16b.java	23 Apr 2008 10:13:40 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/default/X16b.java	11 May 2008 18:02:21 -0000
@@ -7,13 +7,13 @@
 	 * The given message is included in that exception, to aid debugging.
 	 * 
 	 * @param expression
-	 * 		the outcode of the check
+	 *            the outcode of the check
 	 * @param message
-	 * 		the message to include in the exception
+	 *            the message to include in the exception
 	 * @return <code>true</code> if the check passes (does not return if the
-	 * 	check fails)
+	 *         check fails)
 	 * @exception IllegalArgumentException
-	 * 		if the legality test failed
+	 *                if the legality test failed
 	 */
 	boolean foo(int expression, String message) {
 		return false;
Index: workspace/FormatterJavadoc/test/example/out/default/X06.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X06.java,v
retrieving revision 1.1
diff -u -r1.1 X06.java
--- workspace/FormatterJavadoc/test/example/out/default/X06.java	14 Apr 2008 21:52:18 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/default/X06.java	11 May 2008 18:02:21 -0000
@@ -5,7 +5,7 @@
 	 * Runs the bare test sequence.
 	 * 
 	 * @exception Throwable
-	 * 		if any exception is thrown
+	 *                if any exception is thrown
 	 */
 	public void runBare() throws Throwable {
 	}
@@ -14,7 +14,7 @@
 	 * Override to run the test and assert its state.
 	 * 
 	 * @exception Throwable
-	 * 		if any exception is thrown
+	 *                if any exception is thrown
 	 */
 	protected void runTest() throws Throwable {
 	}
Index: workspace/FormatterJavadoc/test/example/out/default/X14d.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X14d.java,v
retrieving revision 1.1
diff -u -r1.1 X14d.java
--- workspace/FormatterJavadoc/test/example/out/default/X14d.java	16 Apr 2008 13:29:33 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/default/X14d.java	11 May 2008 18:02:21 -0000
@@ -1,11 +1,11 @@
-package test.tags.param;
+package test.prefs.example;
 
 public class X14d {
 	/**
 	 * Returns a collection of projects referenced by a build scope attribute.
 	 * 
 	 * @param scope
-	 * 		build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
+	 *            build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
 	 * @return collection of porjects referred to by the scope attribute
 	 */
 	int foo() {
Index: workspace/FormatterJavadoc/test/example/out/default/X14a.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/default/X14a.java,v
retrieving revision 1.1
diff -u -r1.1 X14a.java
--- workspace/FormatterJavadoc/test/example/out/default/X14a.java	16 Apr 2008 11:55:43 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/default/X14a.java	11 May 2008 18:02:21 -0000
@@ -1,11 +1,11 @@
-package test.example;
+package test.prefs.example;
 
 public class X14a {
 	/**
 	 * Tests a new (<code>DiffNode</code>) code syntax
 	 * 
 	 * @param kind
-	 * 		of difference (defined in <code>Differencer</code>)
+	 *            of difference (defined in <code>Differencer</code>)
 	 */
 	public void foo() {
 
Index: src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsTests.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsTests.java,v
retrieving revision 1.15
diff -u -r1.15 FormatterCommentsTests.java
--- src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsTests.java	8 May 2008 19:03:17 -0000	1.15
+++ src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsTests.java	11 May 2008 18:02:21 -0000
@@ -405,6 +405,8 @@
 	formatUnit("html.others", "X02c.java");
 }
 public void testHtmlOthers02d() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed tags issue with max length
 	formatUnit("html.others", "X02d.java");
 }
 public void testHtmlOthers02e() throws JavaModelException {
@@ -444,28 +446,20 @@
 /*
  * Test formatter tags <pre>
  */
-public void testHtmlPre() throws JavaModelException {
-	formatUnit("html.pre", "X.java");
+public void testHtmlPre01() throws JavaModelException {
+	formatUnit("html.pre", "X01.java");
 }
-/* 
- * Blank lines inside the <pre> tag are preserved although there were removed
- * in JDT/Text formatter.
- * 
- * TODO open a bug for this a retrieve an existing one
- */
 public void testHtmlPre02() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) Blank lines inside the <pre> tag are now preserved
 	formatUnit("html.pre", "X02.java");
 }
 public void testHtmlPre03() throws JavaModelException {
 	formatUnit("html.pre", "X03.java");
 }
-/* 
- * Blank lines inside the <pre> tag are preserved although there were removed
- * in JDT/Text formatter.
- * 
- * TODO open a bug for this a retrieve an existing one
- */
 public void testHtmlPre04() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) Blank lines inside the <pre> tag are now preserved
 	formatUnit("html.pre", "X04.java");
 }
 public void testHtmlPre05() throws JavaModelException {
@@ -475,6 +469,8 @@
 	formatUnit("html.pre", "X06.java");
 }
 public void testHtmlPre07() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) Blank lines inside the <pre> tag are now preserved
 	formatUnit("html.pre", "X07.java");
 }
 public void testHtmlPre08() throws JavaModelException {
@@ -543,9 +539,13 @@
 	formatUnit("lines", "X01.java");
 }
 public void testLines02() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed max length issue when comment has only one line
 	formatUnit("lines", "X02.java");
 }
 public void testLines03() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed max length issue when comment has only one line
 	formatUnit("lines", "X03.java");
 }
 public void testLines04() throws JavaModelException {
@@ -564,13 +564,15 @@
 	formatUnit("lines", "X08.java");
 }
 public void testLines09() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed max length issue when comment has only one line
 	formatUnit("lines", "X09.java");
 }
 
 /*
  * Test formatter preferences example
  */
-public void testPreferencesExample() throws JavaModelException {
+public void testPreferencesExample01() throws JavaModelException {
 	formatUnit("example", "X01.java");
 }
 public void testPreferencesExample02() throws JavaModelException {
@@ -588,11 +590,13 @@
 public void testPreferencesExample06() throws JavaModelException {
 	formatUnit("example", "X06.java");
 }
-// TODO Fix bug ?
+// bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=196124
 public void _testPreferencesExample07() throws JavaModelException {
 	formatUnit("example", "X07.java");
 }
 public void testPreferencesExample08() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
 	formatUnit("example", "X08.java");
 }
 public void testPreferencesExample09() throws JavaModelException {
@@ -606,9 +610,14 @@
 	formatUnit("example", "X11.java");
 }
 public void testPreferencesExample12() throws JavaModelException {
+	// Difference with old formatter: 
+	// TODO Decide how split line when closing line is over the max length
 	formatUnit("example", "X12.java");
 }
 public void testPreferencesExample13() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
+	// TODO the point is now put alone on a new line after the <code> tag
 	formatUnit("example", "X13.java");
 }
 public void testPreferencesExample14() throws JavaModelException {
@@ -639,6 +648,8 @@
 	formatUnit("example", "X16a.java");
 }
 public void testPreferencesExample16b() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
 	formatUnit("example", "X16b.java");
 }
 public void testPreferencesExample17a() throws JavaModelException {
@@ -671,6 +682,8 @@
 	formatUnit("tags.others", "X01.java");
 }
 public void testTagOthers02() throws JavaModelException {
+	// Difference with old formatter:
+	// 1) tag description is not indented when an empty line exists in the description
 	formatUnit("tags.others", "X02.java");
 }
 public void testTagOthers03() throws JavaModelException {
@@ -687,6 +700,8 @@
 	formatUnit("tags.param", "X02.java");
 }
 public void testTagParam03() throws JavaModelException {
+	// Difference with old formatter:
+	// 1) tag description is not indented when an empty line exists in the description
 	formatUnit("tags.param", "X03.java");
 }
 public void testTagParam04() throws JavaModelException {
@@ -728,9 +743,15 @@
 	formatUnit("tags.link", "X01.java");
 }
 public void testTagLink02() throws JavaModelException {
+	// Difference with old formatter:
+	// 1) fixed description in inline tag we should be formatted as text
+	// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=231297
 	formatUnit("tags.link", "X02.java");
 }
 public void testTagLink02b() throws JavaModelException {
+	// Difference with old formatter:
+	// 1) fixed description in inline tag we should be formatted as text
+	// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=231297
 	formatUnit("tags.link", "X02b.java");
 }
 public void testTagLink03a() throws JavaModelException {
@@ -877,12 +898,20 @@
  */
 // Full source performances 3.0
 public void testWkspEclipse01() throws JavaModelException {
+	// Difference with old formatter:
+	// 1) tag description is not indented when an empty line exists in the description
 	formatUnit("wksp.eclipse", "X01.java");
 }
 public void testWkspEclipse02() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
+	// 2) fixed space after open html tag
 	formatUnit("wksp.eclipse", "X02.java");
 }
 public void testWkspEclipse02b() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
+	// 2) fixed extra space after open html tag
 	formatUnit("wksp.eclipse", "X02b.java");
 }
 public void testWkspEclipse03() throws JavaModelException {
@@ -896,12 +925,16 @@
 	formatUnit("wksp.eclipse", "X05.java");
 }
 public void testWkspEclipse06() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed invalid description indentation when param ref is invalid
 	formatUnit("wksp.eclipse", "X06.java");
 }
 public void testWkspEclipse07() throws JavaModelException {
 	formatUnit("wksp.eclipse", "X07.java");
 }
 public void testWkspEclipse08() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
 	formatUnit("wksp.eclipse", "X08.java");
 }
 public void testWkspEclipse08b() throws JavaModelException {
@@ -911,11 +944,10 @@
 	formatUnit("wksp.eclipse", "X08c.java");
 }
 public void testWkspEclipse09() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed max length issue when comment has only one line
 	formatUnit("wksp.eclipse", "X09.java");
 }
-public void testWkspEclipse09b() throws JavaModelException {
-	formatUnit("wksp.eclipse", "X09b.java");
-}
 public void testWkspEclipse10() throws JavaModelException {
 	formatUnit("wksp.eclipse", "X10.java");
 }
@@ -929,51 +961,98 @@
 	formatUnit("wksp.eclipse", "X11c.java");
 }
 public void testWkspEclipse12() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
+	// TODO the string is now put on 2 lines
 	formatUnit("wksp.eclipse", "X12.java");
 }
 public void testWkspEclipse12b() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
+	// TODO the string is now put on 2 lines
 	formatUnit("wksp.eclipse", "X12b.java");
 }
 public void testWkspEclipse13() throws JavaModelException {
 	formatUnit("wksp.eclipse", "X13.java");
 }
 public void testWkspEclipse14() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed description in inline tag we should be formatted as text
+	// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=231297
 	formatUnit("wksp.eclipse", "X14.java");
 }
 public void testWkspEclipse15() throws JavaModelException {
 	formatUnit("wksp.eclipse", "X15.java");
 }
 public void testWkspEclipse16() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) Allow split between text tokens when max length is reached
+	// TODO verify that this behavior is OK
 	formatUnit("wksp.eclipse", "X16.java");
 }
 public void testWkspEclipse17() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) Consider that code is immutable => do not change the content of <pre> inside
+	// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=229580
 	formatUnit("wksp.eclipse", "X17.java");
 }
 public void testWkspEclipse18() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed description in inline tag we should be formatted as text
+	// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=231297
+	// 2) fixed wrong max length with immutable tags
+	// TODO opening and closing parenthesis are separated from <code> tags
 	formatUnit("wksp.eclipse", "X18.java");
 }
 public void testWkspEclipse19() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed extra space between link tag name and reference
+	// 2) fixed description in inline tag we should be formatted as text
+	// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=231297
 	formatUnit("wksp.eclipse", "X19.java");
 }
 public void testWkspEclipse20() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
 	formatUnit("wksp.eclipse", "X20.java");
 }
 public void testWkspEclipse21() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
+	// 2) tag description is not indented when an empty line exists in the description
+	// 3) split line on closing html tags when over the max length
+	// TODO Verify that 3) is OK
 	formatUnit("wksp.eclipse", "X21.java");
 }
 public void testWkspEclipse22() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed max length issue when comment has only one line
+	// TODO the point is put alone on next line
 	formatUnit("wksp.eclipse", "X22.java");
 }
 public void testWkspEclipse23() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
+	// 2) fixed issue with javadoc line start (' *' instead of expected  ' * ')
+	// 3) fixed issue with </table> closing tag
+	// 4) fixed extra space after open html tag
 	formatUnit("wksp.eclipse", "X23.java");
 }
 public void testWkspEclipse24() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
+	// TODO closing parenthesis is separated from <code> tags
 	formatUnit("wksp.eclipse", "X24.java");
 }
 public void testWkspEclipse25() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
 	formatUnit("wksp.eclipse", "X25.java");
 }
 public void testWkspEclipse26() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) Consider that code is immutable => do not change the content of <pre> inside
+	// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=229580
 	formatUnit("wksp.eclipse", "X26.java");
 }
 public void testWkspEclipse27() throws JavaModelException {
@@ -989,32 +1068,70 @@
 	formatUnit("wksp.eclipse", "X28c.java");
 }
 public void testWkspEclipse28d() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) Do not split line when it will start with '@'
+	// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=229683
 	formatUnit("wksp.eclipse", "X28d.java");
 }
 public void testWkspEclipse29() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) Consider any tag as normal root tag when syntax is invalid
+	// 2) Split line just after the identifier when name syntax is invalid
+	// TODO verify that these 2 new rules are OK
 	formatUnit("wksp.eclipse", "X29.java");
 }
 public void testWkspEclipse30() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) Consider any tag as normal root tag when syntax is invalid
+	// TODO verify that this new rules is OK
 	formatUnit("wksp.eclipse", "X30.java");
 }
 public void testWkspEclipse31() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with inline tags
 	formatUnit("wksp.eclipse", "X31.java");
 }
 public void testWkspEclipse32() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
+	// TODO the final point is put alone on next line
 	formatUnit("wksp.eclipse", "X32.java");
 }
+public void testWkspEclipse33() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with '*'
+	formatUnit("wksp.eclipse", "X33.java");
+}
+public void testWkspEclipse33b() throws JavaModelException {
+	formatUnit("wksp.eclipse", "X33b.java");
+}
+public void testWkspEclipse34() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
+	formatUnit("wksp.eclipse", "X34.java");
+}
 // Ganymede
 // TODO pass this test
 public void _testWkspGanymede01() throws JavaModelException {
 	formatUnit("wksp.ganymede", "X02.java");
 }
 public void testWkspGanymede02() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed extra space between link tag name and reference
 	formatUnit("wksp.ganymede", "X02.java");
 }
 public void testWkspGanymede03() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
+	// 2) fixed description in inline tag we should be formatted as text
+	// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=231297
+	// 3) fixed string split
 	formatUnit("wksp.ganymede", "X03.java");
 }
 public void testWkspGanymede04() throws JavaModelException {
+	// Difference with old formatter: 
+	// 1) fixed wrong max length with immutable tags
+	// 2) fixed string split
 	formatUnit("wksp.ganymede", "X04.java");
 }
 // JUnit 3.8.2
Index: src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsMassiveTests.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsMassiveTests.java,v
retrieving revision 1.14
diff -u -r1.14 FormatterCommentsMassiveTests.java
--- src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsMassiveTests.java	8 May 2008 20:52:57 -0000	1.14
+++ src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsMassiveTests.java	11 May 2008 18:02:21 -0000
@@ -62,36 +62,10 @@
  * formatting of JUnit 3.8.2 files:
  * <ul>
  * 	<li>0 error</li>
- * 	<li>2 failures:
- * 		<ol>
- * 			<li>TestCase.java:
- * 				incorrect line length in old formatter
- * 				incorrect indentation in tag param in old formatter
- * 			</li>
- * 			<li>TestCaseClassLoader.java:
- * 				incorrect line length in old formatter
- * 			</li>
- * 		</lo>
- * 	</li>
- * 	<li>9 files have different line leading spaces than old formatter:
- * 		<ol>
- * 			<li>	- C:\eclipse\workspaces\tests\v34\Javadoc\JUnit_3.8.2\src\junit\framework\Assert.java</li>
- * 			<li>	- C:\eclipse\workspaces\tests\v34\Javadoc\JUnit_3.8.2\src\junit\framework\ComparisonFailure.java</li>
- * 			<li>	- C:\eclipse\workspaces\tests\v34\Javadoc\JUnit_3.8.2\src\junit\framework\TestSuite.java</li>
- * 			<li>	- C:\eclipse\workspaces\tests\v34\Javadoc\JUnit_3.8.2\src\junit\runner\BaseTestRunner.java</li>
- * 			<li>	- C:\eclipse\workspaces\tests\v34\Javadoc\JUnit_3.8.2\src\junit\tests\extensions\AllTests.java</li>
- * 			<li>	- C:\eclipse\workspaces\tests\v34\Javadoc\JUnit_3.8.2\src\junit\tests\framework\AllTests.java</li>
- * 			<li>	- C:\eclipse\workspaces\tests\v34\Javadoc\JUnit_3.8.2\src\junit\tests\runner\AllTests.java</li>
- * 			<li>	- C:\eclipse\workspaces\tests\v34\Javadoc\JUnit_3.8.2\src\junit\tests\runner\BaseTestRunnerTest.java</li>
- * 			<li>	- C:\eclipse\workspaces\tests\v34\Javadoc\JUnit_3.8.2\src\junit\textui\ResultPrinter.java</li>
- * 		</ol>
- * 	</li>
- * 	<li>1 lines leading spaces differences with old formatter:
- * 		<ol>
- * 			<li>n°2: ComparisonFailure.java</li>
- * 		</ol>
- * 	</li>
- *		</ul></li>
+ * 	<li>0 failure</li>
+ * 	<li>0 file has different line leading spaces than old formatter</li>
+ * 	<li>23 files have spaces differences with old formatter</li>
+ *		</ul>
  * </p><p>
  * TODO Fix failures while running on workspaces without comparing.
  * 
@@ -129,14 +103,14 @@
  * 		<li>0 error</li>
  * 		<li>0 failures</li>
  * 		<li>8 failures due to old formatter</li>
- * 		<li>726 files have different lines leading spaces</li>
+ * 		<li>722 files have different lines leading spaces</li>
  * 		<li>9 files have different spaces</li>
  *		</ul></li>
  *		<li>ganymede M5 workspace (25819 units):<ul>
  * 		<li>0 error</li>
  * 		<li>17 files has still different output while reformatting!</li>
  * 		<li>15 failures due to old formatter</li>
- * 		<li>1373 files have different line leading spaces when reformatting!</li>
+ * 		<li>1368 files have different line leading spaces when reformatting!</li>
  * 		<li>14 files have different spaces when reformatting!</li>
  *		</ul></li>
  *		<li>ganymede M6a workspace (26336 units):<ul>
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X14.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X14.java,v
retrieving revision 1.1
diff -u -r1.1 X14.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X14.java	25 Apr 2008 13:11:54 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X14.java	11 May 2008 18:02:22 -0000
@@ -7,13 +7,15 @@
 	 * resource. The client is responsible for closing the stream when finished.
 	 * 
 	 * @param href
-	 * 	the URL (as a string) of the help resource
-	 * 	<p>
-	 * 	Valid href are as described in {@link
-	 * 	org.eclipse.help.IHelpResource#getHref IHelpResource.getHref}
-	 * 	</p>
+	 *        the URL (as a string) of the help resource
+	 *        <p>
+	 *        Valid href are as described in
+	 *        {@link org.eclipse.help.IHelpResource#getHref
+	 *        IHelpResource.getHref}
+	 *        </p>
 	 * @return an input stream containing the contents of the help resource, or
-	 * 	<code>null</code> if the help resource could not be found and opened
+	 *         <code>null</code> if the help resource could not be found and
+	 *         opened
 	 */
 	int foo(String href) {
 		return 0;
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X21.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X21.java,v
retrieving revision 1.2
diff -u -r1.2 X21.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X21.java	28 Apr 2008 16:29:56 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X21.java	11 May 2008 18:02:22 -0000
@@ -5,7 +5,9 @@
 	/**
 	 * Returns a search pattern based on a given string pattern. The string
 	 * patterns support '*' wild-cards. The remaining parameters are used to
-	 * narrow down the type of expected results. <br>
+	 * narrow down the type of expected results.
+	 * 
+	 * <br>
 	 * Examples:
 	 * <ul>
 	 * <li>search for case insensitive references to <code>Object</code>:
@@ -20,46 +22,48 @@
 	 * </ul>
 	 * 
 	 * @param stringPattern
-	 * 	the given pattern
+	 *        the given pattern
 	 * @param searchFor
-	 * 	determines the nature of the searched elements
-	 * 	<ul>
-	 * 	<li><code>IJavaSearchConstants.CLASS</code>: only look for classes</li>
-	 * 	<li><code>IJavaSearchConstants.INTERFACE</code>: only look for
-	 * 	interfaces</li>
-	 * 	<li><code>IJavaSearchConstants.TYPE</code>: look for both classes and
-	 * 	interfaces</li>
-	 * 	<li><code>IJavaSearchConstants.FIELD</code>: look for fields</li>
-	 * 	<li><code>IJavaSearchConstants.METHOD</code>: look for methods</li>
-	 * 	<li><code>IJavaSearchConstants.CONSTRUCTOR</code>: look for constructors
-	 * 	</li>
-	 * 	<li><code>IJavaSearchConstants.PACKAGE</code>: look for packages</li>
-	 * 	</ul>
+	 *        determines the nature of the searched elements
+	 *        <ul>
+	 *        <li><code>IJavaSearchConstants.CLASS</code>: only look for classes
+	 *        </li>
+	 *        <li><code>IJavaSearchConstants.INTERFACE</code>: only look for
+	 *        interfaces</li>
+	 *        <li><code>IJavaSearchConstants.TYPE</code>: look for both classes
+	 *        and interfaces</li>
+	 *        <li><code>IJavaSearchConstants.FIELD</code>: look for fields</li>
+	 *        <li><code>IJavaSearchConstants.METHOD</code>: look for methods</li>
+	 *        <li><code>IJavaSearchConstants.CONSTRUCTOR</code>: look for
+	 *        constructors</li>
+	 *        <li><code>IJavaSearchConstants.PACKAGE</code>: look for packages</li>
+	 *        </ul>
 	 * @param limitTo
-	 * 	determines the nature of the expected matches
-	 * 	<ul>
-	 * 	<li><code>IJavaSearchConstants.DECLARATIONS</code>: will search
-	 * 	declarations matching with the corresponding element. In case the
-	 * 	element is a method, declarations of matching methods in subtypes will
-	 * 	also be found, allowing to find declarations of abstract methods, etc.
-	 * 	</li>
-	 * 
-	 * 	<li><code>IJavaSearchConstants.REFERENCES</code>: will search references
-	 * 	to the given element.</li>
-	 * 
-	 * 	<li><code>IJavaSearchConstants.ALL_OCCURRENCES</code>: will search for
-	 * 	either declarations or references as specified above.</li>
-	 * 
-	 * 	<li><code>IJavaSearchConstants.IMPLEMENTORS</code>: for interface, will
-	 * 	find all types which implements a given interface.</li>
-	 * 	</ul>
+	 *        determines the nature of the expected matches
+	 *        <ul>
+	 *        <li><code>IJavaSearchConstants.DECLARATIONS</code>: will search
+	 *        declarations matching with the corresponding element. In case the
+	 *        element is a method, declarations of matching methods in subtypes
+	 *        will also be found, allowing to find declarations of abstract
+	 *        methods, etc.</li>
+	 * 
+	 *        <li><code>IJavaSearchConstants.REFERENCES</code>: will search
+	 *        references to the given element.</li>
+	 * 
+	 *        <li><code>IJavaSearchConstants.ALL_OCCURRENCES</code>: will search
+	 *        for either declarations or references as specified above.</li>
+	 * 
+	 *        <li><code>IJavaSearchConstants.IMPLEMENTORS</code>: for interface,
+	 *        will find all types which implements a given interface.</li>
+	 *        </ul>
 	 * 
 	 * @param isCaseSensitive
-	 * 	indicates whether the search is case sensitive or not.
+	 *        indicates whether the search is case sensitive or not.
 	 * @return a search pattern on the given string pattern, or
-	 * 	<code>null</code> if the string pattern is ill-formed.
-	 * @deprecated Use {@link SearchPattern#createPattern(String, int, int, int)
-	 * 	} instead.
+	 *         <code>null</code> if the string pattern is ill-formed.
+	 * @deprecated Use
+	 *             {@link SearchPattern#createPattern(String, int, int, int)}
+	 *             instead.
 	 */
 	void createSearchPattern() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X24.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X24.java,v
retrieving revision 1.1
diff -u -r1.1 X24.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X24.java	28 Apr 2008 16:29:56 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X24.java	11 May 2008 18:02:22 -0000
@@ -13,15 +13,15 @@
 	 * </p>
 	 * 
 	 * @param expression
-	 * 	the expression
+	 *        the expression
 	 * @return a new unparented statement node
 	 * @exception IllegalArgumentException
-	 * 	if:
-	 * 	<ul>
-	 * 	<li>the node belongs to a different AST</li>
-	 * 	<li>the node already has a parent</li>
-	 * 	<li>a cycle in would be created</li>
-	 * 	</ul>
+	 *            if:
+	 *            <ul>
+	 *            <li>the node belongs to a different AST</li>
+	 *            <li>the node already has a parent</li>
+	 *            <li>a cycle in would be created</li>
+	 *            </ul>
 	 */
 	void foo() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X18.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X18.java,v
retrieving revision 1.4
diff -u -r1.4 X18.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X18.java	6 May 2008 08:47:48 -0000	1.4
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X18.java	11 May 2008 18:02:22 -0000
@@ -9,22 +9,22 @@
 	 * When the parse is successful the result returned includes the ASTs for
 	 * the requested source:
 	 * <ul>
-	 * <li>{@link #K_COMPILATION_UNIT}: The result node is a {@link
-	 * CompilationUnit}.</li>
-	 * <li>{@link #K_CLASS_BODY_DECLARATIONS}: The result node is a {@link
-	 * TypeDeclaration} whose {@link TypeDeclaration#bodyDeclarations()
+	 * <li>{@link #K_COMPILATION_UNIT}: The result node is a
+	 * {@link CompilationUnit}.</li>
+	 * <li>{@link #K_CLASS_BODY_DECLARATIONS}: The result node is a
+	 * {@link TypeDeclaration} whose {@link TypeDeclaration#bodyDeclarations()
 	 * bodyDeclarations} are the new trees. Other aspects of the type
 	 * declaration are unspecified.</li>
 	 * <li>{@link #K_STATEMENTS}: The result node is a {@link Block Block} whose
 	 * {@link Block#statements() statements} are the new trees. Other aspects of
 	 * the block are unspecified.</li>
-	 * <li>{@link #K_EXPRESSION}: The result node is a subclass of {@link
-	 * Expression Expression}. Other aspects of the expression are unspecified.
-	 * </li>
+	 * <li>{@link #K_EXPRESSION}: The result node is a subclass of
+	 * {@link Expression Expression}. Other aspects of the expression are
+	 * unspecified.</li>
 	 * </ul>
-	 * The resulting AST node is rooted under (possibly contrived) {@link
-	 * CompilationUnit CompilationUnit} node, to allow the client to retrieve
-	 * the following pieces of information available there:
+	 * The resulting AST node is rooted under (possibly contrived)
+	 * {@link CompilationUnit CompilationUnit} node, to allow the client to
+	 * retrieve the following pieces of information available there:
 	 * <ul>
 	 * <li>{@linkplain CompilationUnit#lineNumber(int) Line number map}. Line
 	 * numbers start at 1 and only cover the subrange scanned (
@@ -68,9 +68,9 @@
 	 * </p>
 	 * 
 	 * @param kind
-	 * 	the kind of construct to parse: one of {@link #K_COMPILATION_UNIT},
-	 * 	{@link #K_CLASS_BODY_DECLARATIONS}, {@link #K_EXPRESSION}, {@link
-	 * 	#K_STATEMENTS}
+	 *        the kind of construct to parse: one of {@link #K_COMPILATION_UNIT}
+	 *        , {@link #K_CLASS_BODY_DECLARATIONS}, {@link #K_EXPRESSION},
+	 *        {@link #K_STATEMENTS}
 	 */
 	void setKind(int kind) {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X23.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X23.java,v
retrieving revision 1.2
diff -u -r1.2 X23.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X23.java	30 Apr 2008 14:50:14 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X23.java	11 May 2008 18:02:22 -0000
@@ -35,7 +35,7 @@
 	 * </p>
 	 * <p>
 	 * The body declarations passed as parameters to the comparator always carry
-	 * at least the following minimal signature information:<br>
+	 * at least the following minimal signature information: <br>
 	 * <table border="1" width="80%" cellpadding="5">
 	 * <tr>
 	 * <td width="20%"><code>TypeDeclaration</code></td>
@@ -71,35 +71,35 @@
 	 * </p>
 	 * 
 	 * @param compilationUnit
-	 * 	the given compilation unit, which must be a working copy
+	 *        the given compilation unit, which must be a working copy
 	 * @param positions
-	 * 	an array of source positions to map, or <code>null</code> if none. If
-	 * 	supplied, the positions must character-based source positions within the
-	 * 	original source code for the given compilation unit, arranged in
-	 * 	non-decreasing order. The array is updated in place when this method
-	 * 	returns to reflect the corresponding source positions in the permuted
-	 * 	source code string (but not necessarily any longer in non-decreasing
-	 * 	order).
+	 *        an array of source positions to map, or <code>null</code> if none.
+	 *        If supplied, the positions must character-based source positions
+	 *        within the original source code for the given compilation unit,
+	 *        arranged in non-decreasing order. The array is updated in place
+	 *        when this method returns to reflect the corresponding source
+	 *        positions in the permuted source code string (but not necessarily
+	 *        any longer in non-decreasing order).
 	 * @param comparator
-	 * 	the comparator capable of ordering <code>BodyDeclaration</code>s
+	 *        the comparator capable of ordering <code>BodyDeclaration</code>s
 	 * @param options
-	 * 	bitwise-or of option flags; <code>0</code> for default behavior
-	 * 	(reserved for future growth)
+	 *        bitwise-or of option flags; <code>0</code> for default behavior
+	 *        (reserved for future growth)
 	 * @param monitor
-	 * 	the progress monitor to notify, or <code>null</code> if none
+	 *        the progress monitor to notify, or <code>null</code> if none
 	 * @exception JavaModelException
-	 * 	if the compilation unit could not be sorted. Reasons include:
-	 * 	<ul>
-	 * 	<li>The given compilation unit does not exist (ELEMENT_DOES_NOT_EXIST)
-	 * 	</li>
-	 * 	<li>The given compilation unit is not a working copy
-	 * 	(INVALID_ELEMENT_TYPES)</li>
-	 * 	<li>A <code>CoreException</code> occurred while accessing the underlying
-	 * 	resource
-	 * 	</ul>
+	 *            if the compilation unit could not be sorted. Reasons include:
+	 *            <ul>
+	 *            <li>The given compilation unit does not exist
+	 *            (ELEMENT_DOES_NOT_EXIST)</li>
+	 *            <li>The given compilation unit is not a working copy
+	 *            (INVALID_ELEMENT_TYPES)</li>
+	 *            <li>A <code>CoreException</code> occurred while accessing the
+	 *            underlying resource
+	 *            </ul>
 	 * @exception IllegalArgumentException
-	 * 	if the given compilation unit is null or if the given comparator is
-	 * 	null.
+	 *            if the given compilation unit is null or if the given
+	 *            comparator is null.
 	 * @see org.eclipse.jdt.core.dom.BodyDeclaration
 	 * @see #RELATIVE_ORDER
 	 */
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X05.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X05.java,v
retrieving revision 1.1
diff -u -r1.1 X05.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X05.java	23 Apr 2008 22:29:05 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X05.java	11 May 2008 18:02:22 -0000
@@ -9,7 +9,7 @@
 	 * </p>
 	 * 
 	 * @param toolBarManager
-	 * 	the <code>ToolBarManager</code> to which to contribute
+	 *        the <code>ToolBarManager</code> to which to contribute
 	 */
 	void foo(Object toolBarManager) {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X02.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X02.java,v
retrieving revision 1.3
diff -u -r1.3 X02.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X02.java	27 Apr 2008 10:01:24 -0000	1.3
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X02.java	11 May 2008 18:02:22 -0000
@@ -15,22 +15,22 @@
 	 * </p>
 	 * 
 	 * @param newCharset
-	 * 	a charset name, or <code>null</code>
+	 *        a charset name, or <code>null</code>
 	 * @param monitor
-	 * 	a progress monitor, or <code>null</code> if progress reporting is not
-	 * 	desired
+	 *        a progress monitor, or <code>null</code> if progress reporting is
+	 *        not desired
 	 * @exception OperationCanceledException
-	 * 	if the operation is canceled. Cancelation can occur even if no progress
-	 * 	monitor is provided.
+	 *            if the operation is canceled. Cancelation can occur even if no
+	 *            progress monitor is provided.
 	 * @exception CoreException
-	 * 	if this method fails. Reasons include:
-	 * 	<ul>
-	 * 	<li>This resource does not exist.</li>
-	 * 	<li>An error happened while persisting this setting.</li>
-	 * 	<li>Resource changes are disallowed during certain types of resource
-	 * 	change event notification. See {@link IResourceChangeEvent} for more
-	 * 	details.</li>
-	 * 	</ul>
+	 *            if this method fails. Reasons include:
+	 *            <ul>
+	 *            <li>This resource does not exist.</li>
+	 *            <li>An error happened while persisting this setting.</li>
+	 *            <li>Resource changes are disallowed during certain types of
+	 *            resource change event notification. See
+	 *            {@link IResourceChangeEvent} for more details.</li>
+	 *            </ul>
 	 * @see #getCharset()
 	 * @since 3.0
 	 */
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X30.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X30.java,v
retrieving revision 1.1
diff -u -r1.1 X30.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X30.java	6 May 2008 08:47:48 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X30.java	11 May 2008 18:02:22 -0000
@@ -7,11 +7,11 @@
 	 * The method acts on the current build state and does not recompile.
 	 * 
 	 * @param resource
-	 * 	the resource to check for errors
+	 *        the resource to check for errors
 	 * @return <code>true</code> if the resource (and its children) are error
-	 * 	free
+	 *         free
 	 * @throws import org.eclipse.core.runtime.CoreException if there's a marker
-	 * 	problem
+	 *         problem
 	 */
 	void foo() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X28d.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X28d.java,v
retrieving revision 1.1
diff -u -r1.1 X28d.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X28d.java	6 May 2008 08:47:48 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X28d.java	11 May 2008 18:02:22 -0000
@@ -7,7 +7,7 @@
 	 * in the receiver. Uses the public API.
 	 * 
 	 * @param key
-	 * 	key of subtree whose contents we want to copy.
+	 *        key of subtree whose contents we want to copy.
 	 */
 	public void foo(String key) {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X02b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X02b.java,v
retrieving revision 1.1
diff -u -r1.1 X02b.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X02b.java	23 Apr 2008 10:13:40 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X02b.java	11 May 2008 18:02:22 -0000
@@ -3,14 +3,14 @@
 interface X02b {
 	/**
 	 * @exception CoreException
-	 * 	if this method fails. Reasons include:
-	 * 	<ul>
-	 * 	<li>This resource does not exist.</li>
-	 * 	<li>An error happened while persisting this setting.</li>
-	 * 	<li>Resource changes are disallowed during certain types of resource
-	 * 	change event notification. See {@link IResourceChangeEvent} for more
-	 * 	details.</li>
-	 * 	</ul>
+	 *            if this method fails. Reasons include:
+	 *            <ul>
+	 *            <li>This resource does not exist.</li>
+	 *            <li>An error happened while persisting this setting.</li>
+	 *            <li>Resource changes are disallowed during certain types of
+	 *            resource change event notification. See
+	 *            {@link IResourceChangeEvent} for more details.</li>
+	 *            </ul>
 	 */
 	public void setCharset(String newCharset, Object monitor) throws Exception;
 
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X13.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X13.java,v
retrieving revision 1.1
diff -u -r1.1 X13.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X13.java	23 Apr 2008 22:42:24 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X13.java	11 May 2008 18:02:22 -0000
@@ -7,7 +7,7 @@
 	 * found.
 	 * 
 	 * @param key
-	 * 	the resource string key
+	 *        the resource string key
 	 * @return the resource string for the given key
 	 */
 	String foo(String key) {
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X29.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X29.java,v
retrieving revision 1.2
diff -u -r1.2 X29.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X29.java	8 May 2008 19:03:17 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X29.java	11 May 2008 18:02:22 -0000
@@ -5,14 +5,14 @@
 	/**
 	 * @param <code>text</code>, the string to match
 	 * @param <code>start</code>, the starting index in the text for search,
-	 * 	inclusive
+	 *        inclusive
 	 * @param <code>end</code>, the stopping point of search, exclusive
 	 * @param code
-	 * 	>p</code>, a string that has no wildcard
+	 *        >p</code>, a string that has no wildcard
 	 * @param <code>ignoreCase</code>, boolean indicating wether code>p</code>
-	 * 	is case sensitive
+	 *        is case sensitive
 	 * @return the starting index in the text of the pattern , or -1 if not
-	 * 	found
+	 *         found
 	 */
 	void foo() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X16.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X16.java,v
retrieving revision 1.2
diff -u -r1.2 X16.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X16.java	6 May 2008 08:47:48 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X16.java	11 May 2008 18:02:22 -0000
@@ -8,8 +8,8 @@
 	 * constructor.
 	 * 
 	 * @param methodBinding
-	 * 	org.eclipse.jdt.internal.compiler.nameloopkup.
-	 * 	SyntheticAccessMethodBinding
+	 *        org.eclipse.jdt.internal.compiler.nameloopkup.
+	 *        SyntheticAccessMethodBinding
 	 */
 	void foo(Object methodBinding) {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X06.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X06.java,v
retrieving revision 1.2
diff -u -r1.2 X06.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X06.java	6 May 2008 08:47:48 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X06.java	11 May 2008 18:02:22 -0000
@@ -6,7 +6,7 @@
 	 * Creates the project location specification controls.
 	 * 
 	 * @param projectGroup
-	 * 	the parent composite
+	 *        the parent composite
 	 * @param boolean - the initial enabled state of the widgets created
 	 */
 	void foo(Object projectGroup, boolean enabled) {
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14b.java,v
retrieving revision 1.1
diff -u -r1.1 X14b.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14b.java	16 Apr 2008 11:55:43 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14b.java	11 May 2008 18:02:22 -0000
@@ -1,4 +1,4 @@
-package test.example;
+package test.prefs.example;
 
 public class X14b {
 	/**
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14a.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14a.java,v
retrieving revision 1.1
diff -u -r1.1 X14a.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14a.java	16 Apr 2008 11:55:43 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14a.java	11 May 2008 18:02:22 -0000
@@ -1,4 +1,4 @@
-package test.example;
+package test.prefs.example;
 
 public class X14a {
 	/**
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14c.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14c.java,v
retrieving revision 1.1
diff -u -r1.1 X14c.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14c.java	16 Apr 2008 11:55:43 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14c.java	11 May 2008 18:02:22 -0000
@@ -1,4 +1,4 @@
-package test.example;
+package test.prefs.example;
 
 public class X14c {
 	/**
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14d.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14d.java,v
retrieving revision 1.2
diff -u -r1.2 X14d.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14d.java	16 Apr 2008 16:33:07 -0000	1.2
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_tags/X14d.java	11 May 2008 18:02:22 -0000
@@ -1,4 +1,4 @@
-package test.tags.param;
+package test.prefs.example;
 
 public class X14d {
 	/**
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X27.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X27.java,v
retrieving revision 1.1
diff -u -r1.1 X27.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X27.java	6 May 2008 08:47:48 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X27.java	11 May 2008 18:02:22 -0000
@@ -5,9 +5,8 @@
 	/**
 	 * Shutdown the HCR mgr and the Java debug targets.
 	 * 
-	 * @see
-	 * 	org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext
-	 * 	) text
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 *      text
 	 */
 	public void foo() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X02.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X02.java,v
retrieving revision 1.3
diff -u -r1.3 X02.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X02.java	27 Apr 2008 10:01:23 -0000	1.3
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X02.java	11 May 2008 18:02:22 -0000
@@ -15,22 +15,22 @@
 	 * </p>
 	 * 
 	 * @param newCharset
-	 * 		a charset name, or <code>null</code>
+	 *            a charset name, or <code>null</code>
 	 * @param monitor
-	 * 		a progress monitor, or <code>null</code> if progress reporting is
-	 * 		not desired
+	 *            a progress monitor, or <code>null</code> if progress reporting
+	 *            is not desired
 	 * @exception OperationCanceledException
-	 * 		if the operation is canceled. Cancelation can occur even if no
-	 * 		progress monitor is provided.
+	 *                if the operation is canceled. Cancelation can occur even
+	 *                if no progress monitor is provided.
 	 * @exception CoreException
-	 * 		if this method fails. Reasons include:
-	 * 		<ul>
-	 * 		<li>This resource does not exist.</li>
-	 * 		<li>An error happened while persisting this setting.</li>
-	 * 		<li>Resource changes are disallowed during certain types of resource
-	 * 		change event notification. See {@link IResourceChangeEvent} for more
-	 * 		details.</li>
-	 * 		</ul>
+	 *                if this method fails. Reasons include:
+	 *                <ul>
+	 *                <li>This resource does not exist.</li>
+	 *                <li>An error happened while persisting this setting.</li>
+	 *                <li>Resource changes are disallowed during certain types
+	 *                of resource change event notification. See
+	 *                {@link IResourceChangeEvent} for more details.</li>
+	 *                </ul>
 	 * @see #getCharset()
 	 * @since 3.0
 	 */
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X09.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X09.java,v
retrieving revision 1.1
diff -u -r1.1 X09.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X09.java	23 Apr 2008 22:29:05 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X09.java	11 May 2008 18:02:22 -0000
@@ -6,8 +6,7 @@
 	int foo80;
 
 	/**
-	 * Test_immutable_tag____at_the_end_of_line (value: <code>enablement</code>
-	 * )
+	 * Test_immutable_tag____at_the_end_of_line (value: <code>enablement</code>)
 	 */
 	int foo81;
 
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X06.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X06.java,v
retrieving revision 1.2
diff -u -r1.2 X06.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X06.java	6 May 2008 08:47:48 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X06.java	11 May 2008 18:02:22 -0000
@@ -6,7 +6,7 @@
 	 * Creates the project location specification controls.
 	 * 
 	 * @param projectGroup
-	 * 		the parent composite
+	 *            the parent composite
 	 * @param boolean - the initial enabled state of the widgets created
 	 */
 	void foo(Object projectGroup, boolean enabled) {
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X16.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X16.java,v
retrieving revision 1.2
diff -u -r1.2 X16.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X16.java	6 May 2008 08:47:47 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X16.java	11 May 2008 18:02:22 -0000
@@ -8,8 +8,8 @@
 	 * constructor.
 	 * 
 	 * @param methodBinding
-	 * 		org.eclipse.jdt.internal.compiler.nameloopkup.
-	 * 		SyntheticAccessMethodBinding
+	 *            org.eclipse.jdt.internal.compiler.nameloopkup.
+	 *            SyntheticAccessMethodBinding
 	 */
 	void foo(Object methodBinding) {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X23.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X23.java,v
retrieving revision 1.2
diff -u -r1.2 X23.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X23.java	30 Apr 2008 14:50:13 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X23.java	11 May 2008 18:02:22 -0000
@@ -35,7 +35,7 @@
 	 * </p>
 	 * <p>
 	 * The body declarations passed as parameters to the comparator always carry
-	 * at least the following minimal signature information:<br>
+	 * at least the following minimal signature information: <br>
 	 * <table border="1" width="80%" cellpadding="5">
 	 * <tr>
 	 * <td width="20%"><code>TypeDeclaration</code></td>
@@ -71,35 +71,38 @@
 	 * </p>
 	 * 
 	 * @param compilationUnit
-	 * 		the given compilation unit, which must be a working copy
+	 *            the given compilation unit, which must be a working copy
 	 * @param positions
-	 * 		an array of source positions to map, or <code>null</code> if none.
-	 * 		If supplied, the positions must character-based source positions
-	 * 		within the original source code for the given compilation unit,
-	 * 		arranged in non-decreasing order. The array is updated in place when
-	 * 		this method returns to reflect the corresponding source positions in
-	 * 		the permuted source code string (but not necessarily any longer in
-	 * 		non-decreasing order).
+	 *            an array of source positions to map, or <code>null</code> if
+	 *            none. If supplied, the positions must character-based source
+	 *            positions within the original source code for the given
+	 *            compilation unit, arranged in non-decreasing order. The array
+	 *            is updated in place when this method returns to reflect the
+	 *            corresponding source positions in the permuted source code
+	 *            string (but not necessarily any longer in non-decreasing
+	 *            order).
 	 * @param comparator
-	 * 		the comparator capable of ordering <code>BodyDeclaration</code>s
+	 *            the comparator capable of ordering
+	 *            <code>BodyDeclaration</code>s
 	 * @param options
-	 * 		bitwise-or of option flags; <code>0</code> for default behavior
-	 * 		(reserved for future growth)
+	 *            bitwise-or of option flags; <code>0</code> for default
+	 *            behavior (reserved for future growth)
 	 * @param monitor
-	 * 		the progress monitor to notify, or <code>null</code> if none
+	 *            the progress monitor to notify, or <code>null</code> if none
 	 * @exception JavaModelException
-	 * 		if the compilation unit could not be sorted. Reasons include:
-	 * 		<ul>
-	 * 		<li>The given compilation unit does not exist
-	 * 		(ELEMENT_DOES_NOT_EXIST)</li>
-	 * 		<li>The given compilation unit is not a working copy
-	 * 		(INVALID_ELEMENT_TYPES)</li>
-	 * 		<li>A <code>CoreException</code> occurred while accessing the
-	 * 		underlying resource
-	 * 		</ul>
+	 *                if the compilation unit could not be sorted. Reasons
+	 *                include:
+	 *                <ul>
+	 *                <li>The given compilation unit does not exist
+	 *                (ELEMENT_DOES_NOT_EXIST)</li>
+	 *                <li>The given compilation unit is not a working copy
+	 *                (INVALID_ELEMENT_TYPES)</li>
+	 *                <li>A <code>CoreException</code> occurred while accessing
+	 *                the underlying resource
+	 *                </ul>
 	 * @exception IllegalArgumentException
-	 * 		if the given compilation unit is null or if the given comparator is
-	 * 		null.
+	 *                if the given compilation unit is null or if the given
+	 *                comparator is null.
 	 * @see org.eclipse.jdt.core.dom.BodyDeclaration
 	 * @see #RELATIVE_ORDER
 	 */
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X21.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X21.java,v
retrieving revision 1.2
diff -u -r1.2 X21.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X21.java	28 Apr 2008 16:29:56 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X21.java	11 May 2008 18:02:22 -0000
@@ -5,7 +5,9 @@
 	/**
 	 * Returns a search pattern based on a given string pattern. The string
 	 * patterns support '*' wild-cards. The remaining parameters are used to
-	 * narrow down the type of expected results. <br>
+	 * narrow down the type of expected results.
+	 * 
+	 * <br>
 	 * Examples:
 	 * <ul>
 	 * <li>search for case insensitive references to <code>Object</code>:
@@ -20,48 +22,52 @@
 	 * </ul>
 	 * 
 	 * @param stringPattern
-	 * 		the given pattern
+	 *            the given pattern
 	 * @param searchFor
-	 * 		determines the nature of the searched elements
-	 * 		<ul>
-	 * 		<li><code>IJavaSearchConstants.CLASS</code>: only look for classes
-	 * 		</li>
-	 * 		<li><code>IJavaSearchConstants.INTERFACE</code>: only look for
-	 * 		interfaces</li>
-	 * 		<li><code>IJavaSearchConstants.TYPE</code>: look for both classes
-	 * 		and interfaces</li>
-	 * 		<li><code>IJavaSearchConstants.FIELD</code>: look for fields</li>
-	 * 		<li><code>IJavaSearchConstants.METHOD</code>: look for methods</li>
-	 * 		<li><code>IJavaSearchConstants.CONSTRUCTOR</code>: look for
-	 * 		constructors</li>
-	 * 		<li><code>IJavaSearchConstants.PACKAGE</code>: look for packages
-	 * 		</li>
-	 * 		</ul>
+	 *            determines the nature of the searched elements
+	 *            <ul>
+	 *            <li><code>IJavaSearchConstants.CLASS</code>: only look for
+	 *            classes</li>
+	 *            <li><code>IJavaSearchConstants.INTERFACE</code>: only look for
+	 *            interfaces</li>
+	 *            <li><code>IJavaSearchConstants.TYPE</code>: look for both
+	 *            classes and interfaces</li>
+	 *            <li><code>IJavaSearchConstants.FIELD</code>: look for fields</li>
+	 *            <li><code>IJavaSearchConstants.METHOD</code>: look for methods
+	 *            </li>
+	 *            <li><code>IJavaSearchConstants.CONSTRUCTOR</code>: look for
+	 *            constructors</li>
+	 *            <li><code>IJavaSearchConstants.PACKAGE</code>: look for
+	 *            packages</li>
+	 *            </ul>
 	 * @param limitTo
-	 * 		determines the nature of the expected matches
-	 * 		<ul>
-	 * 		<li><code>IJavaSearchConstants.DECLARATIONS</code>: will search
-	 * 		declarations matching with the corresponding element. In case the
-	 * 		element is a method, declarations of matching methods in subtypes
-	 * 		will also be found, allowing to find declarations of abstract
-	 * 		methods, etc.</li>
-	 * 
-	 * 		<li><code>IJavaSearchConstants.REFERENCES</code>: will search
-	 * 		references to the given element.</li>
-	 * 
-	 * 		<li><code>IJavaSearchConstants.ALL_OCCURRENCES</code>: will search
-	 * 		for either declarations or references as specified above.</li>
-	 * 
-	 * 		<li><code>IJavaSearchConstants.IMPLEMENTORS</code>: for interface,
-	 * 		will find all types which implements a given interface.</li>
-	 * 		</ul>
+	 *            determines the nature of the expected matches
+	 *            <ul>
+	 *            <li><code>IJavaSearchConstants.DECLARATIONS</code>: will
+	 *            search declarations matching with the corresponding element.
+	 *            In case the element is a method, declarations of matching
+	 *            methods in subtypes will also be found, allowing to find
+	 *            declarations of abstract methods, etc.</li>
+	 * 
+	 *            <li><code>IJavaSearchConstants.REFERENCES</code>: will search
+	 *            references to the given element.</li>
+	 * 
+	 *            <li><code>IJavaSearchConstants.ALL_OCCURRENCES</code>: will
+	 *            search for either declarations or references as specified
+	 *            above.</li>
+	 * 
+	 *            <li><code>IJavaSearchConstants.IMPLEMENTORS</code>: for
+	 *            interface, will find all types which implements a given
+	 *            interface.</li>
+	 *            </ul>
 	 * 
 	 * @param isCaseSensitive
-	 * 		indicates whether the search is case sensitive or not.
+	 *            indicates whether the search is case sensitive or not.
 	 * @return a search pattern on the given string pattern, or
-	 * 	<code>null</code> if the string pattern is ill-formed.
-	 * @deprecated Use {@link SearchPattern#createPattern(String, int, int, int)
-	 * 	} instead.
+	 *         <code>null</code> if the string pattern is ill-formed.
+	 * @deprecated Use
+	 *             {@link SearchPattern#createPattern(String, int, int, int)}
+	 *             instead.
 	 */
 	void createSearchPattern() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X04.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X04.java,v
retrieving revision 1.2
diff -u -r1.2 X04.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X04.java	27 Apr 2008 10:01:23 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X04.java	11 May 2008 18:02:22 -0000
@@ -9,8 +9,7 @@
  * Starts the OSGi framework with a console window. Any command line arguments
  * not recognized are passed to the console for it to execute. If a port is
  * specified the console will listen on that port for commands. If no port is
- * specified, the console will use System.in and System.out.
- * </li>
+ * specified, the console will use System.in and System.out. </li>
  * <li><b>-adaptor[:adaptor-name][adaptor-args]</b>
  * 
  * <pre>
@@ -31,8 +30,8 @@
  * class. They are passed to the adaptor class as an array of Strings. Example
  * arguments used by the DefaultAdaptor are:
  * <ul>
- * <li>"bundledir=<i>directory"</i>. The directory to be used by the adaptor to
- * store data.
+ * <li>"bundledir=<i>directory"</i>. The directory to be used by the adaptor
+ * to store data.
  * <li>reset</i>. Perform the reset action to clear the bundledir.
  * <p>
  * Actions can be defined by an adaptor. Multiple actions can be specified,
@@ -49,7 +48,7 @@
  * <li>-app[lication]:application-args
  * 
  * <pre>
- * [application-args] := *( &quot;:&quot; [value])
+ *    [application-args] := *( &quot;:&quot; [value])
  *    [value] := [token] | [quoted-string]
  * </pre>
  * 
@@ -58,8 +57,7 @@
  * launch time. This is for eclipse plugins installed as applications. The
  * arguments are as Eclipse currently needs them - one list of key=value pairs
  * which are parsed by the applications. The application peels off only the args
- * that apply to it. Others are ignored.
- * </li>
+ * that apply to it. Others are ignored. </li>
  * <p>
  * Any other command line arguments are passed on to the console window of the
  * framework if started with the -console option. If the console is not started,
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X32.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X32.java,v
retrieving revision 1.1
diff -u -r1.1 X32.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X32.java	8 May 2008 19:03:17 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X32.java	11 May 2008 18:02:22 -0000
@@ -7,8 +7,7 @@
 	 * <tt>realHandler.setURL(URL,String,String,int,String,String,String,String)</tt>
 	 * .
 	 * 
-	 * @see
-	 * 	"java.net.URLStreamHandler.setURL(URL,String,String,int,String,String,String,String)"
+	 * @see "java.net.URLStreamHandler.setURL(URL,String,String,int,String,String,String,String)"
 	 */
 	void foo() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X24.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X24.java,v
retrieving revision 1.1
diff -u -r1.1 X24.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X24.java	28 Apr 2008 16:29:56 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X24.java	11 May 2008 18:02:22 -0000
@@ -13,15 +13,15 @@
 	 * </p>
 	 * 
 	 * @param expression
-	 * 		the expression
+	 *            the expression
 	 * @return a new unparented statement node
 	 * @exception IllegalArgumentException
-	 * 		if:
-	 * 		<ul>
-	 * 		<li>the node belongs to a different AST</li>
-	 * 		<li>the node already has a parent</li>
-	 * 		<li>a cycle in would be created</li>
-	 * 		</ul>
+	 *                if:
+	 *                <ul>
+	 *                <li>the node belongs to a different AST</li>
+	 *                <li>the node already has a parent</li>
+	 *                <li>a cycle in would be created</li>
+	 *                </ul>
 	 */
 	void foo() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X02b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X02b.java,v
retrieving revision 1.1
diff -u -r1.1 X02b.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X02b.java	23 Apr 2008 10:13:39 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X02b.java	11 May 2008 18:02:22 -0000
@@ -3,14 +3,14 @@
 interface X02b {
 	/**
 	 * @exception CoreException
-	 * 		if this method fails. Reasons include:
-	 * 		<ul>
-	 * 		<li>This resource does not exist.</li>
-	 * 		<li>An error happened while persisting this setting.</li>
-	 * 		<li>Resource changes are disallowed during certain types of resource
-	 * 		change event notification. See {@link IResourceChangeEvent} for more
-	 * 		details.</li>
-	 * 		</ul>
+	 *                if this method fails. Reasons include:
+	 *                <ul>
+	 *                <li>This resource does not exist.</li>
+	 *                <li>An error happened while persisting this setting.</li>
+	 *                <li>Resource changes are disallowed during certain types
+	 *                of resource change event notification. See
+	 *                {@link IResourceChangeEvent} for more details.</li>
+	 *                </ul>
 	 */
 	public void setCharset(String newCharset, Object monitor) throws Exception;
 
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X13.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X13.java,v
retrieving revision 1.1
diff -u -r1.1 X13.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X13.java	23 Apr 2008 22:29:05 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X13.java	11 May 2008 18:02:22 -0000
@@ -7,7 +7,7 @@
 	 * found.
 	 * 
 	 * @param key
-	 * 		the resource string key
+	 *            the resource string key
 	 * @return the resource string for the given key
 	 */
 	String foo(String key) {
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28d.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28d.java,v
retrieving revision 1.1
diff -u -r1.1 X28d.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28d.java	6 May 2008 08:47:48 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28d.java	11 May 2008 18:02:22 -0000
@@ -7,7 +7,7 @@
 	 * in the receiver. Uses the public API.
 	 * 
 	 * @param key
-	 * 		key of subtree whose contents we want to copy.
+	 *            key of subtree whose contents we want to copy.
 	 */
 	public void foo(String key) {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X08.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X08.java,v
retrieving revision 1.3
diff -u -r1.3 X08.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X08.java	28 Apr 2008 16:29:56 -0000	1.3
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X08.java	11 May 2008 18:02:22 -0000
@@ -16,8 +16,7 @@
  * <LI>tracking the dirty state of the model in case of merge,
  * <LI>saving the model.
  * </UL>
- * The Compare plug-in's
- * <code>openCompareEditor</code> method takes an
+ * The Compare plug-in's <code>openCompareEditor</code> method takes an
  * <code>ICompareEditorInput</code> and starts sequencing through the above
  * steps. If the compare result is not empty a new compare editor is opened and
  * takes over the sequence until eventually closed.
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X18.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X18.java,v
retrieving revision 1.4
diff -u -r1.4 X18.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X18.java	6 May 2008 08:47:47 -0000	1.4
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X18.java	11 May 2008 18:02:22 -0000
@@ -9,22 +9,22 @@
 	 * When the parse is successful the result returned includes the ASTs for
 	 * the requested source:
 	 * <ul>
-	 * <li>{@link #K_COMPILATION_UNIT}: The result node is a {@link
-	 * CompilationUnit}.</li>
-	 * <li>{@link #K_CLASS_BODY_DECLARATIONS}: The result node is a {@link
-	 * TypeDeclaration} whose {@link TypeDeclaration#bodyDeclarations()
+	 * <li>{@link #K_COMPILATION_UNIT}: The result node is a
+	 * {@link CompilationUnit}.</li>
+	 * <li>{@link #K_CLASS_BODY_DECLARATIONS}: The result node is a
+	 * {@link TypeDeclaration} whose {@link TypeDeclaration#bodyDeclarations()
 	 * bodyDeclarations} are the new trees. Other aspects of the type
 	 * declaration are unspecified.</li>
 	 * <li>{@link #K_STATEMENTS}: The result node is a {@link Block Block} whose
 	 * {@link Block#statements() statements} are the new trees. Other aspects of
 	 * the block are unspecified.</li>
-	 * <li>{@link #K_EXPRESSION}: The result node is a subclass of {@link
-	 * Expression Expression}. Other aspects of the expression are unspecified.
-	 * </li>
+	 * <li>{@link #K_EXPRESSION}: The result node is a subclass of
+	 * {@link Expression Expression}. Other aspects of the expression are
+	 * unspecified.</li>
 	 * </ul>
-	 * The resulting AST node is rooted under (possibly contrived) {@link
-	 * CompilationUnit CompilationUnit} node, to allow the client to retrieve
-	 * the following pieces of information available there:
+	 * The resulting AST node is rooted under (possibly contrived)
+	 * {@link CompilationUnit CompilationUnit} node, to allow the client to
+	 * retrieve the following pieces of information available there:
 	 * <ul>
 	 * <li>{@linkplain CompilationUnit#lineNumber(int) Line number map}. Line
 	 * numbers start at 1 and only cover the subrange scanned (
@@ -68,9 +68,10 @@
 	 * </p>
 	 * 
 	 * @param kind
-	 * 		the kind of construct to parse: one of {@link #K_COMPILATION_UNIT},
-	 * 		{@link #K_CLASS_BODY_DECLARATIONS}, {@link #K_EXPRESSION}, {@link
-	 * 		#K_STATEMENTS}
+	 *            the kind of construct to parse: one of
+	 *            {@link #K_COMPILATION_UNIT},
+	 *            {@link #K_CLASS_BODY_DECLARATIONS}, {@link #K_EXPRESSION},
+	 *            {@link #K_STATEMENTS}
 	 */
 	void setKind(int kind) {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X14.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X14.java,v
retrieving revision 1.1
diff -u -r1.1 X14.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X14.java	25 Apr 2008 13:11:53 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X14.java	11 May 2008 18:02:22 -0000
@@ -7,13 +7,15 @@
 	 * resource. The client is responsible for closing the stream when finished.
 	 * 
 	 * @param href
-	 * 		the URL (as a string) of the help resource
-	 * 		<p>
-	 * 		Valid href are as described in {@link
-	 * 		org.eclipse.help.IHelpResource#getHref IHelpResource.getHref}
-	 * 		</p>
+	 *            the URL (as a string) of the help resource
+	 *            <p>
+	 *            Valid href are as described in
+	 *            {@link org.eclipse.help.IHelpResource#getHref
+	 *            IHelpResource.getHref}
+	 *            </p>
 	 * @return an input stream containing the contents of the help resource, or
-	 * 	<code>null</code> if the help resource could not be found and opened
+	 *         <code>null</code> if the help resource could not be found and
+	 *         opened
 	 */
 	int foo(String href) {
 		return 0;
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X19.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X19.java,v
retrieving revision 1.3
diff -u -r1.3 X19.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X19.java	28 Apr 2008 16:29:56 -0000	1.3
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X19.java	11 May 2008 18:02:22 -0000
@@ -10,12 +10,12 @@
 	 * source text, it is problematic to locate comments in relation to the
 	 * structure of an AST. The one exception is doc comments which, by
 	 * convention, immediately precede type, field, and method declarations;
-	 * these comments are located in the AST by {@link
-	 * BodyDeclaration#getJavadoc BodyDeclaration.getJavadoc}. Other comments do
-	 * not show up in the AST. The table of comments is provided for clients
-	 * that need to find the source ranges of all comments in the original
-	 * source string. It includes entries for comments of all kinds (line,
-	 * block, and doc), arranged in order of increasing source position.
+	 * these comments are located in the AST by
+	 * {@link BodyDeclaration#getJavadoc BodyDeclaration.getJavadoc}. Other
+	 * comments do not show up in the AST. The table of comments is provided for
+	 * clients that need to find the source ranges of all comments in the
+	 * original source string. It includes entries for comments of all kinds
+	 * (line, block, and doc), arranged in order of increasing source position.
 	 * </p>
 	 * Note on comment parenting: The {@link ASTNode#getParent() getParent()} of
 	 * a doc comment associated with a body declaration is the body declaration
@@ -41,8 +41,8 @@
 	 * </p>
 	 * 
 	 * @return an unmodifiable list of comments in increasing order of source
-	 * 	start position, or <code>null</code> if comment information for this
-	 * 	compilation unit is not available
+	 *         start position, or <code>null</code> if comment information for
+	 *         this compilation unit is not available
 	 * @see ASTParser
 	 * @since 3.0
 	 */
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X30.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X30.java,v
retrieving revision 1.1
diff -u -r1.1 X30.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X30.java	6 May 2008 08:47:47 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X30.java	11 May 2008 18:02:22 -0000
@@ -7,11 +7,11 @@
 	 * The method acts on the current build state and does not recompile.
 	 * 
 	 * @param resource
-	 * 		the resource to check for errors
+	 *            the resource to check for errors
 	 * @return <code>true</code> if the resource (and its children) are error
-	 * 	free
+	 *         free
 	 * @throws import org.eclipse.core.runtime.CoreException if there's a marker
-	 * 	problem
+	 *         problem
 	 */
 	void foo() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X26.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X26.java,v
retrieving revision 1.1
diff -u -r1.1 X26.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X26.java	30 Apr 2008 14:50:13 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X26.java	11 May 2008 18:02:22 -0000
@@ -9,7 +9,9 @@
  * launching a dialog by placing a button above a control.
  * 
  * <p>
- * Here is an example of using a ControlEditor: <code><pre>
+ * Here is an example of using a ControlEditor:
+ * 
+ * <code><pre>
  * Canvas canvas = new Canvas(shell, SWT.BORDER);
  * canvas.setBounds(10, 10, 300, 300);	
  * Color color = new Color(null, 255, 0, 0);
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X01.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X01.java,v
retrieving revision 1.2
diff -u -r1.2 X01.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X01.java	25 Apr 2008 13:11:53 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X01.java	11 May 2008 18:02:22 -0000
@@ -6,11 +6,10 @@
  * 
  * @see {@link PropertyPage}
  * @see {@link ILaunchConfiguration}
- * @see {@link org.eclipse.debug.internal.ui.launchConfigurations.
- * 	LaunchConfigurationsDialog}
+ * @see {@link org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog}
  * @see {@link IDebugHelpContextIds#DEFAULT_LAUNCHCONFIGURATION_PROPERTY_PAGE}
  * 
- * 	CONTEXTLAUNCHING
+ *      CONTEXTLAUNCHING
  * 
  * @since 3.3.0
  */
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X09b.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X09b.java
diff -N workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X09b.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X09b.java	23 Apr 2008 22:29:05 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-package test.wksp.eclipse;
-
-public class X09b {
-
-	/**
-	 * Test_immutable_tag_____at_the_end_of_line (value: <code>enablement</code>
-	 * )
-	 */
-	int foo82;
-}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X29.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X29.java,v
retrieving revision 1.2
diff -u -r1.2 X29.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X29.java	8 May 2008 19:03:17 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X29.java	11 May 2008 18:02:22 -0000
@@ -5,14 +5,14 @@
 	/**
 	 * @param <code>text</code>, the string to match
 	 * @param <code>start</code>, the starting index in the text for search,
-	 * 	inclusive
+	 *        inclusive
 	 * @param <code>end</code>, the stopping point of search, exclusive
 	 * @param code
-	 * 		>p</code>, a string that has no wildcard
+	 *            >p</code>, a string that has no wildcard
 	 * @param <code>ignoreCase</code>, boolean indicating wether code>p</code>
-	 * 	is case sensitive
+	 *        is case sensitive
 	 * @return the starting index in the text of the pattern , or -1 if not
-	 * 	found
+	 *         found
 	 */
 	void foo() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X05.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X05.java,v
retrieving revision 1.1
diff -u -r1.1 X05.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X05.java	23 Apr 2008 22:29:05 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X05.java	11 May 2008 18:02:22 -0000
@@ -9,7 +9,7 @@
 	 * </p>
 	 * 
 	 * @param toolBarManager
-	 * 		the <code>ToolBarManager</code> to which to contribute
+	 *            the <code>ToolBarManager</code> to which to contribute
 	 */
 	void foo(Object toolBarManager) {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28.java,v
retrieving revision 1.1
diff -u -r1.1 X28.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28.java	6 May 2008 08:47:48 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28.java	11 May 2008 18:02:22 -0000
@@ -5,9 +5,8 @@
 	/**
 	 * Shutdown the HCR mgr and the Java debug targets.
 	 * 
-	 * @see
-	 * 	org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundlContext)@see
-	 * 	org.eclipse.core.runtime.Plugin#shutdown()
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundlContext)@see
+	 *      org.eclipse.core.runtime.Plugin#shutdown()
 	 */
 	public void foo() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28b.java,v
retrieving revision 1.1
diff -u -r1.1 X28b.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28b.java	6 May 2008 08:47:47 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28b.java	11 May 2008 18:02:22 -0000
@@ -5,9 +5,8 @@
 	/**
 	 * Shutdown the HCR mgr and the Java debug targets.
 	 * 
-	 * @see
-	 * 	org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext
-	 * 	)@see org.eclipse.core.runtime.Plugin#shutdown()
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)@see
+	 *      org.eclipse.core.runtime.Plugin#shutdown()
 	 */
 	public void foo() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X10.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X10.java,v
retrieving revision 1.1
diff -u -r1.1 X10.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X10.java	23 Apr 2008 22:29:05 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X10.java	11 May 2008 18:02:22 -0000
@@ -14,7 +14,7 @@
 	 * Returns a complete node containing the contents of the subtree rooted at
 	 * 
 	 * @key in the receiver. Returns null if this node does not exist in the
-	 * 	tree. This is a thread-safe version of naiveCopyCompleteSubtree
+	 *      tree. This is a thread-safe version of naiveCopyCompleteSubtree
 	 */
 	void bar(String key) {
 	}
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X06.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X06.java,v
retrieving revision 1.1
diff -u -r1.1 X06.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X06.java	14 Apr 2008 21:52:20 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X06.java	11 May 2008 18:02:21 -0000
@@ -5,7 +5,7 @@
 	 * Runs the bare test sequence.
 	 * 
 	 * @exception Throwable
-	 * 	if any exception is thrown
+	 *            if any exception is thrown
 	 */
 	public void runBare() throws Throwable {
 	}
@@ -14,7 +14,7 @@
 	 * Override to run the test and assert its state.
 	 * 
 	 * @exception Throwable
-	 * 	if any exception is thrown
+	 *            if any exception is thrown
 	 */
 	protected void runTest() throws Throwable {
 	}
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X16b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X16b.java,v
retrieving revision 1.1
diff -u -r1.1 X16b.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X16b.java	23 Apr 2008 10:13:40 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X16b.java	11 May 2008 18:02:21 -0000
@@ -7,13 +7,13 @@
 	 * The given message is included in that exception, to aid debugging.
 	 * 
 	 * @param expression
-	 * 	the outcode of the check
+	 *        the outcode of the check
 	 * @param message
-	 * 	the message to include in the exception
+	 *        the message to include in the exception
 	 * @return <code>true</code> if the check passes (does not return if the
-	 * 	check fails)
+	 *         check fails)
 	 * @exception IllegalArgumentException
-	 * 	if the legality test failed
+	 *            if the legality test failed
 	 */
 	boolean foo(int expression, String message) {
 		return false;
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14b.java,v
retrieving revision 1.1
diff -u -r1.1 X14b.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14b.java	16 Apr 2008 11:55:43 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14b.java	11 May 2008 18:02:21 -0000
@@ -1,11 +1,11 @@
-package test.example;
+package test.prefs.example;
 
 public class X14b {
 	/**
 	 * Tests a new (<code>DiffNode</code>) code syntax
 	 * 
 	 * @param kind
-	 * 	of difference (defined in <code>Differencer</code>)
+	 *        of difference (defined in <code>Differencer</code>)
 	 */
 	public void foo() {
 
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X17b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X17b.java,v
retrieving revision 1.1
diff -u -r1.1 X17b.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X17b.java	23 Apr 2008 10:13:40 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X17b.java	11 May 2008 18:02:22 -0000
@@ -8,7 +8,7 @@
 	 * not resolvable).
 	 * 
 	 * @param entry
-	 * 	the given entry
+	 *        the given entry
 	 * @return the existing package fragment roots identified by the given entry
 	 */
 	Object findPackageFragmentRoots(String entry);
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X05.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X05.java,v
retrieving revision 1.1
diff -u -r1.1 X05.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X05.java	14 Apr 2008 21:52:20 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X05.java	11 May 2008 18:02:21 -0000
@@ -7,7 +7,7 @@
 	 * set.
 	 * 
 	 * @param str
-	 * 	The input string
+	 *        The input string
 	 */
 	void foo(String str) {
 	}
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14.java,v
retrieving revision 1.1
diff -u -r1.1 X14.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14.java	23 Apr 2008 10:13:40 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14.java	11 May 2008 18:02:21 -0000
@@ -3,7 +3,7 @@
 public class X14 {
 	/**
 	 * @param kind
-	 * 	of difference (defined in <code>Differencer</code>)
+	 *        of difference (defined in <code>Differencer</code>)
 	 */
 	public void foo() {
 
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X17c.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X17c.java,v
retrieving revision 1.3
diff -u -r1.3 X17c.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X17c.java	28 Apr 2008 16:29:56 -0000	1.3
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X17c.java	11 May 2008 18:02:22 -0000
@@ -10,13 +10,15 @@
 	 * </p>
 	 * 
 	 * @exception Exception
-	 * 	in one of the corresponding situation:
-	 * 	<ul>
-	 * 	<li>this element does not exist</li>
-	 * 	<li>an exception occurs while accessing its corresponding resource</li>
-	 * 	<li>a classpath variable or classpath container was not resolvable and
-	 * 	<code>ignoreUnresolvedEntry</code> is <code>false</code>.</li>
-	 * 	</ul>
+	 *            in one of the corresponding situation:
+	 *            <ul>
+	 *            <li>this element does not exist</li>
+	 *            <li>an exception occurs while accessing its corresponding
+	 *            resource</li>
+	 *            <li>a classpath variable or classpath container was not
+	 *            resolvable and <code>ignoreUnresolvedEntry</code> is
+	 *            <code>false</code>.</li>
+	 *            </ul>
 	 * @see String
 	 */
 	String getResolvedClasspath(boolean ignoreUnresolvedEntry) throws Exception;
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14d.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14d.java,v
retrieving revision 1.2
diff -u -r1.2 X14d.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14d.java	16 Apr 2008 16:33:07 -0000	1.2
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14d.java	11 May 2008 18:02:21 -0000
@@ -1,11 +1,11 @@
-package test.tags.param;
+package test.prefs.example;
 
 public class X14d {
 	/**
 	 * Returns a collection of projects referenced by a build scope attribute.
 	 * 
 	 * @param scope
-	 * 	build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
+	 *        build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
 	 * @return collection of porjects referred to by the scope attribute
 	 */
 	int foo() {
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X08.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X08.java,v
retrieving revision 1.1
diff -u -r1.1 X08.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X08.java	27 Apr 2008 10:01:23 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X08.java	11 May 2008 18:02:21 -0000
@@ -3,12 +3,12 @@
 public class X08 {
 	/**
 	 * @param parent
-	 * 	the parent control under which the control must be created
+	 *        the parent control under which the control must be created
 	 * @param direction
-	 * 	the layout direction of the contents, either </code>SWT.HORIZONTAL
-	 * 	<code> or </code>SWT.VERTICAL<code>
+	 *        the layout direction of the contents, either </code>SWT.HORIZONTAL
+	 *        <code> or </code>SWT.VERTICAL<code>
 	 * @return the SWT control hierarchy for the outline part of the compare
-	 * 	editor
+	 *         editor
 	 * @since 3.0
 	 */
 	String foo(Object parent, int direction) {
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X09.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X09.java,v
retrieving revision 1.1
diff -u -r1.1 X09.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X09.java	27 Apr 2008 10:01:23 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X09.java	11 May 2008 18:02:21 -0000
@@ -3,12 +3,12 @@
 public class X09 {
 	/**
 	 * @param parent
-	 * 	the parent control under which the control must be created
+	 *        the parent control under which the control must be created
 	 * @param direction
-	 * 	the layout direction of the contents, either <code>SWT.HORIZONTAL</code>
-	 * 	or <code>SWT.VERTICAL</code>
+	 *        the layout direction of the contents, either
+	 *        <code>SWT.HORIZONTAL</code> or <code>SWT.VERTICAL</code>
 	 * @return the SWT control hierarchy for the outline part of the compare
-	 * 	editor
+	 *         editor
 	 * @since 3.0
 	 */
 	String foo(Object parent, int direction) {
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14c.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14c.java,v
retrieving revision 1.1
diff -u -r1.1 X14c.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14c.java	16 Apr 2008 11:55:43 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14c.java	11 May 2008 18:02:21 -0000
@@ -1,11 +1,11 @@
-package test.example;
+package test.prefs.example;
 
 public class X14c {
 	/**
 	 * Tests a new (<code>DiffNode</code>) code syntax
 	 * 
 	 * @param kind
-	 * 	of difference (defined in <code>Differencer</code>)
+	 *        of difference (defined in <code>Differencer</code>)
 	 */
 	public void foo() {
 
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14a.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14a.java,v
retrieving revision 1.1
diff -u -r1.1 X14a.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14a.java	16 Apr 2008 11:55:43 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X14a.java	11 May 2008 18:02:21 -0000
@@ -1,11 +1,11 @@
-package test.example;
+package test.prefs.example;
 
 public class X14a {
 	/**
 	 * Tests a new (<code>DiffNode</code>) code syntax
 	 * 
 	 * @param kind
-	 * 	of difference (defined in <code>Differencer</code>)
+	 *        of difference (defined in <code>Differencer</code>)
 	 */
 	public void foo() {
 
Index: workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X01.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X01.java,v
retrieving revision 1.1
diff -u -r1.1 X01.java
--- workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X01.java	14 Apr 2008 21:52:20 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/dont_indent_descr/X01.java	11 May 2008 18:02:21 -0000
@@ -33,10 +33,10 @@
 	 * the javadoc comment.
 	 * 
 	 * @param a
-	 * 	The first parameter. For an optimum result, this should be an odd number
-	 * 	between 0 and 100.
+	 *        The first parameter. For an optimum result, this should be an odd
+	 *        number between 0 and 100.
 	 * @param b
-	 * 	The second parameter.
+	 *        The second parameter.
 	 * @return The result of the foo operation, usually within 0 and 1000.
 	 */
 	int foo(int a, int b);
Index: workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X04.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X04.java,v
retrieving revision 1.1
diff -u -r1.1 X04.java
--- workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X04.java	14 Apr 2008 21:52:19 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X04.java	11 May 2008 18:02:22 -0000
@@ -3,7 +3,7 @@
 public class X04 {
 	/**
 	 * @param foo
-	 * 	text
+	 *        text
 	 */
 	void foo(String foo) {
 	}
Index: workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X05.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X05.java,v
retrieving revision 1.1
diff -u -r1.1 X05.java
--- workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X05.java	25 Apr 2008 13:11:53 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X05.java	11 May 2008 18:02:22 -0000
@@ -5,7 +5,7 @@
 	 * Test with exception tag.
 	 * 
 	 * @exception Throwable
-	 * 	if any exception is thrown
+	 *            if any exception is thrown
 	 */
 	public void foo() throws Throwable {
 	}
Index: workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X03.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X03.java,v
retrieving revision 1.1
diff -u -r1.1 X03.java
--- workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X03.java	14 Apr 2008 21:52:19 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X03.java	11 May 2008 18:02:22 -0000
@@ -15,17 +15,19 @@
 	 * 
 	 * 
 	 * 
-	 * 	The first parameter. For an optimum result, this should be an odd number
-	 * 	between 0 and 100. We may also want to know if the formatter is able to
-	 * 	handle more than two lines in a tag description.
+	 *        The first parameter. For an optimum result, this should be an odd
+	 *        number between 0 and 100. We may also want to know if the
+	 *        formatter is able to handle more than two lines in a tag
+	 *        description.
 	 * 
 	 * 
 	 * 
 	 * @param b
-	 * 	The second parameter. Same test than for first parameter: we also want
-	 * 	to know if the formatter is able to handle more than two lines in a tag
-	 * 	description. But this time this description is split on several lines
-	 * 	which may make the work a little bit more difficult to do...
+	 *        The second parameter. Same test than for first parameter: we also
+	 *        want to know if the formatter is able to handle more than two
+	 *        lines in a tag description. But this time this description is
+	 *        split on several lines which may make the work a little bit more
+	 *        difficult to do...
 	 * 
 	 * 
 	 * 
Index: workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X01.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X01.java,v
retrieving revision 1.1
diff -u -r1.1 X01.java
--- workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X01.java	23 Apr 2008 10:13:41 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X01.java	11 May 2008 18:02:22 -0000
@@ -3,10 +3,10 @@
 interface X01 {
 	/**
 	 * @param a
-	 * 	The first parameter. For an optimum result, this should be an odd number
-	 * 	between 0 and 100.
+	 *        The first parameter. For an optimum result, this should be an odd
+	 *        number between 0 and 100.
 	 * @param b
-	 * 	The second parameter.
+	 *        The second parameter.
 	 */
 	int foo(int a, int b);
 }
Index: workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X02.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X02.java,v
retrieving revision 1.1
diff -u -r1.1 X02.java
--- workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X02.java	14 Apr 2008 21:52:19 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X02.java	11 May 2008 18:02:22 -0000
@@ -5,12 +5,13 @@
 	 * Description on several lines formatted in only one.
 	 * 
 	 * @param a
-	 * 	The first parameter. For an optimum result, this should be an odd number
-	 * 	between 0 and 100. We may also want to know if the formatter is able to
-	 * 	handle more than two lines in a tag description.
+	 *        The first parameter. For an optimum result, this should be an odd
+	 *        number between 0 and 100. We may also want to know if the
+	 *        formatter is able to handle more than two lines in a tag
+	 *        description.
 	 * 
 	 * @param b
-	 * 	The second parameter.
+	 *        The second parameter.
 	 */
 	int foo(int a, int b);
 }
Index: workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X06.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X06.java,v
retrieving revision 1.1
diff -u -r1.1 X06.java
--- workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X06.java	25 Apr 2008 13:11:53 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X06.java	11 May 2008 18:02:22 -0000
@@ -5,7 +5,7 @@
 	 * Returns a collection of projects referenced by a build scope attribute.
 	 * 
 	 * @param scope
-	 * 	build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
+	 *        build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
 	 * @return collection of porjects referred to by the scope attribute
 	 */
 	int foo() {
Index: workspace/FormatterJavadoc/test/tags/link/out/default/X02.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/link/out/default/X02.java,v
retrieving revision 1.2
diff -u -r1.2 X02.java
--- workspace/FormatterJavadoc/test/tags/link/out/default/X02.java	27 Apr 2008 10:01:23 -0000	1.2
+++ workspace/FormatterJavadoc/test/tags/link/out/default/X02.java	11 May 2008 18:02:22 -0000
@@ -3,8 +3,9 @@
 public class X02 {
 	/**
 	 * Interface used to implement navigation for tree viewers. This interface
-	 * is used by {@link TreeViewerAdvisor#navigate(TreeViewer, boolean,
-	 * boolean, boolean) to open selections and navigate.
+	 * is used by
+	 * {@link TreeViewerAdvisor#navigate(TreeViewer, boolean, boolean, boolean)
+	 * to open selections and navigate.
 	 */
 	public interface Y02 {
 	}
Index: workspace/FormatterJavadoc/test/tags/link/out/default/X02b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/link/out/default/X02b.java,v
retrieving revision 1.2
diff -u -r1.2 X02b.java
--- workspace/FormatterJavadoc/test/tags/link/out/default/X02b.java	27 Apr 2008 10:01:23 -0000	1.2
+++ workspace/FormatterJavadoc/test/tags/link/out/default/X02b.java	11 May 2008 18:02:22 -0000
@@ -3,8 +3,9 @@
 public class X02b {
 	/**
 	 * Interface used to implement navigation for tree viewers. This interface
-	 * is used by {@link TreeViewerAdvisor#navigate(TreeViewer, boolean,
-	 * boolean, boolean)} to open selections and navigate.
+	 * is used by
+	 * {@link TreeViewerAdvisor#navigate(TreeViewer, boolean, boolean, boolean)}
+	 * to open selections and navigate.
 	 */
 	public interface Y02 {
 	}
Index: workspace/FormatterJavadoc/test/tags/link/out/default/X04.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/link/out/default/X04.java,v
retrieving revision 1.1
diff -u -r1.1 X04.java
--- workspace/FormatterJavadoc/test/tags/link/out/default/X04.java	27 Apr 2008 10:01:23 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/link/out/default/X04.java	11 May 2008 18:02:22 -0000
@@ -6,7 +6,7 @@
 	 * Text
 	 * 
 	 * @param str
-	 * 		{@inheritDoc}
+	 *            {@inheritDoc}
 	 */
 	void foo(String str) {
 	}
Index: workspace/FormatterJavadoc/test/html/others/out/default/X01b.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/html/others/out/default/X01b.java
diff -N workspace/FormatterJavadoc/test/html/others/out/default/X01b.java
--- workspace/FormatterJavadoc/test/html/others/out/default/X01b.java	14 Apr 2008 21:52:16 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-package test.html.others;
-
-/**
- * 456789012345678901234567890123456789012345678901234567890123456789 1234567
- * <br>
- */
-public interface X01b {
-
-	/**
-	 * 89012345678901234567890123456789012345678901234567890123456789 1234567
-	 * <br>
-	 */
-	int foo();
-}
Index: workspace/FormatterJavadoc/test/html/others/out/default/X02b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/html/others/out/default/X02b.java,v
retrieving revision 1.1
diff -u -r1.1 X02b.java
--- workspace/FormatterJavadoc/test/html/others/out/default/X02b.java	14 Apr 2008 21:52:16 -0000	1.1
+++ workspace/FormatterJavadoc/test/html/others/out/default/X02b.java	11 May 2008 18:02:22 -0000
@@ -2,16 +2,14 @@
 
 /**
  * <ul>
- * <li>789012345678901234567890123456789012345678901234567890123456789012345
- * </li>
+ * <li>789012345678901234567890123456789012345678901234567890123456789 12345</li>
  * </ul>
  */
 public interface X02b {
 
 	/**
 	 * <ul>
-	 * <li>12345678901234567890123456789012345678901234567890123456789012345
-	 * </li>
+	 * <li>12345678901234567890123456789012345678901234567890123456789 12345</li>
 	 * </ul>
 	 */
 	int foo();
Index: workspace/FormatterJavadoc/test/html/others/out/default/X01d.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/html/others/out/default/X01d.java
diff -N workspace/FormatterJavadoc/test/html/others/out/default/X01d.java
--- workspace/FormatterJavadoc/test/html/others/out/default/X01d.java	14 Apr 2008 21:52:16 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-package test.html.others;
-
-/**
- * 456789012345678901234567890123456789012345678901234567890123456789 123456789
- * <br>
- */
-public interface X01d {
-
-	/**
-	 * 89012345678901234567890123456789012345678901234567890123456789 123456789
-	 * <br>
-	 */
-	int foo();
-}
Index: workspace/FormatterJavadoc/test/html/others/out/default/X01e.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/html/others/out/default/X01e.java
diff -N workspace/FormatterJavadoc/test/html/others/out/default/X01e.java
--- workspace/FormatterJavadoc/test/html/others/out/default/X01e.java	14 Apr 2008 21:52:16 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-package test.html.others;
-
-/**
- * 456789012345678901234567890123456789012345678901234567890123456789 1234567890
- * <br>
- */
-public interface X01e {
-
-	/**
-	 * 89012345678901234567890123456789012345678901234567890123456789 1234567890
-	 * <br>
-	 */
-	int foo();
-}
Index: workspace/FormatterJavadoc/test/html/others/out/default/X02d.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/html/others/out/default/X02d.java,v
retrieving revision 1.1
diff -u -r1.1 X02d.java
--- workspace/FormatterJavadoc/test/html/others/out/default/X02d.java	14 Apr 2008 21:52:16 -0000	1.1
+++ workspace/FormatterJavadoc/test/html/others/out/default/X02d.java	11 May 2008 18:02:22 -0000
@@ -2,7 +2,7 @@
 
 /**
  * <ul>
- * <li>7890123456789012345678901234567890123456789012345678901234567890123456789
+ * <li>789012345678901234567890123456789012345678901234567890123456789 123456789
  * </li>
  * </ul>
  */
@@ -10,7 +10,7 @@
 
 	/**
 	 * <ul>
-	 * <li>123456789012345678901234567890123456789012345678901234567890123456789
+	 * <li>12345678901234567890123456789012345678901234567890123456789 123456789
 	 * </li>
 	 * </ul>
 	 */
Index: workspace/FormatterJavadoc/test/html/others/out/default/X01c.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/html/others/out/default/X01c.java
diff -N workspace/FormatterJavadoc/test/html/others/out/default/X01c.java
--- workspace/FormatterJavadoc/test/html/others/out/default/X01c.java	14 Apr 2008 21:52:16 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-package test.html.others;
-
-/**
- * 456789012345678901234567890123456789012345678901234567890123456789 12345678
- * <br>
- */
-public interface X01c {
-
-	/**
-	 * 89012345678901234567890123456789012345678901234567890123456789 12345678
-	 * <br>
-	 */
-	int foo();
-}
Index: workspace/FormatterJavadoc/test/html/others/out/default/X02c.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/html/others/out/default/X02c.java,v
retrieving revision 1.1
diff -u -r1.1 X02c.java
--- workspace/FormatterJavadoc/test/html/others/out/default/X02c.java	14 Apr 2008 21:52:16 -0000	1.1
+++ workspace/FormatterJavadoc/test/html/others/out/default/X02c.java	11 May 2008 18:02:22 -0000
@@ -2,16 +2,14 @@
 
 /**
  * <ul>
- * <li>78901234567890123456789012345678901234567890123456789012345678901234567
- * </li>
+ * <li>78901234567890123456789012345678901234567890123456789123456789 1234567</li>
  * </ul>
  */
 public interface X02c {
 
 	/**
 	 * <ul>
-	 * <li>1234567890123456789012345678901234567890123456789012345678901234567
-	 * </li>
+	 * <li>12345678901234567890123456789012345678901234567890123456789 1234567</li>
 	 * </ul>
 	 */
 	int foo();
Index: workspace/FormatterJavadoc/test/html/others/out/default/X11.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/html/others/out/default/X11.java,v
retrieving revision 1.1
diff -u -r1.1 X11.java
--- workspace/FormatterJavadoc/test/html/others/out/default/X11.java	23 Apr 2008 10:13:40 -0000	1.1
+++ workspace/FormatterJavadoc/test/html/others/out/default/X11.java	11 May 2008 18:02:22 -0000
@@ -5,8 +5,7 @@
  * P1:
  * <ul>
  * <li>T1.L1<b>B1<i>I1</i></b><br>
- * T1.L11
- * </li>
+ * T1.L11</li>
  * <li><b>T1.L2</b>
  * 
  * <pre>
@@ -29,13 +28,12 @@
  * <li>X.L1
  * 
  * <pre>
- * [application-args] := *( &quot;:&quot; [value])
+ *    [application-args] := *( &quot;:&quot; [value])
  *    [value] := [token] | [quoted-string]
  * </pre>
  * 
  * <p>
- * X.L2.P1
- * </li>
+ * X.L2.P1</li>
  * <p>
  * P2
  * <p>
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X23.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X23.java,v
retrieving revision 1.2
diff -u -r1.2 X23.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X23.java	30 Apr 2008 14:50:14 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X23.java	11 May 2008 18:02:22 -0000
@@ -35,7 +35,7 @@
 	 * </p>
 	 * <p>
 	 * The body declarations passed as parameters to the comparator always carry
-	 * at least the following minimal signature information:<br>
+	 * at least the following minimal signature information: <br>
 	 * <table border="1" width="80%" cellpadding="5">
 	 * <tr>
 	 * <td width="20%"><code>TypeDeclaration</code></td>
@@ -90,8 +90,7 @@
 	 * @exception JavaModelException
 	 * if the compilation unit could not be sorted. Reasons include:
 	 * <ul>
-	 * <li>The given compilation unit does not exist (ELEMENT_DOES_NOT_EXIST)
-	 * </li>
+	 * <li>The given compilation unit does not exist (ELEMENT_DOES_NOT_EXIST)</li>
 	 * <li>The given compilation unit is not a working copy
 	 * (INVALID_ELEMENT_TYPES)</li>
 	 * <li>A <code>CoreException</code> occurred while accessing the underlying
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X18.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X18.java,v
retrieving revision 1.4
diff -u -r1.4 X18.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X18.java	6 May 2008 08:47:48 -0000	1.4
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X18.java	11 May 2008 18:02:22 -0000
@@ -9,22 +9,22 @@
 	 * When the parse is successful the result returned includes the ASTs for
 	 * the requested source:
 	 * <ul>
-	 * <li>{@link #K_COMPILATION_UNIT}: The result node is a {@link
-	 * CompilationUnit}.</li>
-	 * <li>{@link #K_CLASS_BODY_DECLARATIONS}: The result node is a {@link
-	 * TypeDeclaration} whose {@link TypeDeclaration#bodyDeclarations()
+	 * <li>{@link #K_COMPILATION_UNIT}: The result node is a
+	 * {@link CompilationUnit}.</li>
+	 * <li>{@link #K_CLASS_BODY_DECLARATIONS}: The result node is a
+	 * {@link TypeDeclaration} whose {@link TypeDeclaration#bodyDeclarations()
 	 * bodyDeclarations} are the new trees. Other aspects of the type
 	 * declaration are unspecified.</li>
 	 * <li>{@link #K_STATEMENTS}: The result node is a {@link Block Block} whose
 	 * {@link Block#statements() statements} are the new trees. Other aspects of
 	 * the block are unspecified.</li>
-	 * <li>{@link #K_EXPRESSION}: The result node is a subclass of {@link
-	 * Expression Expression}. Other aspects of the expression are unspecified.
-	 * </li>
+	 * <li>{@link #K_EXPRESSION}: The result node is a subclass of
+	 * {@link Expression Expression}. Other aspects of the expression are
+	 * unspecified.</li>
 	 * </ul>
-	 * The resulting AST node is rooted under (possibly contrived) {@link
-	 * CompilationUnit CompilationUnit} node, to allow the client to retrieve
-	 * the following pieces of information available there:
+	 * The resulting AST node is rooted under (possibly contrived)
+	 * {@link CompilationUnit CompilationUnit} node, to allow the client to
+	 * retrieve the following pieces of information available there:
 	 * <ul>
 	 * <li>{@linkplain CompilationUnit#lineNumber(int) Line number map}. Line
 	 * numbers start at 1 and only cover the subrange scanned (
@@ -69,8 +69,8 @@
 	 * 
 	 * @param kind
 	 * the kind of construct to parse: one of {@link #K_COMPILATION_UNIT},
-	 * {@link #K_CLASS_BODY_DECLARATIONS}, {@link #K_EXPRESSION}, {@link
-	 * #K_STATEMENTS}
+	 * {@link #K_CLASS_BODY_DECLARATIONS}, {@link #K_EXPRESSION},
+	 * {@link #K_STATEMENTS}
 	 */
 	void setKind(int kind) {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X28.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X28.java,v
retrieving revision 1.1
diff -u -r1.1 X28.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X28.java	6 May 2008 08:47:48 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X28.java	11 May 2008 18:02:22 -0000
@@ -5,8 +5,7 @@
 	/**
 	 * Shutdown the HCR mgr and the Java debug targets.
 	 * 
-	 * @see
-	 * org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundlContext)@see
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundlContext)@see
 	 * org.eclipse.core.runtime.Plugin#shutdown()
 	 */
 	public void foo() {
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X01.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X01.java,v
retrieving revision 1.3
diff -u -r1.3 X01.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X01.java	27 Apr 2008 10:01:23 -0000	1.3
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X01.java	11 May 2008 18:02:22 -0000
@@ -6,9 +6,7 @@
  * 
  * @see {@link PropertyPage}
  * @see {@link ILaunchConfiguration}
- * @see {@link
- * org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog
- * }
+ * @see {@link org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog}
  * @see {@link IDebugHelpContextIds#DEFAULT_LAUNCHCONFIGURATION_PROPERTY_PAGE}
  * 
  * CONTEXTLAUNCHING
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X21.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X21.java,v
retrieving revision 1.2
diff -u -r1.2 X21.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X21.java	28 Apr 2008 16:29:56 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X21.java	11 May 2008 18:02:22 -0000
@@ -5,7 +5,9 @@
 	/**
 	 * Returns a search pattern based on a given string pattern. The string
 	 * patterns support '*' wild-cards. The remaining parameters are used to
-	 * narrow down the type of expected results. <br>
+	 * narrow down the type of expected results.
+	 * 
+	 * <br>
 	 * Examples:
 	 * <ul>
 	 * <li>search for case insensitive references to <code>Object</code>:
@@ -31,8 +33,7 @@
 	 * interfaces</li>
 	 * <li><code>IJavaSearchConstants.FIELD</code>: look for fields</li>
 	 * <li><code>IJavaSearchConstants.METHOD</code>: look for methods</li>
-	 * <li><code>IJavaSearchConstants.CONSTRUCTOR</code>: look for constructors
-	 * </li>
+	 * <li><code>IJavaSearchConstants.CONSTRUCTOR</code>: look for constructors</li>
 	 * <li><code>IJavaSearchConstants.PACKAGE</code>: look for packages</li>
 	 * </ul>
 	 * @param limitTo
@@ -57,8 +58,8 @@
 	 * indicates whether the search is case sensitive or not.
 	 * @return a search pattern on the given string pattern, or
 	 * <code>null</code> if the string pattern is ill-formed.
-	 * @deprecated Use {@link SearchPattern#createPattern(String, int, int, int)
-	 * } instead.
+	 * @deprecated Use
+	 * {@link SearchPattern#createPattern(String, int, int, int)} instead.
 	 */
 	void createSearchPattern() {
 	}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X14.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X14.java,v
retrieving revision 1.1
diff -u -r1.1 X14.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X14.java	25 Apr 2008 13:11:53 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X14.java	11 May 2008 18:02:22 -0000
@@ -9,8 +9,8 @@
 	 * @param href
 	 * the URL (as a string) of the help resource
 	 * <p>
-	 * Valid href are as described in {@link
-	 * org.eclipse.help.IHelpResource#getHref IHelpResource.getHref}
+	 * Valid href are as described in
+	 * {@link org.eclipse.help.IHelpResource#getHref IHelpResource.getHref}
 	 * </p>
 	 * @return an input stream containing the contents of the help resource, or
 	 * <code>null</code> if the help resource could not be found and opened
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X27.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X27.java,v
retrieving revision 1.1
diff -u -r1.1 X27.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X27.java	6 May 2008 08:47:48 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X27.java	11 May 2008 18:02:22 -0000
@@ -5,8 +5,7 @@
 	/**
 	 * Shutdown the HCR mgr and the Java debug targets.
 	 * 
-	 * @see
-	 * org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
 	 * text
 	 */
 	public void foo() {
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X28b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X28b.java,v
retrieving revision 1.1
diff -u -r1.1 X28b.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X28b.java	6 May 2008 08:47:48 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X28b.java	11 May 2008 18:02:22 -0000
@@ -5,8 +5,7 @@
 	/**
 	 * Shutdown the HCR mgr and the Java debug targets.
 	 * 
-	 * @see
-	 * org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)@see
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)@see
 	 * org.eclipse.core.runtime.Plugin#shutdown()
 	 */
 	public void foo() {
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X19.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X19.java,v
retrieving revision 1.3
diff -u -r1.3 X19.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X19.java	28 Apr 2008 16:29:56 -0000	1.3
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X19.java	11 May 2008 18:02:22 -0000
@@ -10,12 +10,12 @@
 	 * source text, it is problematic to locate comments in relation to the
 	 * structure of an AST. The one exception is doc comments which, by
 	 * convention, immediately precede type, field, and method declarations;
-	 * these comments are located in the AST by {@link
-	 * BodyDeclaration#getJavadoc BodyDeclaration.getJavadoc}. Other comments do
-	 * not show up in the AST. The table of comments is provided for clients
-	 * that need to find the source ranges of all comments in the original
-	 * source string. It includes entries for comments of all kinds (line,
-	 * block, and doc), arranged in order of increasing source position.
+	 * these comments are located in the AST by
+	 * {@link BodyDeclaration#getJavadoc BodyDeclaration.getJavadoc}. Other
+	 * comments do not show up in the AST. The table of comments is provided for
+	 * clients that need to find the source ranges of all comments in the
+	 * original source string. It includes entries for comments of all kinds
+	 * (line, block, and doc), arranged in order of increasing source position.
 	 * </p>
 	 * Note on comment parenting: The {@link ASTNode#getParent() getParent()} of
 	 * a doc comment associated with a body declaration is the body declaration
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X32.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X32.java
diff -N workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X32.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X32.java	8 May 2008 19:03:17 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-package test.wksp.eclipse;
-
-public class X32 {
-
-	/**
-	 * This method calls
-	 * <tt>realHandler.setURL(URL,String,String,int,String,String,String,String)</tt>
-	 * .
-	 * 
-	 * @see
-	 * "java.net.URLStreamHandler.setURL(URL,String,String,int,String,String,String,String)"
-	 */
-	void foo() {
-	}
-}
Index: workspace/FormatterJavadoc/test/html/others/X02c.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/html/others/X02c.java,v
retrieving revision 1.1
diff -u -r1.1 X02c.java
--- workspace/FormatterJavadoc/test/html/others/X02c.java	14 Apr 2008 21:52:15 -0000	1.1
+++ workspace/FormatterJavadoc/test/html/others/X02c.java	11 May 2008 18:02:22 -0000
@@ -1,13 +1,13 @@
 package test.html.others;
 
 /**
- * <ul><li>78901234567890123456789012345678901234567890123456789012345678901234567</li></ul>
+ * <ul><li>78901234567890123456789012345678901234567890123456789123456789 1234567</li></ul>
  */
 public interface X02c {
 
 	/**
 	 * <ul>
-	 * <li>1234567890123456789012345678901234567890123456789012345678901234567</li>
+	 * <li>12345678901234567890123456789012345678901234567890123456789 1234567</li>
 	 * </ul>
 	 */
 	int foo();
Index: workspace/FormatterJavadoc/test/html/others/X01b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/html/others/X01b.java,v
retrieving revision 1.1
diff -u -r1.1 X01b.java
--- workspace/FormatterJavadoc/test/html/others/X01b.java	14 Apr 2008 21:52:15 -0000	1.1
+++ workspace/FormatterJavadoc/test/html/others/X01b.java	11 May 2008 18:02:22 -0000
@@ -4,7 +4,7 @@
  * 456789012345678901234567890123456789012345678901234567890123456789 1234567<br>
  */
 public interface X01b {
-	
+
 	/**
 	 * 89012345678901234567890123456789012345678901234567890123456789 1234567<br>
 	 */
Index: workspace/FormatterJavadoc/test/html/others/X02b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/html/others/X02b.java,v
retrieving revision 1.1
diff -u -r1.1 X02b.java
--- workspace/FormatterJavadoc/test/html/others/X02b.java	14 Apr 2008 21:52:15 -0000	1.1
+++ workspace/FormatterJavadoc/test/html/others/X02b.java	11 May 2008 18:02:22 -0000
@@ -1,13 +1,13 @@
 package test.html.others;
 
 /**
- * <ul><li>789012345678901234567890123456789012345678901234567890123456789012345</li></ul>
+ * <ul><li>789012345678901234567890123456789012345678901234567890123456789 12345</li></ul>
  */
 public interface X02b {
 
 	/**
 	 * <ul>
-	 * <li>12345678901234567890123456789012345678901234567890123456789012345</li>
+	 * <li>12345678901234567890123456789012345678901234567890123456789 12345</li>
 	 * </ul>
 	 */
 	int foo();
Index: workspace/FormatterJavadoc/test/html/others/X01e.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/html/others/X01e.java,v
retrieving revision 1.1
diff -u -r1.1 X01e.java
--- workspace/FormatterJavadoc/test/html/others/X01e.java	14 Apr 2008 21:52:15 -0000	1.1
+++ workspace/FormatterJavadoc/test/html/others/X01e.java	11 May 2008 18:02:22 -0000
@@ -4,7 +4,7 @@
  * 456789012345678901234567890123456789012345678901234567890123456789 1234567890<br>
  */
 public interface X01e {
-	
+
 	/**
 	 * 89012345678901234567890123456789012345678901234567890123456789 1234567890<br>
 	 */
Index: workspace/FormatterJavadoc/test/html/others/X01c.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/html/others/X01c.java,v
retrieving revision 1.1
diff -u -r1.1 X01c.java
--- workspace/FormatterJavadoc/test/html/others/X01c.java	14 Apr 2008 21:52:15 -0000	1.1
+++ workspace/FormatterJavadoc/test/html/others/X01c.java	11 May 2008 18:02:22 -0000
@@ -4,7 +4,7 @@
  * 456789012345678901234567890123456789012345678901234567890123456789 12345678<br>
  */
 public interface X01c {
-	
+
 	/**
 	 * 89012345678901234567890123456789012345678901234567890123456789 12345678<br>
 	 */
Index: workspace/FormatterJavadoc/test/html/others/X02d.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/html/others/X02d.java,v
retrieving revision 1.1
diff -u -r1.1 X02d.java
--- workspace/FormatterJavadoc/test/html/others/X02d.java	14 Apr 2008 21:52:15 -0000	1.1
+++ workspace/FormatterJavadoc/test/html/others/X02d.java	11 May 2008 18:02:22 -0000
@@ -1,13 +1,13 @@
 package test.html.others;
 
 /**
- * <ul><li>7890123456789012345678901234567890123456789012345678901234567890123456789</li></ul>
+ * <ul><li>789012345678901234567890123456789012345678901234567890123456789 123456789</li></ul>
  */
 public interface X02d {
 
 	/**
 	 * <ul>
-	 * <li>123456789012345678901234567890123456789012345678901234567890123456789</li>
+	 * <li>12345678901234567890123456789012345678901234567890123456789 123456789</li>
 	 * </ul>
 	 */
 	int foo();
Index: workspace/FormatterJavadoc/test/html/others/X01d.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/html/others/X01d.java,v
retrieving revision 1.1
diff -u -r1.1 X01d.java
--- workspace/FormatterJavadoc/test/html/others/X01d.java	14 Apr 2008 21:52:15 -0000	1.1
+++ workspace/FormatterJavadoc/test/html/others/X01d.java	11 May 2008 18:02:22 -0000
@@ -4,7 +4,7 @@
  * 456789012345678901234567890123456789012345678901234567890123456789 123456789<br>
  */
 public interface X01d {
-	
+
 	/**
 	 * 89012345678901234567890123456789012345678901234567890123456789 123456789<br>
 	 */
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X01.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X01.java,v
retrieving revision 1.2
diff -u -r1.2 X01.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X01.java	25 Apr 2008 13:11:54 -0000	1.2
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X01.java	11 May 2008 18:02:22 -0000
@@ -6,10 +6,9 @@
  * 
  * @see {@link PropertyPage}
  * @see {@link ILaunchConfiguration}
- * @see {@link org.eclipse.debug.internal.ui.launchConfigurations.
- * 	LaunchConfigurationsDialog}
+ * @see {@link org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog}
  * @see {@link IDebugHelpContextIds#DEFAULT_LAUNCHCONFIGURATION_PROPERTY_PAGE}
- * 	CONTEXTLAUNCHING
+ *      CONTEXTLAUNCHING
  * @since 3.3.0
  */
 public class X01 {
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X21.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X21.java,v
retrieving revision 1.1
diff -u -r1.1 X21.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X21.java	28 Apr 2008 16:29:56 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X21.java	11 May 2008 18:02:22 -0000
@@ -20,44 +20,48 @@
 	 * </ul>
 	 * 
 	 * @param stringPattern
-	 * 		the given pattern
+	 *            the given pattern
 	 * @param searchFor
-	 * 		determines the nature of the searched elements
-	 * 		<ul>
-	 * 		<li><code>IJavaSearchConstants.CLASS</code>: only look for classes
-	 * 		</li>
-	 * 		<li><code>IJavaSearchConstants.INTERFACE</code>: only look for
-	 * 		interfaces</li>
-	 * 		<li><code>IJavaSearchConstants.TYPE</code>: look for both classes
-	 * 		and interfaces</li>
-	 * 		<li><code>IJavaSearchConstants.FIELD</code>: look for fields</li>
-	 * 		<li><code>IJavaSearchConstants.METHOD</code>: look for methods</li>
-	 * 		<li><code>IJavaSearchConstants.CONSTRUCTOR</code>: look for
-	 * 		constructors</li>
-	 * 		<li><code>IJavaSearchConstants.PACKAGE</code>: look for packages
-	 * 		</li>
-	 * 		</ul>
+	 *            determines the nature of the searched elements
+	 *            <ul>
+	 *            <li><code>IJavaSearchConstants.CLASS</code>: only look for
+	 *            classes</li>
+	 *            <li><code>IJavaSearchConstants.INTERFACE</code>: only look for
+	 *            interfaces</li>
+	 *            <li><code>IJavaSearchConstants.TYPE</code>: look for both
+	 *            classes and interfaces</li>
+	 *            <li><code>IJavaSearchConstants.FIELD</code>: look for fields</li>
+	 *            <li><code>IJavaSearchConstants.METHOD</code>: look for methods
+	 *            </li>
+	 *            <li><code>IJavaSearchConstants.CONSTRUCTOR</code>: look for
+	 *            constructors</li>
+	 *            <li><code>IJavaSearchConstants.PACKAGE</code>: look for
+	 *            packages</li>
+	 *            </ul>
 	 * @param limitTo
-	 * 		determines the nature of the expected matches
-	 * 		<ul>
-	 * 		<li><code>IJavaSearchConstants.DECLARATIONS</code>: will search
-	 * 		declarations matching with the corresponding element. In case the
-	 * 		element is a method, declarations of matching methods in subtypes
-	 * 		will also be found, allowing to find declarations of abstract
-	 * 		methods, etc.</li>
-	 * 		<li><code>IJavaSearchConstants.REFERENCES</code>: will search
-	 * 		references to the given element.</li>
-	 * 		<li><code>IJavaSearchConstants.ALL_OCCURRENCES</code>: will search
-	 * 		for either declarations or references as specified above.</li>
-	 * 		<li><code>IJavaSearchConstants.IMPLEMENTORS</code>: for interface,
-	 * 		will find all types which implements a given interface.</li>
-	 * 		</ul>
+	 *            determines the nature of the expected matches
+	 *            <ul>
+	 *            <li><code>IJavaSearchConstants.DECLARATIONS</code>: will
+	 *            search declarations matching with the corresponding element.
+	 *            In case the element is a method, declarations of matching
+	 *            methods in subtypes will also be found, allowing to find
+	 *            declarations of abstract methods, etc.</li>
+	 *            <li><code>IJavaSearchConstants.REFERENCES</code>: will search
+	 *            references to the given element.</li>
+	 *            <li><code>IJavaSearchConstants.ALL_OCCURRENCES</code>: will
+	 *            search for either declarations or references as specified
+	 *            above.</li>
+	 *            <li><code>IJavaSearchConstants.IMPLEMENTORS</code>: for
+	 *            interface, will find all types which implements a given
+	 *            interface.</li>
+	 *            </ul>
 	 * @param isCaseSensitive
-	 * 		indicates whether the search is case sensitive or not.
+	 *            indicates whether the search is case sensitive or not.
 	 * @return a search pattern on the given string pattern, or
-	 * 	<code>null</code> if the string pattern is ill-formed.
-	 * @deprecated Use {@link SearchPattern#createPattern(String, int, int, int)
-	 * 	} instead.
+	 *         <code>null</code> if the string pattern is ill-formed.
+	 * @deprecated Use
+	 *             {@link SearchPattern#createPattern(String, int, int, int)}
+	 *             instead.
 	 */
 	void createSearchPattern() {
 	}
Index: workspace/FormatterJavadoc/test/example/X14d.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/X14d.java,v
retrieving revision 1.1
diff -u -r1.1 X14d.java
--- workspace/FormatterJavadoc/test/example/X14d.java	16 Apr 2008 13:29:33 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/X14d.java	11 May 2008 18:02:21 -0000
@@ -1,4 +1,4 @@
-package test.tags.param;
+package test.prefs.example;
 
 public class X14d {
 	/**
Index: workspace/FormatterJavadoc/test/example/X14b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/X14b.java,v
retrieving revision 1.1
diff -u -r1.1 X14b.java
--- workspace/FormatterJavadoc/test/example/X14b.java	16 Apr 2008 11:55:43 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/X14b.java	11 May 2008 18:02:21 -0000
@@ -1,4 +1,4 @@
-package test.example;
+package test.prefs.example;
 
 public class X14b {
 	/**
Index: workspace/FormatterJavadoc/test/example/X14a.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/X14a.java,v
retrieving revision 1.1
diff -u -r1.1 X14a.java
--- workspace/FormatterJavadoc/test/example/X14a.java	16 Apr 2008 11:55:43 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/X14a.java	11 May 2008 18:02:21 -0000
@@ -1,4 +1,4 @@
-package test.example;
+package test.prefs.example;
 
 public class X14a {
 	/**
Index: workspace/FormatterJavadoc/test/example/X07.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/X07.java,v
retrieving revision 1.1
diff -u -r1.1 X07.java
--- workspace/FormatterJavadoc/test/example/X07.java	14 Apr 2008 21:52:15 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/X07.java	11 May 2008 18:02:21 -0000
@@ -3,11 +3,14 @@
 public class X07 {
 
 	/**
-	 * Don't format this:
-	 *    it has been formatted by the user!
+	 * The foo method.
+	 * foo is a substitute for bar.
 	 * 
-	 * @param    param   format   this comment    
+	 * @param param1 The first parameter
+	 * @param param2
+	 *            The second parameter.
+	 *            If <b>null</b>the first parameter is used
 	 */
-	void foo(String param) {
+	public void foo(Object param1, Object param2) {
 	}
 }
Index: workspace/FormatterJavadoc/test/example/X14c.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/X14c.java,v
retrieving revision 1.1
diff -u -r1.1 X14c.java
--- workspace/FormatterJavadoc/test/example/X14c.java	16 Apr 2008 11:55:43 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/X14c.java	11 May 2008 18:02:21 -0000
@@ -1,4 +1,4 @@
-package test.example;
+package test.prefs.example;
 
 public class X14c {
 	/**
Index: workspace/FormatterJavadoc/test/tags/param/out/default/X04.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/default/X04.java,v
retrieving revision 1.1
diff -u -r1.1 X04.java
--- workspace/FormatterJavadoc/test/tags/param/out/default/X04.java	14 Apr 2008 21:52:20 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/default/X04.java	11 May 2008 18:02:22 -0000
@@ -3,7 +3,7 @@
 public class X04 {
 	/**
 	 * @param foo
-	 * 		text
+	 *            text
 	 */
 	void foo(String foo) {
 	}
Index: workspace/FormatterJavadoc/test/tags/param/out/default/X02.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/default/X02.java,v
retrieving revision 1.1
diff -u -r1.1 X02.java
--- workspace/FormatterJavadoc/test/tags/param/out/default/X02.java	14 Apr 2008 21:52:20 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/default/X02.java	11 May 2008 18:02:22 -0000
@@ -5,12 +5,13 @@
 	 * Description on several lines formatted in only one.
 	 * 
 	 * @param a
-	 * 		The first parameter. For an optimum result, this should be an odd
-	 * 		number between 0 and 100. We may also want to know if the formatter
-	 * 		is able to handle more than two lines in a tag description.
+	 *            The first parameter. For an optimum result, this should be an
+	 *            odd number between 0 and 100. We may also want to know if the
+	 *            formatter is able to handle more than two lines in a tag
+	 *            description.
 	 * 
 	 * @param b
-	 * 		The second parameter.
+	 *            The second parameter.
 	 */
 	int foo(int a, int b);
 }
Index: workspace/FormatterJavadoc/test/tags/param/out/default/X06.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/default/X06.java,v
retrieving revision 1.1
diff -u -r1.1 X06.java
--- workspace/FormatterJavadoc/test/tags/param/out/default/X06.java	23 Apr 2008 10:13:41 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/default/X06.java	11 May 2008 18:02:22 -0000
@@ -5,7 +5,7 @@
 	 * Returns a collection of projects referenced by a build scope attribute.
 	 * 
 	 * @param scope
-	 * 		build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
+	 *            build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
 	 * @return collection of porjects referred to by the scope attribute
 	 */
 	int foo() {
Index: workspace/FormatterJavadoc/test/tags/param/out/default/X01.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/default/X01.java,v
retrieving revision 1.1
diff -u -r1.1 X01.java
--- workspace/FormatterJavadoc/test/tags/param/out/default/X01.java	23 Apr 2008 10:13:41 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/default/X01.java	11 May 2008 18:02:22 -0000
@@ -3,10 +3,10 @@
 interface X01 {
 	/**
 	 * @param a
-	 * 		The first parameter. For an optimum result, this should be an odd
-	 * 		number between 0 and 100.
+	 *            The first parameter. For an optimum result, this should be an
+	 *            odd number between 0 and 100.
 	 * @param b
-	 * 		The second parameter.
+	 *            The second parameter.
 	 */
 	int foo(int a, int b);
 }
Index: workspace/FormatterJavadoc/test/tags/param/out/default/X05.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/default/X05.java,v
retrieving revision 1.1
diff -u -r1.1 X05.java
--- workspace/FormatterJavadoc/test/tags/param/out/default/X05.java	23 Apr 2008 10:13:41 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/default/X05.java	11 May 2008 18:02:22 -0000
@@ -5,7 +5,7 @@
 	 * Test with exception tag.
 	 * 
 	 * @exception Throwable
-	 * 		if any exception is thrown
+	 *                if any exception is thrown
 	 */
 	public void foo() throws Throwable {
 	}
Index: workspace/FormatterJavadoc/test/tags/param/out/default/X03.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/default/X03.java,v
retrieving revision 1.1
diff -u -r1.1 X03.java
--- workspace/FormatterJavadoc/test/tags/param/out/default/X03.java	14 Apr 2008 21:52:20 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/default/X03.java	11 May 2008 18:02:22 -0000
@@ -15,18 +15,19 @@
 	 * 
 	 * 
 	 * 
-	 * 		The first parameter. For an optimum result, this should be an odd
-	 * 		number between 0 and 100. We may also want to know if the formatter
-	 * 		is able to handle more than two lines in a tag description.
+	 *            The first parameter. For an optimum result, this should be an
+	 *            odd number between 0 and 100. We may also want to know if the
+	 *            formatter is able to handle more than two lines in a tag
+	 *            description.
 	 * 
 	 * 
 	 * 
 	 * @param b
-	 * 		The second parameter. Same test than for first parameter: we also
-	 * 		want to know if the formatter is able to handle more than two lines
-	 * 		in a tag description. But this time this description is split on
-	 * 		several lines which may make the work a little bit more difficult to
-	 * 		do...
+	 *            The second parameter. Same test than for first parameter: we
+	 *            also want to know if the formatter is able to handle more than
+	 *            two lines in a tag description. But this time this description
+	 *            is split on several lines which may make the work a little bit
+	 *            more difficult to do...
 	 * 
 	 * 
 	 * 
Index: workspace/FormatterJavadoc/test/tags/others/out/clear_blank_lines/X02.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/others/out/clear_blank_lines/X02.java,v
retrieving revision 1.1
diff -u -r1.1 X02.java
--- workspace/FormatterJavadoc/test/tags/others/out/clear_blank_lines/X02.java	14 Apr 2008 21:52:20 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/others/out/clear_blank_lines/X02.java	11 May 2008 18:02:22 -0000
@@ -2,7 +2,7 @@
 
 /**
  * @author Zhao TODO To change the template for this generated type comment go
- * 	to Window - Preferences - Java - Code Style - Code Templates
+ *         to Window - Preferences - Java - Code Style - Code Templates
  */
 public class X02 {
 }
Index: workspace/FormatterJavadoc/test/tags/see/out/dont_indent_tags/X04.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/tags/see/out/dont_indent_tags/X04.java
diff -N workspace/FormatterJavadoc/test/tags/see/out/dont_indent_tags/X04.java
--- workspace/FormatterJavadoc/test/tags/see/out/dont_indent_tags/X04.java	25 Apr 2008 13:11:53 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-package test.tags.see;
-
-public class X04 {
-
-	/**
-	 * When a preference changes, update the in-memory cache of the preference.
-	 * 
-	 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#
-	 * propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
-	 */
-	void foo() {
-	}
-}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/X09b.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/wksp/eclipse/X09b.java
diff -N workspace/FormatterJavadoc/test/wksp/eclipse/X09b.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/X09b.java	23 Apr 2008 22:29:04 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-package test.wksp.eclipse;
-
-public class X09b {
-
-	/** Test_immutable_tag_____at_the_end_of_line (value: <code>enablement</code>) */
-	int foo82;
-}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/X33b.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/X33b.java,v
retrieving revision 1.1
diff -u -r1.1 X33b.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/X33b.java	8 May 2008 19:01:55 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/X33b.java	11 May 2008 18:02:22 -0000
@@ -1,15 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
 package test.wksp.eclipse;
 
 public class X33b {
 
+	void foo() {
+		if (true) {
+							/**** \r and \n are not valid in string literals ****/
+		}
+	}
 }
Index: workspace/FormatterJavadoc/test/wksp/eclipse/X14.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/eclipse/X14.java,v
retrieving revision 1.1
diff -u -r1.1 X14.java
--- workspace/FormatterJavadoc/test/wksp/eclipse/X14.java	25 Apr 2008 13:11:54 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/eclipse/X14.java	11 May 2008 18:02:22 -0000
@@ -9,12 +9,10 @@
 	 * @param href
 	 *            the URL (as a string) of the help resource
 	 *            <p>
-	 *            Valid href are as described in
-	 *            {@link  org.eclipse.help.IHelpResource#getHref IHelpResource.getHref}
+	 *            Valid href are as described in {@link org.eclipse.help.IHelpResource#getHref IHelpResource.getHref}
 	 *            </p>
 	 * @return an input stream containing the contents of the help resource, or
-	 *         <code>null</code> if the help resource could not be found and
-	 *         opened
+	 * <code>null</code> if the help resource could not be found and opened
 	 */
 	int foo(String href) {
 		return 0;
Index: workspace/FormatterJavadoc/test/tags/see/out/default/X04.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/see/out/default/X04.java,v
retrieving revision 1.1
diff -u -r1.1 X04.java
--- workspace/FormatterJavadoc/test/tags/see/out/default/X04.java	25 Apr 2008 13:11:54 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/see/out/default/X04.java	11 May 2008 18:02:22 -0000
@@ -5,8 +5,7 @@
 	/**
 	 * When a preference changes, update the in-memory cache of the preference.
 	 * 
-	 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#
-	 * 	propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
+	 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
 	 */
 	void foo() {
 	}
Index: workspace/FormatterJavadoc/test/tags/see/out/default/X03.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/see/out/default/X03.java,v
retrieving revision 1.2
diff -u -r1.2 X03.java
--- workspace/FormatterJavadoc/test/tags/see/out/default/X03.java	25 Apr 2008 13:11:54 -0000	1.2
+++ workspace/FormatterJavadoc/test/tags/see/out/default/X03.java	11 May 2008 18:02:22 -0000
@@ -9,9 +9,9 @@
 
 	/**
 	 * @see X03 Simple type reference (there's no desciption before this
-	 * 	section!)
+	 *      section!)
 	 * @see X03.Y03.Z03 Qualified field reference (extended description to have
-	 * 	it on two lines after the formatting...)
+	 *      it on two lines after the formatting...)
 	 * @see test.tags.see.X03.Y03 Fully qualified field reference
 	 */
 	public void test() {
Index: workspace/FormatterJavadoc/test/tags/see/out/default/X05.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/see/out/default/X05.java,v
retrieving revision 1.1
diff -u -r1.1 X05.java
--- workspace/FormatterJavadoc/test/tags/see/out/default/X05.java	25 Apr 2008 13:11:54 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/see/out/default/X05.java	11 May 2008 18:02:22 -0000
@@ -5,7 +5,7 @@
 	class Y05 {
 		/**
 		 * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String,
-		 * 	java.lang.String)
+		 *      java.lang.String)
 		 */
 		void foo() {
 		}
Index: workspace/FormatterJavadoc/test/tags/see/out/default/X06.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/see/out/default/X06.java,v
retrieving revision 1.1
diff -u -r1.1 X06.java
--- workspace/FormatterJavadoc/test/tags/see/out/default/X06.java	25 Apr 2008 13:11:54 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/see/out/default/X06.java	11 May 2008 18:02:22 -0000
@@ -4,7 +4,7 @@
 
 	/**
 	 * @see org.xml.sax.ext.DeclHandler#externalEntityDecl(java.lang.String,
-	 * 	java.lang.String, java.lang.String)
+	 *      java.lang.String, java.lang.String)
 	 */
 	void foo() {
 	}
Index: workspace/FormatterJavadoc/test/tags/see/out/default/X02.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/see/out/default/X02.java,v
retrieving revision 1.1
diff -u -r1.1 X02.java
--- workspace/FormatterJavadoc/test/tags/see/out/default/X02.java	14 Apr 2008 21:52:16 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/see/out/default/X02.java	11 May 2008 18:02:22 -0000
@@ -9,7 +9,7 @@
 	 * @see #foo Implicit field reference
 	 * @see Y02#bar Qualified field reference
 	 * @see Y02.Z02#local Fully qualified field reference (extended description
-	 * 	to have it on two lines after the formatting...)
+	 *      to have it on two lines after the formatting...)
 	 */
 	public void test() {
 	}
Index: workspace/FormatterJavadoc/test/html/pre/out/default/X.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/html/pre/out/default/X.java
diff -N workspace/FormatterJavadoc/test/html/pre/out/default/X.java
--- workspace/FormatterJavadoc/test/html/pre/out/default/X.java	14 Apr 2008 21:52:19 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-package test.html.pre;
-
-interface X {
-	/**
-	 * The following is some sample code which illustrates source formatting
-	 * within javadoc comments:
-	 * 
-	 * <pre>
-	 * public class Example {
-	 * 	final int a = 1;
-	 * 	final boolean b = true;
-	 * }
-	 * </pre>
-	 * 
-	 * Descriptions of parameters and return values are best appended at end of
-	 * the javadoc comment.
-	 */
-	int foo(int a, int b);
-}
Index: workspace/FormatterJavadoc/test/wksp/ganymede/out/default/X02.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/ganymede/out/default/X02.java,v
retrieving revision 1.1
diff -u -r1.1 X02.java
--- workspace/FormatterJavadoc/test/wksp/ganymede/out/default/X02.java	27 Apr 2008 10:01:24 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/ganymede/out/default/X02.java	11 May 2008 18:02:22 -0000
@@ -5,10 +5,11 @@
 	/**
 	 * <p>
 	 * Once a content extension has been bound to the INavigatorContentService,
-	 * clients may use {@link
-	 * INavigatorActivationService#activateExtensions(String[], boolean)} or
-	 * {@link INavigatorActivationService#deactivateExtensions(String[],
-	 * boolean)} to control the <i>activation</i> state of the extension. See
+	 * clients may use
+	 * {@link INavigatorActivationService#activateExtensions(String[], boolean) }
+	 * or
+	 * {@link INavigatorActivationService#deactivateExtensions(String[], boolean) }
+	 * to control the <i>activation</i> state of the extension. See
 	 * {@link INavigatorContentService} for more information on the difference
 	 * between <i>visible</i> and <i>active</i>.
 	 * </p>
Index: workspace/FormatterJavadoc/test/wksp/ganymede/out/default/X04.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/ganymede/out/default/X04.java,v
retrieving revision 1.1
diff -u -r1.1 X04.java
--- workspace/FormatterJavadoc/test/wksp/ganymede/out/default/X04.java	6 May 2008 08:47:47 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/ganymede/out/default/X04.java	11 May 2008 18:02:22 -0000
@@ -10,9 +10,9 @@
  * 
  * @see org.eclipse.gmf.mappings.GMFMapPackage#getFeatureValueSpec()
  * @model annotation=
- * 	"http://www.eclipse.org/gmf/2005/constraints/meta def='ValueSpec'"
- * 	annotation=
- * 	"http://www.eclipse.org/gmf/2005/constraints/meta def='type' ocl='feature'"
+ *        "http://www.eclipse.org/gmf/2005/constraints/meta def='ValueSpec'"
+ *        annotation=
+ *        "http://www.eclipse.org/gmf/2005/constraints/meta def='type' ocl='feature'"
  * @generated
  */
 public class X04 {
Index: workspace/FormatterJavadoc/test/wksp/ganymede/out/default/X03.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/ganymede/out/default/X03.java,v
retrieving revision 1.1
diff -u -r1.1 X03.java
--- workspace/FormatterJavadoc/test/wksp/ganymede/out/default/X03.java	6 May 2008 08:47:47 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/ganymede/out/default/X03.java	11 May 2008 18:02:22 -0000
@@ -17,8 +17,7 @@
  * </p>
  * 
  * @see org.eclipse.gmf.mappings.GMFMapPackage#getAuditedMetricTarget()
- * @model annotation=
- * 	"http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='\'ecore::EDoubleObject\''"
+ * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='\'ecore::EDoubleObject\''"
  * @generated
  */
 public class X03 {
Index: workspace/FormatterJavadoc/test/example/out/clear_blank_lines/X01.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/example/out/clear_blank_lines/X01.java,v
retrieving revision 1.1
diff -u -r1.1 X01.java
--- workspace/FormatterJavadoc/test/example/out/clear_blank_lines/X01.java	14 Apr 2008 21:52:20 -0000	1.1
+++ workspace/FormatterJavadoc/test/example/out/clear_blank_lines/X01.java	11 May 2008 18:02:21 -0000
@@ -33,10 +33,10 @@
 	 * the javadoc comment.
 	 * 
 	 * @param a
-	 * 		The first parameter. For an optimum result, this should be an odd
-	 * 		number between 0 and 100.
+	 *            The first parameter. For an optimum result, this should be an
+	 *            odd number between 0 and 100.
 	 * @param b
-	 * 		The second parameter.
+	 *            The second parameter.
 	 * @return The result of the foo operation, usually within 0 and 1000.
 	 */
 	int foo(int a, int b);
Index: workspace/FormatterJavadoc/test/tags/link/out/dont_indent_descr/X04.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/link/out/dont_indent_descr/X04.java,v
retrieving revision 1.1
diff -u -r1.1 X04.java
--- workspace/FormatterJavadoc/test/tags/link/out/dont_indent_descr/X04.java	27 Apr 2008 10:01:24 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/link/out/dont_indent_descr/X04.java	11 May 2008 18:02:22 -0000
@@ -6,7 +6,7 @@
 	 * Text
 	 * 
 	 * @param str
-	 * 	{@inheritDoc}
+	 *        {@inheritDoc}
 	 */
 	void foo(String str) {
 	}
Index: workspace/FormatterJavadoc/test/html/others/out/clear_blank_lines/X11.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/html/others/out/clear_blank_lines/X11.java
diff -N workspace/FormatterJavadoc/test/html/others/out/clear_blank_lines/X11.java
--- workspace/FormatterJavadoc/test/html/others/out/clear_blank_lines/X11.java	27 Apr 2008 10:01:24 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,49 +0,0 @@
-package test.html.others;
-
-/**
- * <p>
- * P1:
- * <ul>
- * <li>T1.L1<b>B1<i>I1</i></b><br>
- * T1.L11
- * </li>
- * <li><b>T1.L2</b>
- * 
- * <pre>
- * immutable
- * </pre>
- * <p>
- * T1.L2.P1
- * <ul>
- * <li>T1.L2.T2.L1 <i>I2</i>.
- * <li>T1.L2.T2.L2</i>.
- * <p>
- * T1.L2.T2.L2.P1 with string":".
- * </ul>
- * <p>
- * T1.L2.P2 end.
- * <p>
- * T1.L2.P3
- * </ul>
- * <li>X.L1
- * 
- * <pre>
- * [application-args] := *( &quot;:&quot; [value])
- *    [value] := [token] | [quoted-string]
- * </pre>
- * <p>
- * X.L2.P1
- * </li>
- * <p>
- * P2
- * <p>
- * P3
- * <ul>
- * <li>T2.L1
- * <li>T2.L2
- * <li>T2.L3
- * </ul>
- */
-public class X11 {
-
-}
Index: workspace/FormatterJavadoc/test/tags/param/out/clear_blank_lines/X02.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/clear_blank_lines/X02.java,v
retrieving revision 1.1
diff -u -r1.1 X02.java
--- workspace/FormatterJavadoc/test/tags/param/out/clear_blank_lines/X02.java	14 Apr 2008 21:52:20 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/clear_blank_lines/X02.java	11 May 2008 18:02:22 -0000
@@ -5,11 +5,12 @@
 	 * Description on several lines formatted in only one.
 	 * 
 	 * @param a
-	 * 		The first parameter. For an optimum result, this should be an odd
-	 * 		number between 0 and 100. We may also want to know if the formatter
-	 * 		is able to handle more than two lines in a tag description.
+	 *            The first parameter. For an optimum result, this should be an
+	 *            odd number between 0 and 100. We may also want to know if the
+	 *            formatter is able to handle more than two lines in a tag
+	 *            description.
 	 * @param b
-	 * 		The second parameter.
+	 *            The second parameter.
 	 */
 	int foo(int a, int b);
 }
Index: workspace/FormatterJavadoc/test/tags/param/out/clear_blank_lines/X03.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/param/out/clear_blank_lines/X03.java,v
retrieving revision 1.1
diff -u -r1.1 X03.java
--- workspace/FormatterJavadoc/test/tags/param/out/clear_blank_lines/X03.java	14 Apr 2008 21:52:20 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/param/out/clear_blank_lines/X03.java	11 May 2008 18:02:22 -0000
@@ -5,15 +5,16 @@
 	 * Description on several lines formatted in only one.
 	 * 
 	 * @param a
-	 * 		The first parameter. For an optimum result, this should be an odd
-	 * 		number between 0 and 100. We may also want to know if the formatter
-	 * 		is able to handle more than two lines in a tag description.
+	 *            The first parameter. For an optimum result, this should be an
+	 *            odd number between 0 and 100. We may also want to know if the
+	 *            formatter is able to handle more than two lines in a tag
+	 *            description.
 	 * @param b
-	 * 		The second parameter. Same test than for first parameter: we also
-	 * 		want to know if the formatter is able to handle more than two lines
-	 * 		in a tag description. But this time this description is split on
-	 * 		several lines which may make the work a little bit more difficult to
-	 * 		do...
+	 *            The second parameter. Same test than for first parameter: we
+	 *            also want to know if the formatter is able to handle more than
+	 *            two lines in a tag description. But this time this description
+	 *            is split on several lines which may make the work a little bit
+	 *            more difficult to do...
 	 */
 	int foo(int a, int b);
 }
Index: workspace/FormatterJavadoc/test/html/pre/X.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/html/pre/X.java
diff -N workspace/FormatterJavadoc/test/html/pre/X.java
--- workspace/FormatterJavadoc/test/html/pre/X.java	14 Apr 2008 21:52:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-package test.html.pre;
-
-interface X {
-	/**
-	* The following is some sample code which illustrates source formatting within javadoc comments:
-	* <pre>public class Example {final int a= 1;final boolean b= true;}</pre>
-	* Descriptions of parameters and return values are best appended at end of the javadoc comment.
-	*/int foo(int a, int b);
-}
Index: workspace/FormatterJavadoc/test/tags/others/out/default/X02.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/tags/others/out/default/X02.java,v
retrieving revision 1.1
diff -u -r1.1 X02.java
--- workspace/FormatterJavadoc/test/tags/others/out/default/X02.java	14 Apr 2008 21:52:20 -0000	1.1
+++ workspace/FormatterJavadoc/test/tags/others/out/default/X02.java	11 May 2008 18:02:22 -0000
@@ -3,8 +3,8 @@
 /**
  * @author Zhao
  * 
- * 	TODO To change the template for this generated type comment go to Window -
- * 	Preferences - Java - Code Style - Code Templates
+ *         TODO To change the template for this generated type comment go to
+ *         Window - Preferences - Java - Code Style - Code Templates
  */
 public class X02 {
 }
Index: workspace/FormatterJavadoc/test/wksp/ganymede/out/dont_indent_tags/X03.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/FormatterJavadoc/test/wksp/ganymede/out/dont_indent_tags/X03.java,v
retrieving revision 1.1
diff -u -r1.1 X03.java
--- workspace/FormatterJavadoc/test/wksp/ganymede/out/dont_indent_tags/X03.java	6 May 2008 08:47:47 -0000	1.1
+++ workspace/FormatterJavadoc/test/wksp/ganymede/out/dont_indent_tags/X03.java	11 May 2008 18:02:22 -0000
@@ -17,8 +17,7 @@
  * </p>
  * 
  * @see org.eclipse.gmf.mappings.GMFMapPackage#getAuditedMetricTarget()
- * @model annotation=
- * "http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='\'ecore::EDoubleObject\''"
+ * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='\'ecore::EDoubleObject\''"
  * @generated
  */
 public class X03 {
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X34.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X34.java
diff -N workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X34.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X34.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,32 @@
+package test.wksp.eclipse;
+
+public class X34 {
+
+	/**
+	 * Service property (named &quot;service.ranking&quot;) identifying a
+	 * service's ranking number (of type <tt>java.lang.Integer</tt>).
+	 * 
+	 * <p>
+	 * This property may be supplied in the <tt>properties
+	 * Dictionary</tt> object passed to the
+	 * <tt>BundleContext.registerService</tt> method.
+	 * 
+	 * <p>
+	 * The service ranking is used by the Framework to determine the
+	 * <i>default</i> service to be returned from a call to the
+	 * {@link BundleContext#getServiceReference}method: If more than one service
+	 * implements the specified class, the <tt>ServiceReference</tt> object with
+	 * the highest ranking is returned.
+	 * 
+	 * <p>
+	 * The default ranking is zero (0). A service with a ranking of
+	 * <tt>Integer.MAX_VALUE</tt> is very likely to be returned as the default
+	 * service, whereas a service with a ranking of <tt>Integer.MIN_VALUE</tt>
+	 * is very unlikely to be returned.
+	 * 
+	 * <p>
+	 * If the supplied property value is not of type <tt>java.lang.Integer</tt>,
+	 * it is deemed to have a ranking value of zero.
+	 */
+	public static final String SERVICE_RANKING = "service.ranking";
+}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X34.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X34.java
diff -N workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X34.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X34.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,28 @@
+package test.wksp.eclipse;
+
+public class X34 {
+
+	/**
+	 * Service property (named &quot;service.ranking&quot;) identifying a
+	 * service's ranking number (of type <tt>java.lang.Integer</tt>).
+	 * <p>
+	 * This property may be supplied in the <tt>properties
+	 * Dictionary</tt> object passed to the
+	 * <tt>BundleContext.registerService</tt> method.
+	 * <p>
+	 * The service ranking is used by the Framework to determine the
+	 * <i>default</i> service to be returned from a call to the
+	 * {@link BundleContext#getServiceReference}method: If more than one service
+	 * implements the specified class, the <tt>ServiceReference</tt> object with
+	 * the highest ranking is returned.
+	 * <p>
+	 * The default ranking is zero (0). A service with a ranking of
+	 * <tt>Integer.MAX_VALUE</tt> is very likely to be returned as the default
+	 * service, whereas a service with a ranking of <tt>Integer.MIN_VALUE</tt>
+	 * is very unlikely to be returned.
+	 * <p>
+	 * If the supplied property value is not of type <tt>java.lang.Integer</tt>,
+	 * it is deemed to have a ranking value of zero.
+	 */
+	public static final String SERVICE_RANKING = "service.ranking";
+}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28c.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28c.java
diff -N workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28c.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X28c.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,13 @@
+package test.wksp.eclipse;
+
+public class X28c {
+
+	/**
+	 * Shutdown the HCR mgr and the Java debug targets.
+	 * 
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundlContext)
+	 * @see org.eclipse.core.runtime.Plugin#shutdown()
+	 */
+	public void foo() {
+	}
+}
Index: workspace/FormatterJavadoc/test/html/pre/out/default/X01.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/html/pre/out/default/X01.java
diff -N workspace/FormatterJavadoc/test/html/pre/out/default/X01.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/FormatterJavadoc/test/html/pre/out/default/X01.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,19 @@
+package test.html.pre;
+
+interface X01 {
+	/**
+	 * The following is some sample code which illustrates source formatting
+	 * within javadoc comments:
+	 * 
+	 * <pre>
+	 * public class Example {
+	 * 	final int a = 1;
+	 * 	final boolean b = true;
+	 * }
+	 * </pre>
+	 * 
+	 * Descriptions of parameters and return values are best appended at end of
+	 * the javadoc comment.
+	 */
+	int foo(int a, int b);
+}
Index: workspace/FormatterJavadoc/test/html/pre/X01.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/html/pre/X01.java
diff -N workspace/FormatterJavadoc/test/html/pre/X01.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/FormatterJavadoc/test/html/pre/X01.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,9 @@
+package test.html.pre;
+
+interface X01 {
+	/**
+	* The following is some sample code which illustrates source formatting within javadoc comments:
+	* <pre>public class Example {final int a= 1;final boolean b= true;}</pre>
+	* Descriptions of parameters and return values are best appended at end of the javadoc comment.
+	*/int foo(int a, int b);
+}
Index: workspace/FormatterJavadoc/test/wksp/eclipse/X34.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/wksp/eclipse/X34.java
diff -N workspace/FormatterJavadoc/test/wksp/eclipse/X34.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/FormatterJavadoc/test/wksp/eclipse/X34.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,26 @@
+package test.wksp.eclipse;
+
+public class X34 {
+
+	/**
+	 * Service property (named &quot;service.ranking&quot;)
+	 * identifying a service's ranking number (of type <tt>java.lang.Integer</tt>).
+	 *
+     * <p>This property may be supplied in the <tt>properties
+     * Dictionary</tt> object passed to the <tt>BundleContext.registerService</tt> method.
+	 *
+	 * <p>The service ranking is used by the Framework to determine the
+	 * <i>default</i> service to be returned from a call to the
+	 * {@link BundleContext#getServiceReference}method:
+	 * If more than one service implements the specified class, the <tt>ServiceReference</tt> object with
+	 * the highest ranking is returned.
+	 *
+	 * <p>The default ranking is zero (0). A service with a ranking of <tt>Integer.MAX_VALUE</tt>
+	 * is very likely to be returned as the default service, whereas a service with a ranking of
+	 * <tt>Integer.MIN_VALUE</tt> is very unlikely to be returned.
+	 *
+	 * <p>If the supplied property value is not of type <tt>java.lang.Integer</tt>,
+	 * it is deemed to have a ranking value of zero.
+	 */
+     public static final String SERVICE_RANKING = "service.ranking";
+}
Index: workspace/FormatterJavadoc/test/html/others/out/default/X01.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/html/others/out/default/X01.java
diff -N workspace/FormatterJavadoc/test/html/others/out/default/X01.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/FormatterJavadoc/test/html/others/out/default/X01.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,12 @@
+package test.html.others;
+
+/**
+ * 4567890123456789012345678901234567890123456789012345678901234567890123456<br>
+ */
+public interface X01 {
+
+	/**
+	 * 890123456789012345678901234567890123456789012345678901234567890123456<br>
+	 */
+	int foo();
+}