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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71773 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fdcc1c9..d34670d 100644 (file)
--- 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 0cf2d8f..7c5d5b0 100644 (file)
--- 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)