2006-05-07 Andrew John Hughes <gnu_andrew@member.fsf.org>

	PR classpath/27311:
	* gnu/java/text/StringFormatBuffer.java:
	(toString()): Implemented so we can see the contents.
	* java/text/DecimalFormat.java:
	(formatInternal(double,StringFormatBuffer,FieldPosition)):
	Don't calculate the exponent when the number is 0 or less.
	Also, use log10 instead of log now it's available.

2006-05-07  Sven de Marothy <sven@physto.se>

	Fixed PR27455
	* gnu/java/awt/peer/GLightweightPeer.java (mouseEntered): Remove.
	* java/awt/Component.java (processMouseEvent):
	Do lightweight cursor handling.
	* javax/swing/plaf/basic/BasicTableHeaderUI.java
	(endResizing,mouseMoved): Save and reset original cursor, not the
	default one.

6 files changed, 40 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 5cbcdd254..deed852b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2006-05-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR classpath/27311:
+	* gnu/java/text/StringFormatBuffer.java:
+	(toString()): Implemented so we can see the contents.
+	* java/text/DecimalFormat.java:
+	(formatInternal(double,StringFormatBuffer,FieldPosition)):
+	Don't calculate the exponent when the number is 0 or less.
+	Also, use log10 instead of log now it's available.
+
+2006-05-07  Sven de Marothy <sven@physto.se>
+
+	Fixed PR27455
+	* gnu/java/awt/peer/GLightweightPeer.java (mouseEntered): Remove.
+	* java/awt/Component.java (processMouseEvent): 
+	Do lightweight cursor handling.
+	* javax/swing/plaf/basic/BasicTableHeaderUI.java 
+	(endResizing,mouseMoved): Save and reset original cursor, not the 
+	default one.
+
 2006-05-07  Roman Kennke <kennke@aicas.com>
 
 	* gnu/java/awt/java2d/RasterGraphics.java: New file.
diff --git a/gnu/java/awt/peer/GLightweightPeer.java b/gnu/java/awt/peer/GLightweightPeer.java
index 4076ba531..88733b92f 100644
--- a/gnu/java/awt/peer/GLightweightPeer.java
+++ b/gnu/java/awt/peer/GLightweightPeer.java
@@ -82,7 +82,7 @@ import java.awt.peer.LightweightPeer;
  * Lightweight components are painted directly onto their parent
  * containers through an Image object provided by the toolkit.
  */
-public class GLightweightPeer extends MouseAdapter
+public class GLightweightPeer 
   implements LightweightPeer, ContainerPeer
 {
   private Component comp;
@@ -92,7 +92,6 @@ public class GLightweightPeer extends MouseAdapter
   public GLightweightPeer(Component comp)
   {
     this.comp = comp;
-    comp.addMouseListener(this);
   }
 
   // -------- java.awt.peer.ContainerPeer implementation:
@@ -363,10 +362,4 @@ public class GLightweightPeer extends MouseAdapter
   {
     
   }
-
-  /** MouseListener for cursor changes. */
-  public void mouseEntered(MouseEvent event)
-  {
-    setCursor(comp.getCursor());
-  }
 }
diff --git a/gnu/java/text/StringFormatBuffer.java b/gnu/java/text/StringFormatBuffer.java
index 5772186b4..19b621ce4 100644
--- a/gnu/java/text/StringFormatBuffer.java
+++ b/gnu/java/text/StringFormatBuffer.java
@@ -118,4 +118,10 @@ public class StringFormatBuffer implements FormatBuffer
   {
     return buffer;
   }
+
+  public String toString()
+  {
+    return buffer.toString();
+  }
+
 }
diff --git a/java/awt/Component.java b/java/awt/Component.java
index 15751b041..dbbec8ac1 100644
--- a/java/awt/Component.java
+++ b/java/awt/Component.java
@@ -3091,6 +3091,8 @@ public abstract class Component
           mouseListener.mouseClicked(e);
         break;
         case MouseEvent.MOUSE_ENTERED:
+ 	  if( isLightweight() )
+ 	    setCursor( getCursor() );
           mouseListener.mouseEntered(e);
         break;
         case MouseEvent.MOUSE_EXITED:
diff --git a/java/text/DecimalFormat.java b/java/text/DecimalFormat.java
index a9ec7767f..f64249b67 100644
--- a/java/text/DecimalFormat.java
+++ b/java/text/DecimalFormat.java
@@ -542,9 +542,9 @@ public class DecimalFormat extends NumberFormat
 	// Compute exponent.
 	long exponent = 0;
 	double baseNumber;
-	if (useExponentialNotation)
+	if (useExponentialNotation && number > 0)
 	  {
-	    exponent = (long) Math.floor (Math.log(number) / Math.log(10));
+	    exponent = (long) Math.floor (Math.log10(number));
 	    exponent = exponent - (exponent % exponentRound);
 	    if (minimumIntegerDigits > 0)
 	      exponent -= minimumIntegerDigits - 1;
@@ -654,7 +654,7 @@ public class DecimalFormat extends NumberFormat
 	    index = dest.length();
 	    dest.setDefaultAttribute(NumberFormat.Field.EXPONENT);
 	    String exponentString = Long.toString ((long) exponent);
-	    
+
 	    for (count = 0; count < minExponentDigits-exponentString.length();
 		 count++)
 	      dest.append((char) symbols.getZeroDigit());
diff --git a/javax/swing/plaf/basic/BasicTableHeaderUI.java b/javax/swing/plaf/basic/BasicTableHeaderUI.java
index fbef6e69f..cfbebda21 100644
--- a/javax/swing/plaf/basic/BasicTableHeaderUI.java
+++ b/javax/swing/plaf/basic/BasicTableHeaderUI.java
@@ -99,6 +99,11 @@ public class BasicTableHeaderUI extends TableHeaderUI
    * The header cell border.
    */
   private Border cellBorder;
+
+  /**
+   * Original mouse cursor prior to resizing.
+   */
+  private Cursor originalCursor;
   
   /**
    * If not null, one of the columns is currently being dragged.
@@ -245,6 +250,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
               if (onBoundary)
                 {
 
+		  originalCursor = header.getCursor();
                   if (p < x)
                     header.setCursor(Cursor.getPredefinedCursor
                                      (Cursor.W_RESIZE_CURSOR));
@@ -254,7 +260,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
                 }
               else
                 {
-                  header.setCursor(Cursor.getDefaultCursor());
+                  header.setCursor(originalCursor);
                   header.setResizingColumn(null);
                 }
 
@@ -345,7 +351,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
       showingResizeCursor = false;
       if (timer != null)
         timer.stop();
-      header.setCursor(Cursor.getDefaultCursor());
+      header.setCursor(originalCursor);
     }
 
     /**