OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[multiple changes]

Browse Source 
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.

From-SVN: r80910
This commit is contained in:
Michael Koch 2004-04-20 16:14:25 +00:00
parent 92e1fe6748
commit 391d8ef5e0
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libjava/ChangeLog
View File

@ -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> 2004-04-20 Michael Koch <konqueror@gmx.de>
* java/nio/Buffer.java, * java/nio/Buffer.java,

4
libjava/java/text/DecimalFormat.java
View File

@ -90,7 +90,7 @@ public class DecimalFormat extends NumberFormat
else else
buf.append(syms.getCurrencySymbol()); buf.append(syms.getCurrencySymbol());
} }
else if (is_suffix && c == syms.getPercent()) else if (c == syms.getPercent())
{ {
if (multiplierSet) if (multiplierSet)
throw new IllegalArgumentException ("multiplier already set " + throw new IllegalArgumentException ("multiplier already set " +
@ -99,7 +99,7 @@ public class DecimalFormat extends NumberFormat
multiplier = 100; multiplier = 100;
buf.append(c); buf.append(c);
} }
else if (is_suffix && c == syms.getPerMill()) else if (c == syms.getPerMill())
{ {
if (multiplierSet) if (multiplierSet)
throw new IllegalArgumentException ("multiplier already set " + throw new IllegalArgumentException ("multiplier already set " +

4
libjava/java/text/FieldPosition.java
View File

@ -72,13 +72,13 @@ public class FieldPosition
/** /**
* This method initializes a new instance of <code>FieldPosition</code> * This method initializes a new instance of <code>FieldPosition</code>
* to have the specified field attribute. The attribute will be used as * 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. * @param field The field format attribute.
*/ */
public FieldPosition (Format.Field field) public FieldPosition (Format.Field field)
{ {
this.field_attribute = field; this(field, -1);
} }
/** /**

11
libjava/java/util/Properties.java
View File

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