From: Guilhem Lavaux <guilhem@kaffe.org>
Date: Thu, 25 Sep 2003 13:21:27 +0000 (+0000)
Subject: DecimalFormat.java (format): Don't immediatly round baseNumber to long.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eaaad728d4d280fdb7ef56455381d73db88d2927;p=gcc.git

DecimalFormat.java (format): Don't immediatly round baseNumber to long.

2003-09-25  Guilhem Lavaux  <guilhem@kaffe.org>

	* java/text/DecimalFormat.java (format): Don't immediatly round
	baseNumber to long.
	(setMinimumIntegerDigits): Call super.
	(setMinimumFractionDigits): Likewise.
	(setMaximumIntegerDigits): Likewise.
	(setMaximumFractionDigits): Likewise.

From-SVN: r71773
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fdcc1c90689..d34670d6cb0 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-25  Guilhem Lavaux  <guilhem@kaffe.org>
+
+	* java/text/DecimalFormat.java (format): Don't immediatly round
+	baseNumber to long.
+	(setMinimumIntegerDigits): Call super.
+	(setMinimumFractionDigits): Likewise.
+	(setMaximumIntegerDigits): Likewise.
+	(setMaximumFractionDigits): Likewise.
+
 2003-09-25  Michael Koch  <konqueror@gmx.de>
 
 	* gnu/java/nio/DatagramChannelImpl.java
diff --git a/libjava/java/text/DecimalFormat.java b/libjava/java/text/DecimalFormat.java
index 0cf2d8fff3b..7c5d5b0ba7b 100644
--- a/libjava/java/text/DecimalFormat.java
+++ b/libjava/java/text/DecimalFormat.java
@@ -456,7 +456,7 @@ public class DecimalFormat extends NumberFormat
 	    exponent = (long) Math.floor (Math.log(number) / Math.log(10));
 	    if (minimumIntegerDigits > 0)
 	      exponent -= minimumIntegerDigits - 1;
-	    baseNumber = (long) (number / Math.pow(10.0, exponent));
+	    baseNumber = (number / Math.pow(10.0, exponent));
 	  }
 	else
 	  baseNumber = number;
@@ -871,22 +871,22 @@ public class DecimalFormat extends NumberFormat
 
   public void setMaximumFractionDigits (int newValue)
   {
-    maximumFractionDigits = Math.min(newValue, 340);
+    super.setMaximumFractionDigits(Math.min(newValue, 340));
   }
 
   public void setMaximumIntegerDigits (int newValue)
   {
-    maximumIntegerDigits = Math.min(newValue, 309);
+    super.setMaximumIntegerDigits(Math.min(newValue, 309));
   }
 
   public void setMinimumFractionDigits (int newValue)
   {
-    minimumFractionDigits = Math.min(newValue, 340);
+    super.setMinimumFractionDigits(Math.min(newValue, 340));
   }
 
   public void setMinimumIntegerDigits (int newValue)
   {
-    minimumIntegerDigits = Math.min(newValue, 309);
+    super.setMinimumIntegerDigits(Math.min(newValue, 309));
   }
 
   public void setMultiplier (int newValue)