Index: JavaDocRegion.java
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/comment/JavaDocRegion.java,v
retrieving revision 1.2
diff -u -r1.2 JavaDocRegion.java
--- JavaDocRegion.java	28 Mar 2005 21:15:56 -0000	1.2
+++ JavaDocRegion.java	13 Jun 2005 17:22:28 -0000
@@ -197,10 +197,19 @@
 		ILineTracker tracker= new DefaultLineTracker();
 		String patch= indentation + MultiCommentLine.MULTI_COMMENT_CONTENT_PREFIX;
 
+		// remove trailing spaces
+		int i= snippet.length();
+		while (i > 0 && ' ' == snippet.charAt(i-1))
+			i--;
+		snippet= snippet.substring(0, i);
+		
 		buffer.setLength(0);
-		buffer.append(getDelimiter());
+		String lineDelimiter= getDelimiter();
+		if (lineDelimiter != null && snippet.indexOf(lineDelimiter) != 0)
+			buffer.append(lineDelimiter);
 		buffer.append(convertJava2Html(snippet));
-		buffer.append(getDelimiter());
+		if (lineDelimiter != null && snippet.lastIndexOf(lineDelimiter) != snippet.length() - lineDelimiter.length())
+			buffer.append(lineDelimiter);
 		tracker.set(buffer.toString());
 		
 		for (int line= tracker.getNumberOfLines() - 1; line > 0; line--)