2004-04-20 Jeroen Frijters <jeroen@frijters.net>

	* java/text/DecimalFormat.java (scanFix): Removed suffix check
	for percent and permill check.

2004-04-20  Guilhem Lavaux <guilhem@kaffe.org>

	* java/text/FieldPosition.java
	(FieldPosition) Constructor now behaves as it should according
	to the java documentation.

2004-04-20  Mark Wielaard  <mark@klomp.org>

	* java/util/Properties.java: Use the word umlaut, not &auml; in api
	documentation.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d931b32..47121da 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,19 @@
+2004-04-20  Jeroen Frijters  <jeroen@frijters.net>
+
+       * java/text/DecimalFormat.java (scanFix): Removed suffix check
+       for percent and permill check.
+
+2004-04-20  Guilhem Lavaux <guilhem@kaffe.org>
+
+       * java/text/FieldPosition.java
+       (FieldPosition) Constructor now behaves as it should according
+       to the java documentation.
+
+2004-04-20  Mark Wielaard  <mark@klomp.org>
+
+       * java/util/Properties.java: Use the word umlaut, not &auml; in api
+       documentation.
+
 2004-04-20  Michael Koch  <konqueror@gmx.de>
 
        * java/nio/Buffer.java,

diff --git a/libjava/java/text/DecimalFormat.java b/libjava/java/text/DecimalFormat.java
index 359ad55..2f6691a 100644 (file)
--- a/libjava/java/text/DecimalFormat.java
+++ b/libjava/java/text/DecimalFormat.java
@@ -90,7 +90,7 @@ public class DecimalFormat extends NumberFormat
            else
              buf.append(syms.getCurrencySymbol());
          }
-       else if (is_suffix && c == syms.getPercent())
+       else if (c == syms.getPercent())
          {
            if (multiplierSet)
              throw new IllegalArgumentException ("multiplier already set " +
@@ -99,7 +99,7 @@ public class DecimalFormat extends NumberFormat
            multiplier = 100;
            buf.append(c);
          }
-       else if (is_suffix && c == syms.getPerMill())
+       else if (c == syms.getPerMill())
          {
            if (multiplierSet)
              throw new IllegalArgumentException ("multiplier already set " +

diff --git a/libjava/java/text/FieldPosition.java b/libjava/java/text/FieldPosition.java
index 74f806a..47cf7a1 100644 (file)
--- a/libjava/java/text/FieldPosition.java
+++ b/libjava/java/text/FieldPosition.java
@@ -72,13 +72,13 @@ public class FieldPosition
   /**
    * This method initializes a new instance of <code>FieldPosition</code>
    * to have the specified field attribute. The attribute will be used as
-   * an id.
+   * an id. It is formally equivalent to calling FieldPosition(field, -1).
    *
    * @param field The field format attribute.
    */
   public FieldPosition (Format.Field field)
   {
-    this.field_attribute = field;
+    this(field, -1);
   }
 
   /**

diff --git a/libjava/java/util/Properties.java b/libjava/java/util/Properties.java
index 2f44289..8f0cbab 100644 (file)
--- a/libjava/java/util/Properties.java
+++ b/libjava/java/util/Properties.java
@@ -188,17 +188,14 @@ label   = Name:\\u0020</pre>
       {
         char c = 0;
         int pos = 0;
-        // If empty line or begins with a comment character, skip this line.
-        if (line.length() == 0
-           || line.charAt(0) == '#' || line.charAt(0) == '!')
-          continue;
-
+       // Leading whitespaces must be deleted first.
         while (pos < line.length()
                && Character.isWhitespace(c = line.charAt(pos)))
           pos++;
 
-        // If line is empty skip this line.
-        if (pos == line.length())
+        // If empty line or begins with a comment character, skip this line.
+        if (line.length() == 0
+           || line.charAt(0) == '#' || line.charAt(0) == '!')
           continue;
 
         // The characters up to the next Whitespace, ':', or '='