2006-08-12 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD --> generics-branch for release
	0.92 to 2006/08/12.

1 files changed, 1 insertions, 7 deletions

diff --git a/javax/swing/text/Utilities.java b/javax/swing/text/Utilities.java
index 36361f497..f75906a0f 100644
--- a/javax/swing/text/Utilities.java
+++ b/javax/swing/text/Utilities.java
@@ -43,7 +43,6 @@ import java.awt.Graphics;
 import java.awt.Point;
 import java.text.BreakIterator;
 
-import javax.swing.SwingConstants;
 import javax.swing.text.Position.Bias;
 
 /**
@@ -109,7 +108,7 @@ public class Utilities
     for (int offset = s.offset; offset < end; ++offset)
       {
         char c = buffer[offset];
-        if (c == '\t' || c == '\n')
+        if (c == '\t')
           {
             if (len > 0) {
               g.drawChars(buffer, pos, len, pixelX, pixelY + ascent);            
@@ -131,11 +130,6 @@ public class Utilities
 	    else
 	      pixelX += metrics.charWidth(' ');
 	    break;
-	  case '\n':
-	    // In case we have a newline, we must jump to the next line.
-	    pixelY += metrics.getHeight();
-	    pixelX = x;
-	    break;
 	  default:
             ++len;
 	    pixelWidth += metrics.charWidth(buffer[offset]);