FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2004-10-22 Michael Koch <konqueror@gmx.de>

Browse source 
* 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:
Michael Koch 2004-10-22 17:14:29 +00:00 • committed by Michael Koch
parent 471854f82a
commit 0460023ee2
39 changed files with 201 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libjava/java/text/ChoiceFormat.java
View file

@ -1,5 +1,6 @@
/* ChoiceFormat.java -- Format over a range of numbers
Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -440,7 +441,7 @@ public class ChoiceFormat extends NumberFormat
this.choiceLimits = (double[]) choiceLimits.clone();
}
private final void quoteString (StringBuffer dest, String text)
private void quoteString (StringBuffer dest, String text)
{
int max = text.length();
for (int i = 0; i < max; ++i)

6
libjava/java/text/CollationElementIterator.java
View file

@ -181,7 +181,7 @@ public final class CollationElementIterator
*
* @return The primary order value of the specified collation value. This is the high 16 bits.
*/
public static final int primaryOrder(int order)
public static int primaryOrder(int order)
{
// From the JDK 1.2 spec.
return order >>> 16;
@ -205,7 +205,7 @@ public final class CollationElementIterator
*
* @return The secondary order value of the specified collation value. This is the bits 8-15.
*/
public static final short secondaryOrder(int order)
public static short secondaryOrder(int order)
{
// From the JDK 1.2 spec.
return (short) ((order >>> 8) & 255);
@ -219,7 +219,7 @@ public final class CollationElementIterator
*
* @return The tertiary order value of the specified collation value. This is the low eight bits.
*/
public static final short tertiaryOrder(int order)
public static short tertiaryOrder(int order)
{
// From the JDK 1.2 spec.
return (short) (order & 255);

13
libjava/java/text/DateFormat.java
View file

@ -309,18 +309,15 @@ public abstract class DateFormat extends Format implements Cloneable
return calendar;
}
private static final DateFormat computeInstance (int style, Locale loc,
boolean use_date,
boolean use_time)
private static DateFormat computeInstance (int style, Locale loc,
boolean use_date, boolean use_time)
{
return computeInstance (style, style, loc, use_date, use_time);
}
private static final DateFormat computeInstance (int dateStyle,
int timeStyle,
Locale loc,
boolean use_date,
boolean use_time)
private static DateFormat computeInstance (int dateStyle, int timeStyle,
Locale loc, boolean use_date,
boolean use_time)
{
ResourceBundle res;
try

24
libjava/java/text/DecimalFormat.java
View file

@ -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

8
libjava/java/text/DecimalFormatSymbols.java
View file

@ -83,8 +83,8 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable
this (Locale.getDefault());
}
private final String safeGetString (ResourceBundle bundle,
String name, String def)
private String safeGetString(ResourceBundle bundle,
String name, String def)
{
if (bundle != null)
{
@ -99,8 +99,8 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable
return def;
}
private final char safeGetChar (ResourceBundle bundle,
String name, char def)
private char safeGetChar(ResourceBundle bundle,
String name, char def)
{
String r = null;
if (bundle != null)

13
libjava/java/text/MessageFormat.java
View file

@ -189,8 +189,7 @@ public class MessageFormat extends Format
// Helper that returns the text up to the next format opener. The
// text is put into BUFFER. Returns index of character after end of
// string. Throws IllegalArgumentException on error.
private static final int scanString (String pat, int index,
StringBuffer buffer)
private static int scanString(String pat, int index, StringBuffer buffer)
{
int max = pat.length();
buffer.setLength(0);
@ -220,9 +219,8 @@ public class MessageFormat extends Format
// This helper retrieves a single part of a format element. Returns
// the index of the terminating character.
private static final int scanFormatElement (String pat, int index,
StringBuffer buffer,
char term)
private static int scanFormatElement(String pat, int index,
StringBuffer buffer, char term)
{
int max = pat.length();
buffer.setLength(0);
@ -266,9 +264,8 @@ public class MessageFormat extends Format
// This is used to parse a format element and whatever non-format
// text might trail it.
private static final int scanFormat (String pat, int index,
StringBuffer buffer, Vector elts,
Locale locale)
private static int scanFormat(String pat, int index, StringBuffer buffer,
Vector elts, Locale locale)
{
MessageFormatElement mfe = new MessageFormatElement ();
elts.addElement(mfe);

5
libjava/java/text/NumberFormat.java
View file

@ -302,9 +302,8 @@ public abstract class NumberFormat extends Format implements Cloneable
return list;
}
private static final NumberFormat computeInstance (Locale loc,
String resource,
String def)
private static NumberFormat computeInstance(Locale loc, String resource,
String def)
{
ResourceBundle res;
try

6
libjava/java/text/RuleBasedCollator.java
View file

@ -147,7 +147,7 @@ public class RuleBasedCollator extends Collator
* This class describes what rank has a character (or a sequence of characters)
* in the lexicographic order. Each element in a rule has a collation element.
*/
final static class CollationElement
static final class CollationElement
{
String key;
int primary;
@ -169,7 +169,7 @@ public class RuleBasedCollator extends Collator
this.expansion = expansion;
}
final int getValue()
int getValue()
{
return (primary << 16) + (secondary << 8) + tertiary;
}
@ -183,7 +183,7 @@ public class RuleBasedCollator extends Collator
* {@link #mergeRules(int,java.lang.String,java.util.ArrayList,java.util.ArrayList)})
* as a temporary state while merging two sets of instructions.
*/
final static class CollationSorter
static final class CollationSorter
{
static final int GREATERP = 0;
static final int GREATERS = 1;

7
libjava/java/text/SimpleDateFormat.java
View file

@ -1,6 +1,7 @@
/* SimpleDateFormat.java -- A class for parsing/formating simple
date constructs
Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -419,7 +420,7 @@ public class SimpleDateFormat extends DateFormat
* appending to the specified StringBuffer. The input StringBuffer
* is returned as output for convenience.
*/
final private void formatWithAttribute(Date date, FormatBuffer buffer, FieldPosition pos)
private void formatWithAttribute(Date date, FormatBuffer buffer, FieldPosition pos)
{
String temp;
AttributedCharacterIterator.Attribute attribute;
@ -584,7 +585,7 @@ public class SimpleDateFormat extends DateFormat
buffer.append(valStr);
}
private final boolean expect (String source, ParsePosition pos, char ch)
private boolean expect(String source, ParsePosition pos, char ch)
{
int x = pos.getIndex();
boolean r = x < source.length() && source.charAt(x) == ch;