2004-10-22 Michael Koch <konqueror@gmx.de>
* java/lang/Math.java * java/lang/StackTraceElement.java * java/nio/Buffer.java * java/nio/ByteBuffer.java * java/nio/CharBuffer.java * java/nio/DoubleBuffer.java * java/nio/FloatBuffer.java * java/nio/IntBuffer.java * java/nio/LongBuffer.java * java/nio/ShortBuffer.java * java/nio/charset/Charset.java * java/rmi/server/RMIClassLoader.java * java/rmi/server/RMISocketFactory.java * java/security/Policy.java * java/text/ChoiceFormat.java * java/text/CollationElementIterator.java * java/text/DateFormat.java * java/text/DecimalFormat.java * java/text/DecimalFormatSymbols.java * java/text/MessageFormat.java * java/text/NumberFormat.java * java/text/RuleBasedCollator.java * java/text/SimpleDateFormat.java * java/util/BitSet.java * java/util/Calendar.java * java/util/Collections.java * java/util/IdentityHashMap.java * java/util/Locale.java * java/util/TreeMap.java * java/util/logging/LogRecord.java * java/util/logging/XMLFormatter.java * java/util/prefs/AbstractPreferences.java * java/util/prefs/Preferences.java * javax/crypto/interfaces/DHPrivateKey.java * javax/crypto/interfaces/DHPublicKey.java * javax/crypto/interfaces/PBEKey.java * javax/net/ssl/HandshakeCompletedEvent.java * javax/security/auth/Subject.java From-SVN: r89454
This commit is contained in:
committed by
Michael Koch
parent
471854f82a
commit
0460023ee2
@@ -1,5 +1,5 @@
|
||||
/* DecimalFormat.java -- Formats and parses numbers
|
||||
Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
@@ -62,9 +62,9 @@ public class DecimalFormat extends NumberFormat
|
||||
{
|
||||
// This is a helper for applyPatternWithSymbols. It reads a prefix
|
||||
// or a suffix. It can cause some side-effects.
|
||||
private final int scanFix (String pattern, int index, FormatBuffer buf,
|
||||
String patChars, DecimalFormatSymbols syms,
|
||||
boolean is_suffix)
|
||||
private int scanFix (String pattern, int index, FormatBuffer buf,
|
||||
String patChars, DecimalFormatSymbols syms,
|
||||
boolean is_suffix)
|
||||
{
|
||||
int len = pattern.length();
|
||||
boolean quoteStarted = false;
|
||||
@@ -140,9 +140,8 @@ public class DecimalFormat extends NumberFormat
|
||||
}
|
||||
|
||||
// A helper which reads a number format.
|
||||
private final int scanFormat (String pattern, int index,
|
||||
String patChars, DecimalFormatSymbols syms,
|
||||
boolean is_positive)
|
||||
private int scanFormat (String pattern, int index, String patChars,
|
||||
DecimalFormatSymbols syms, boolean is_positive)
|
||||
{
|
||||
int max = pattern.length();
|
||||
|
||||
@@ -294,7 +293,7 @@ public class DecimalFormat extends NumberFormat
|
||||
|
||||
// This helper function creates a string consisting of all the
|
||||
// characters which can appear in a pattern and must be quoted.
|
||||
private final String patternChars (DecimalFormatSymbols syms)
|
||||
private String patternChars (DecimalFormatSymbols syms)
|
||||
{
|
||||
StringBuffer buf = new StringBuffer ();
|
||||
buf.append(syms.getDecimalSeparator());
|
||||
@@ -313,8 +312,7 @@ public class DecimalFormat extends NumberFormat
|
||||
return buf.toString();
|
||||
}
|
||||
|
||||
private final void applyPatternWithSymbols (String pattern,
|
||||
DecimalFormatSymbols syms)
|
||||
private void applyPatternWithSymbols(String pattern, DecimalFormatSymbols syms)
|
||||
{
|
||||
// Initialize to the state the parser expects.
|
||||
negativePrefix = "";
|
||||
@@ -425,7 +423,7 @@ public class DecimalFormat extends NumberFormat
|
||||
applyPattern (pattern);
|
||||
}
|
||||
|
||||
private final boolean equals (String s1, String s2)
|
||||
private boolean equals(String s1, String s2)
|
||||
{
|
||||
if (s1 == null || s2 == null)
|
||||
return s1 == s2;
|
||||
@@ -1149,7 +1147,7 @@ public class DecimalFormat extends NumberFormat
|
||||
positiveSuffix = newValue;
|
||||
}
|
||||
|
||||
private final void quoteFix (StringBuffer buf, String text, String patChars)
|
||||
private void quoteFix(StringBuffer buf, String text, String patChars)
|
||||
{
|
||||
int len = text.length();
|
||||
for (int index = 0; index < len; ++index)
|
||||
@@ -1166,7 +1164,7 @@ public class DecimalFormat extends NumberFormat
|
||||
}
|
||||
}
|
||||
|
||||
private final String computePattern (DecimalFormatSymbols syms)
|
||||
private String computePattern(DecimalFormatSymbols syms)
|
||||
{
|
||||
StringBuffer mainPattern = new StringBuffer ();
|
||||
// We have to at least emit a zero for the minimum number of
|
||||
|
||||
Reference in New Issue
Block a user