[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small cleanups
Kaffe CVS
cvs-commits at kaffe.org
Sun Oct 24 10:24:09 PDT 2004
PatchSet 5354
Date: 2004/10/24 17:20:07
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: small cleanups
2004-10-24 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/java/lang/StackTraceElement.java,
libraries/javalib/java/lang/StringBuffer.java,
libraries/javalib/java/lang/Throwable.java,
libraries/javalib/java/nio/Buffer.java,
libraries/javalib/java/nio/ByteBuffer.java,
libraries/javalib/java/nio/CharBuffer.java,
libraries/javalib/java/nio/DoubleBuffer.java,
libraries/javalib/java/nio/FloatBuffer.java,
libraries/javalib/java/nio/IntBuffer.java,
libraries/javalib/java/nio/LongBuffer.java,
libraries/javalib/java/nio/ShortBuffer.java,
libraries/javalib/java/nio/charset/Charset.java,
libraries/javalib/java/text/ChoiceFormat.java,
libraries/javalib/java/text/CollationElementIterator.java,
libraries/javalib/java/text/DateFormat.java,
libraries/javalib/java/text/DecimalFormat.java,
libraries/javalib/java/text/DecimalFormatSymbols.java,
libraries/javalib/java/text/MessageFormat.java,
libraries/javalib/java/text/NumberFormat.java,
libraries/javalib/java/text/RuleBasedCollator.java,
libraries/javalib/java/text/SimpleDateFormat.java,
libraries/javalib/java/util/BitSet.java,
libraries/javalib/java/util/Calendar.java,
libraries/javalib/java/util/IdentityHashMap.java,
libraries/javalib/java/util/Locale.java,
libraries/javalib/java/util/ResourceBundle.java,
libraries/javalib/java/util/TreeMap.java,
libraries/javalib/java/util/prefs/AbstractPreferences.java,
libraries/javalib/java/util/prefs/Preferences.java,
libraries/javalib/javax/security/auth/Subject.java:
Resynced with GNU Classpath.
2004-10-22 Michael Koch <konqueror at 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:
Removed redundant and reordered modifiers.
Members:
ChangeLog:1.2906->1.2907
libraries/javalib/java/lang/StackTraceElement.java:1.2->1.3
libraries/javalib/java/lang/StringBuffer.java:1.26->1.27
libraries/javalib/java/lang/Throwable.java:1.14->1.15
libraries/javalib/java/nio/Buffer.java:1.9->1.10
libraries/javalib/java/nio/ByteBuffer.java:1.13->1.14
libraries/javalib/java/nio/CharBuffer.java:1.13->1.14
libraries/javalib/java/nio/DoubleBuffer.java:1.11->1.12
libraries/javalib/java/nio/FloatBuffer.java:1.11->1.12
libraries/javalib/java/nio/IntBuffer.java:1.11->1.12
libraries/javalib/java/nio/LongBuffer.java:1.11->1.12
libraries/javalib/java/nio/ShortBuffer.java:1.11->1.12
libraries/javalib/java/nio/charset/Charset.java:1.5->1.6
libraries/javalib/java/text/ChoiceFormat.java:1.13->1.14
libraries/javalib/java/text/CollationElementIterator.java:1.19->1.20
libraries/javalib/java/text/DateFormat.java:1.23->1.24
libraries/javalib/java/text/DecimalFormat.java:1.29->1.30
libraries/javalib/java/text/DecimalFormatSymbols.java:1.16->1.17
libraries/javalib/java/text/MessageFormat.java:1.30->1.31
libraries/javalib/java/text/NumberFormat.java:1.24->1.25
libraries/javalib/java/text/RuleBasedCollator.java:1.24->1.25
libraries/javalib/java/text/SimpleDateFormat.java:1.34->1.35
libraries/javalib/java/util/BitSet.java:1.14->1.15
libraries/javalib/java/util/Calendar.java:1.26->1.27
libraries/javalib/java/util/IdentityHashMap.java:1.2->1.3
libraries/javalib/java/util/Locale.java:1.16->1.17
libraries/javalib/java/util/ResourceBundle.java:1.20->1.21
libraries/javalib/java/util/TreeMap.java:1.19->1.20
libraries/javalib/java/util/prefs/AbstractPreferences.java:1.6->1.7
libraries/javalib/java/util/prefs/Preferences.java:1.5->1.6
libraries/javalib/javax/security/auth/Subject.java:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2906 kaffe/ChangeLog:1.2907
--- kaffe/ChangeLog:1.2906 Sun Oct 24 13:39:05 2004
+++ kaffe/ChangeLog Sun Oct 24 17:20:07 2004
@@ -1,5 +1,81 @@
2004-10-24 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/java/lang/StackTraceElement.java,
+ libraries/javalib/java/lang/StringBuffer.java,
+ libraries/javalib/java/lang/Throwable.java,
+ libraries/javalib/java/nio/Buffer.java,
+ libraries/javalib/java/nio/ByteBuffer.java,
+ libraries/javalib/java/nio/CharBuffer.java,
+ libraries/javalib/java/nio/DoubleBuffer.java,
+ libraries/javalib/java/nio/FloatBuffer.java,
+ libraries/javalib/java/nio/IntBuffer.java,
+ libraries/javalib/java/nio/LongBuffer.java,
+ libraries/javalib/java/nio/ShortBuffer.java,
+ libraries/javalib/java/nio/charset/Charset.java,
+ libraries/javalib/java/text/ChoiceFormat.java,
+ libraries/javalib/java/text/CollationElementIterator.java,
+ libraries/javalib/java/text/DateFormat.java,
+ libraries/javalib/java/text/DecimalFormat.java,
+ libraries/javalib/java/text/DecimalFormatSymbols.java,
+ libraries/javalib/java/text/MessageFormat.java,
+ libraries/javalib/java/text/NumberFormat.java,
+ libraries/javalib/java/text/RuleBasedCollator.java,
+ libraries/javalib/java/text/SimpleDateFormat.java,
+ libraries/javalib/java/util/BitSet.java,
+ libraries/javalib/java/util/Calendar.java,
+ libraries/javalib/java/util/IdentityHashMap.java,
+ libraries/javalib/java/util/Locale.java,
+ libraries/javalib/java/util/ResourceBundle.java,
+ libraries/javalib/java/util/TreeMap.java,
+ libraries/javalib/java/util/prefs/AbstractPreferences.java,
+ libraries/javalib/java/util/prefs/Preferences.java,
+ libraries/javalib/javax/security/auth/Subject.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-22 Michael Koch <konqueror at 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:
+ Removed redundant and reordered modifiers.
+
+2004-10-24 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/javax/swing/AbstractAction.java,
libraries/javalib/javax/swing/AbstractCellEditor.java,
libraries/javalib/javax/swing/AbstractListModel.java,
Index: kaffe/libraries/javalib/java/lang/StackTraceElement.java
diff -u kaffe/libraries/javalib/java/lang/StackTraceElement.java:1.2 kaffe/libraries/javalib/java/lang/StackTraceElement.java:1.3
--- kaffe/libraries/javalib/java/lang/StackTraceElement.java:1.2 Tue Sep 21 12:22:11 2004
+++ kaffe/libraries/javalib/java/lang/StackTraceElement.java Sun Oct 24 17:20:09 2004
@@ -1,5 +1,5 @@
/* StackTraceElement.java -- One function call or call stack element
- Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -241,7 +241,7 @@
* @param o2 the second object
* @return o1 == null ? o2 == null : o1.equals(o2)
*/
- private static final boolean equals(Object o1, Object o2)
+ private static boolean equals(Object o1, Object o2)
{
return o1 == null ? o2 == null : o1.equals(o2);
}
@@ -252,7 +252,7 @@
* @param o the object to hash
* @return o1 == null ? 0 : o1.hashCode()
*/
- private static final int hashCode(Object o)
+ private static int hashCode(Object o)
{
return o == null ? 0 : o.hashCode();
}
Index: kaffe/libraries/javalib/java/lang/StringBuffer.java
diff -u kaffe/libraries/javalib/java/lang/StringBuffer.java:1.26 kaffe/libraries/javalib/java/lang/StringBuffer.java:1.27
--- kaffe/libraries/javalib/java/lang/StringBuffer.java:1.26 Tue May 18 01:10:27 2004
+++ kaffe/libraries/javalib/java/lang/StringBuffer.java Sun Oct 24 17:20:09 2004
@@ -109,7 +109,7 @@
/**
* The default capacity of a buffer.
*/
- private final static int DEFAULT_CAPACITY = 16;
+ private static final int DEFAULT_CAPACITY = 16;
/**
* Create a new StringBuffer with default capacity 16.
Index: kaffe/libraries/javalib/java/lang/Throwable.java
diff -u kaffe/libraries/javalib/java/lang/Throwable.java:1.14 kaffe/libraries/javalib/java/lang/Throwable.java:1.15
--- kaffe/libraries/javalib/java/lang/Throwable.java:1.14 Wed Sep 29 01:22:27 2004
+++ kaffe/libraries/javalib/java/lang/Throwable.java Sun Oct 24 17:20:09 2004
@@ -401,8 +401,7 @@
*/
private static class StaticData
{
-
- final static String nl;
+ static final String nl;
static
{
Index: kaffe/libraries/javalib/java/nio/Buffer.java
diff -u kaffe/libraries/javalib/java/nio/Buffer.java:1.9 kaffe/libraries/javalib/java/nio/Buffer.java:1.10
--- kaffe/libraries/javalib/java/nio/Buffer.java:1.9 Tue Jun 15 17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/Buffer.java Sun Oct 24 17:20:09 2004
@@ -1,5 +1,5 @@
/* Buffer.java --
- Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -345,7 +345,7 @@
* @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold
*/
- final static void checkArraySize(int arraylength, int offset, int length)
+ static final void checkArraySize(int arraylength, int offset, int length)
{
if ((offset < 0) ||
(length < 0) ||
Index: kaffe/libraries/javalib/java/nio/ByteBuffer.java
diff -u kaffe/libraries/javalib/java/nio/ByteBuffer.java:1.13 kaffe/libraries/javalib/java/nio/ByteBuffer.java:1.14
--- kaffe/libraries/javalib/java/nio/ByteBuffer.java:1.13 Fri Sep 17 19:28:10 2004
+++ kaffe/libraries/javalib/java/nio/ByteBuffer.java Sun Oct 24 17:20:09 2004
@@ -77,7 +77,7 @@
* @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold
*/
- final public static ByteBuffer wrap (byte[] array, int offset, int length)
+ public static final ByteBuffer wrap (byte[] array, int offset, int length)
{
// FIXME: In GCJ and other implementations where arrays may not
// move we might consider, at least when offset==0:
@@ -94,7 +94,7 @@
* Wraps a <code>byte</code> array into a <code>ByteBuffer</code>
* object.
*/
- final public static ByteBuffer wrap (byte[] array)
+ public static final ByteBuffer wrap (byte[] array)
{
return wrap (array, 0, array.length);
}
Index: kaffe/libraries/javalib/java/nio/CharBuffer.java
diff -u kaffe/libraries/javalib/java/nio/CharBuffer.java:1.13 kaffe/libraries/javalib/java/nio/CharBuffer.java:1.14
--- kaffe/libraries/javalib/java/nio/CharBuffer.java:1.13 Fri Sep 17 19:28:10 2004
+++ kaffe/libraries/javalib/java/nio/CharBuffer.java Sun Oct 24 17:20:09 2004
@@ -74,7 +74,7 @@
* @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold
*/
- final public static CharBuffer wrap(char[] array, int offset, int length)
+ public static final CharBuffer wrap(char[] array, int offset, int length)
{
return new CharBufferImpl(array, 0, array.length, offset + length, offset, -1, false);
}
@@ -86,7 +86,7 @@
*
* @return a new <code>CharBuffer</code> object
*/
- final public static CharBuffer wrap(CharSequence seq)
+ public static final CharBuffer wrap(CharSequence seq)
{
return wrap(seq, 0, seq.length());
}
@@ -103,7 +103,7 @@
* @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold
*/
- final public static CharBuffer wrap(CharSequence seq, int start, int end)
+ public static final CharBuffer wrap(CharSequence seq, int start, int end)
{
// FIXME: implement better handling of java.lang.String.
// Probably share data with String via reflection.
@@ -131,7 +131,7 @@
*
* @return a new <code>CharBuffer</code> object
*/
- final public static CharBuffer wrap(char[] array)
+ public static final CharBuffer wrap(char[] array)
{
return wrap(array, 0, array.length);
}
Index: kaffe/libraries/javalib/java/nio/DoubleBuffer.java
diff -u kaffe/libraries/javalib/java/nio/DoubleBuffer.java:1.11 kaffe/libraries/javalib/java/nio/DoubleBuffer.java:1.12
--- kaffe/libraries/javalib/java/nio/DoubleBuffer.java:1.11 Fri Sep 17 19:28:11 2004
+++ kaffe/libraries/javalib/java/nio/DoubleBuffer.java Sun Oct 24 17:20:09 2004
@@ -68,7 +68,7 @@
* @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold
*/
- final public static DoubleBuffer wrap (double[] array, int offset, int length)
+ public static final DoubleBuffer wrap (double[] array, int offset, int length)
{
return new DoubleBufferImpl (array, 0, array.length, offset + length, offset, -1, false);
}
@@ -77,7 +77,7 @@
* Wraps a <code>double</code> array into a <code>DoubleBuffer</code>
* object.
*/
- final public static DoubleBuffer wrap (double[] array)
+ public static final DoubleBuffer wrap (double[] array)
{
return wrap (array, 0, array.length);
}
Index: kaffe/libraries/javalib/java/nio/FloatBuffer.java
diff -u kaffe/libraries/javalib/java/nio/FloatBuffer.java:1.11 kaffe/libraries/javalib/java/nio/FloatBuffer.java:1.12
--- kaffe/libraries/javalib/java/nio/FloatBuffer.java:1.11 Fri Sep 17 19:28:11 2004
+++ kaffe/libraries/javalib/java/nio/FloatBuffer.java Sun Oct 24 17:20:09 2004
@@ -68,7 +68,7 @@
* @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold
*/
- final public static FloatBuffer wrap (float[] array, int offset, int length)
+ public static final FloatBuffer wrap (float[] array, int offset, int length)
{
return new FloatBufferImpl (array, 0, array.length, offset + length, offset, -1, false);
}
@@ -77,7 +77,7 @@
* Wraps a <code>float</code> array into a <code>FloatBuffer</code>
* object.
*/
- final public static FloatBuffer wrap (float[] array)
+ public static final FloatBuffer wrap (float[] array)
{
return wrap (array, 0, array.length);
}
Index: kaffe/libraries/javalib/java/nio/IntBuffer.java
diff -u kaffe/libraries/javalib/java/nio/IntBuffer.java:1.11 kaffe/libraries/javalib/java/nio/IntBuffer.java:1.12
--- kaffe/libraries/javalib/java/nio/IntBuffer.java:1.11 Fri Sep 17 19:28:11 2004
+++ kaffe/libraries/javalib/java/nio/IntBuffer.java Sun Oct 24 17:20:09 2004
@@ -68,7 +68,7 @@
* @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold
*/
- final public static IntBuffer wrap (int[] array, int offset, int length)
+ public static final IntBuffer wrap (int[] array, int offset, int length)
{
return new IntBufferImpl (array, 0, array.length, offset + length, offset, -1, false);
}
@@ -77,7 +77,7 @@
* Wraps a <code>int</code> array into a <code>IntBuffer</code>
* object.
*/
- final public static IntBuffer wrap (int[] array)
+ public static final IntBuffer wrap (int[] array)
{
return wrap (array, 0, array.length);
}
Index: kaffe/libraries/javalib/java/nio/LongBuffer.java
diff -u kaffe/libraries/javalib/java/nio/LongBuffer.java:1.11 kaffe/libraries/javalib/java/nio/LongBuffer.java:1.12
--- kaffe/libraries/javalib/java/nio/LongBuffer.java:1.11 Fri Sep 17 19:28:11 2004
+++ kaffe/libraries/javalib/java/nio/LongBuffer.java Sun Oct 24 17:20:10 2004
@@ -68,7 +68,7 @@
* @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold
*/
- final public static LongBuffer wrap (long[] array, int offset, int length)
+ public static final LongBuffer wrap (long[] array, int offset, int length)
{
return new LongBufferImpl (array, 0, array.length, offset + length, offset, -1, false);
}
@@ -77,7 +77,7 @@
* Wraps a <code>long</code> array into a <code>LongBuffer</code>
* object.
*/
- final public static LongBuffer wrap (long[] array)
+ public static final LongBuffer wrap (long[] array)
{
return wrap (array, 0, array.length);
}
Index: kaffe/libraries/javalib/java/nio/ShortBuffer.java
diff -u kaffe/libraries/javalib/java/nio/ShortBuffer.java:1.11 kaffe/libraries/javalib/java/nio/ShortBuffer.java:1.12
--- kaffe/libraries/javalib/java/nio/ShortBuffer.java:1.11 Fri Sep 17 19:28:11 2004
+++ kaffe/libraries/javalib/java/nio/ShortBuffer.java Sun Oct 24 17:20:10 2004
@@ -68,7 +68,7 @@
* @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold
*/
- final public static ShortBuffer wrap (short[] array, int offset, int length)
+ public static final ShortBuffer wrap (short[] array, int offset, int length)
{
return new ShortBufferImpl (array, 0, array.length, offset + length, offset, -1, false);
}
@@ -77,7 +77,7 @@
* Wraps a <code>short</code> array into a <code>ShortBuffer</code>
* object.
*/
- final public static ShortBuffer wrap (short[] array)
+ public static final ShortBuffer wrap (short[] array)
{
return wrap (array, 0, array.length);
}
Index: kaffe/libraries/javalib/java/nio/charset/Charset.java
diff -u kaffe/libraries/javalib/java/nio/charset/Charset.java:1.5 kaffe/libraries/javalib/java/nio/charset/Charset.java:1.6
--- kaffe/libraries/javalib/java/nio/charset/Charset.java:1.5 Fri Oct 15 13:41:53 2004
+++ kaffe/libraries/javalib/java/nio/charset/Charset.java Sun Oct 24 17:20:10 2004
@@ -1,5 +1,5 @@
/* Charset.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -156,7 +156,7 @@
// XXX: we need to support multiple providers, reading them from
// java.nio.charset.spi.CharsetProvider in the resource directory
// META-INF/services
- private static final CharsetProvider provider ()
+ private static CharsetProvider provider ()
{
return Provider.provider ();
}
Index: kaffe/libraries/javalib/java/text/ChoiceFormat.java
diff -u kaffe/libraries/javalib/java/text/ChoiceFormat.java:1.13 kaffe/libraries/javalib/java/text/ChoiceFormat.java:1.14
--- kaffe/libraries/javalib/java/text/ChoiceFormat.java:1.13 Fri Apr 23 17:35:12 2004
+++ kaffe/libraries/javalib/java/text/ChoiceFormat.java Sun Oct 24 17:20:10 2004
@@ -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 @@
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)
Index: kaffe/libraries/javalib/java/text/CollationElementIterator.java
diff -u kaffe/libraries/javalib/java/text/CollationElementIterator.java:1.19 kaffe/libraries/javalib/java/text/CollationElementIterator.java:1.20
--- kaffe/libraries/javalib/java/text/CollationElementIterator.java:1.19 Sat Jul 17 07:58:56 2004
+++ kaffe/libraries/javalib/java/text/CollationElementIterator.java Sun Oct 24 17:20:10 2004
@@ -181,7 +181,7 @@
*
* @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 @@
*
* @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 @@
*
* @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);
Index: kaffe/libraries/javalib/java/text/DateFormat.java
diff -u kaffe/libraries/javalib/java/text/DateFormat.java:1.23 kaffe/libraries/javalib/java/text/DateFormat.java:1.24
--- kaffe/libraries/javalib/java/text/DateFormat.java:1.23 Mon Jul 12 05:08:49 2004
+++ kaffe/libraries/javalib/java/text/DateFormat.java Sun Oct 24 17:20:10 2004
@@ -309,18 +309,15 @@
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
Index: kaffe/libraries/javalib/java/text/DecimalFormat.java
diff -u kaffe/libraries/javalib/java/text/DecimalFormat.java:1.29 kaffe/libraries/javalib/java/text/DecimalFormat.java:1.30
--- kaffe/libraries/javalib/java/text/DecimalFormat.java:1.29 Fri May 14 18:48:04 2004
+++ kaffe/libraries/javalib/java/text/DecimalFormat.java Sun Oct 24 17:20:10 2004
@@ -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 @@
{
// 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 @@
}
// 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 @@
// 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 @@
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 @@
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 @@
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 @@
}
}
- 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
Index: kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java
diff -u kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java:1.16 kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java:1.17
--- kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java:1.16 Wed Jun 16 20:28:32 2004
+++ kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java Sun Oct 24 17:20:10 2004
@@ -83,8 +83,8 @@
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 @@
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)
Index: kaffe/libraries/javalib/java/text/MessageFormat.java
diff -u kaffe/libraries/javalib/java/text/MessageFormat.java:1.30 kaffe/libraries/javalib/java/text/MessageFormat.java:1.31
--- kaffe/libraries/javalib/java/text/MessageFormat.java:1.30 Mon Oct 4 10:13:46 2004
+++ kaffe/libraries/javalib/java/text/MessageFormat.java Sun Oct 24 17:20:10 2004
@@ -189,8 +189,7 @@
// 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 @@
// 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 @@
// 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);
Index: kaffe/libraries/javalib/java/text/NumberFormat.java
diff -u kaffe/libraries/javalib/java/text/NumberFormat.java:1.24 kaffe/libraries/javalib/java/text/NumberFormat.java:1.25
--- kaffe/libraries/javalib/java/text/NumberFormat.java:1.24 Wed Jun 16 20:28:32 2004
+++ kaffe/libraries/javalib/java/text/NumberFormat.java Sun Oct 24 17:20:10 2004
@@ -302,9 +302,8 @@
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
Index: kaffe/libraries/javalib/java/text/RuleBasedCollator.java
diff -u kaffe/libraries/javalib/java/text/RuleBasedCollator.java:1.24 kaffe/libraries/javalib/java/text/RuleBasedCollator.java:1.25
--- kaffe/libraries/javalib/java/text/RuleBasedCollator.java:1.24 Mon Oct 18 21:39:42 2004
+++ kaffe/libraries/javalib/java/text/RuleBasedCollator.java Sun Oct 24 17:20:10 2004
@@ -147,7 +147,7 @@
* 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 @@
this.expansion = expansion;
}
- final int getValue()
+ int getValue()
{
return (primary << 16) + (secondary << 8) + tertiary;
}
@@ -183,7 +183,7 @@
* {@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;
Index: kaffe/libraries/javalib/java/text/SimpleDateFormat.java
diff -u kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.34 kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.35
--- kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.34 Fri May 14 18:48:04 2004
+++ kaffe/libraries/javalib/java/text/SimpleDateFormat.java Sun Oct 24 17:20:11 2004
@@ -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 @@
* 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 @@
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;
Index: kaffe/libraries/javalib/java/util/BitSet.java
diff -u kaffe/libraries/javalib/java/util/BitSet.java:1.14 kaffe/libraries/javalib/java/util/BitSet.java:1.15
--- kaffe/libraries/javalib/java/util/BitSet.java:1.14 Wed Aug 18 13:44:26 2004
+++ kaffe/libraries/javalib/java/util/BitSet.java Sun Oct 24 17:20:11 2004
@@ -1,5 +1,5 @@
/* BitSet.java -- A vector of bits.
- Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -732,7 +732,7 @@
*
* @param lastElt the size needed for the bits array
*/
- private final void ensure(int lastElt)
+ private void ensure(int lastElt)
{
if (lastElt >= bits.length)
{
Index: kaffe/libraries/javalib/java/util/Calendar.java
diff -u kaffe/libraries/javalib/java/util/Calendar.java:1.26 kaffe/libraries/javalib/java/util/Calendar.java:1.27
--- kaffe/libraries/javalib/java/util/Calendar.java:1.26 Mon Oct 18 13:04:32 2004
+++ kaffe/libraries/javalib/java/util/Calendar.java Sun Oct 24 17:20:11 2004
@@ -1,4 +1,4 @@
-/* java.util.Calendar
+/* Calendar.java --
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -1057,7 +1057,7 @@
}
}
- private final static String[] fieldNames = {
+ private static final String[] fieldNames = {
",ERA=", ",YEAR=", ",MONTH=",
",WEEK_OF_YEAR=", ",WEEK_OF_MONTH=",
",DAY_OF_MONTH=", ",DAY_OF_YEAR=", ",DAY_OF_WEEK=",
Index: kaffe/libraries/javalib/java/util/IdentityHashMap.java
diff -u kaffe/libraries/javalib/java/util/IdentityHashMap.java:1.2 kaffe/libraries/javalib/java/util/IdentityHashMap.java:1.3
--- kaffe/libraries/javalib/java/util/IdentityHashMap.java:1.2 Mon Dec 29 11:15:17 2003
+++ kaffe/libraries/javalib/java/util/IdentityHashMap.java Sun Oct 24 17:20:11 2004
@@ -1,6 +1,6 @@
/* IdentityHashMap.java -- a class providing a hashtable data structure,
mapping Object --> Object, which uses object identity for hashing.
- Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -679,7 +679,7 @@
* @author Tom Tromey <tromey at redhat.com>
* @author Eric Blake <ebb9 at email.byu.edu>
*/
- private final class IdentityIterator implements Iterator
+ private class IdentityIterator implements Iterator
{
/**
* The type of this Iterator: {@link #KEYS}, {@link #VALUES},
@@ -878,7 +878,7 @@
* @throws ConcurrentModificationException if the entry was invalidated
* by modifying the Map or calling Iterator.remove()
*/
- public final String toString()
+ public String toString()
{
if (knownMod != modCount || table[loc] == tombstone)
throw new ConcurrentModificationException();
Index: kaffe/libraries/javalib/java/util/Locale.java
diff -u kaffe/libraries/javalib/java/util/Locale.java:1.16 kaffe/libraries/javalib/java/util/Locale.java:1.17
--- kaffe/libraries/javalib/java/util/Locale.java:1.16 Mon Jul 12 05:21:55 2004
+++ kaffe/libraries/javalib/java/util/Locale.java Sun Oct 24 17:20:11 2004
@@ -416,7 +416,7 @@
* @return the string representation of this Locale
* @see #getDisplayName()
*/
- public final String toString()
+ public String toString()
{
if (language.length() == 0 && country.length() == 0)
return "";
@@ -522,7 +522,7 @@
* @return the language name of this locale localized to the default locale,
* with the ISO code as backup
*/
- public final String getDisplayLanguage()
+ public String getDisplayLanguage()
{
return getDisplayLanguage(defaultLocale);
}
@@ -560,7 +560,7 @@
* @return the country name of this locale localized to the given locale,
* with the ISO code as backup
*/
- public final String getDisplayCountry()
+ public String getDisplayCountry()
{
return getDisplayCountry(defaultLocale);
}
@@ -598,7 +598,7 @@
* @return the variant code of this locale localized to the given locale,
* with the ISO code as backup
*/
- public final String getDisplayVariant()
+ public String getDisplayVariant()
{
return getDisplayVariant(defaultLocale);
}
@@ -637,7 +637,7 @@
*
* @return String version of this locale, suitable for display to the user
*/
- public final String getDisplayName()
+ public String getDisplayName()
{
return getDisplayName(defaultLocale);
}
Index: kaffe/libraries/javalib/java/util/ResourceBundle.java
diff -u kaffe/libraries/javalib/java/util/ResourceBundle.java:1.20 kaffe/libraries/javalib/java/util/ResourceBundle.java:1.21
--- kaffe/libraries/javalib/java/util/ResourceBundle.java:1.20 Sun Jul 11 13:33:26 2004
+++ kaffe/libraries/javalib/java/util/ResourceBundle.java Sun Oct 24 17:20:11 2004
@@ -1,5 +1,6 @@
/* ResourceBundle -- aids in loading resource bundles
- Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004
+ Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,10 +39,10 @@
package java.util;
+import java.io.IOException;
+import java.io.InputStream;
import java.lang.ref.Reference;
import java.lang.ref.SoftReference;
-import java.io.InputStream;
-import java.io.IOException;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -428,11 +429,9 @@
* @param bundle the backup (parent) bundle
* @return the resource bundle if it was loaded, otherwise the backup
*/
- private static final ResourceBundle tryBundle(String localizedName,
- Locale locale,
- ClassLoader classloader,
- ResourceBundle bundle,
- HashMap cache)
+ private static ResourceBundle tryBundle(String localizedName, Locale locale,
+ ClassLoader classloader,
+ ResourceBundle bundle, HashMap cache)
{
// First look into the cache.
if (cache.containsKey(localizedName))
@@ -522,11 +521,10 @@
* @param bundle the backup (parent) bundle
* @return the resource bundle if it was loaded, otherwise the backup
*/
- private static final ResourceBundle tryLocalBundle(String baseName,
- Locale locale,
- ClassLoader classloader,
- ResourceBundle bundle,
- HashMap cache)
+ private static ResourceBundle tryLocalBundle(String baseName, Locale locale,
+ ClassLoader classloader,
+ ResourceBundle bundle,
+ HashMap cache)
{
final String language = locale.getLanguage();
final String country = locale.getCountry();
Index: kaffe/libraries/javalib/java/util/TreeMap.java
diff -u kaffe/libraries/javalib/java/util/TreeMap.java:1.19 kaffe/libraries/javalib/java/util/TreeMap.java:1.20
--- kaffe/libraries/javalib/java/util/TreeMap.java:1.19 Mon Sep 20 17:06:16 2004
+++ kaffe/libraries/javalib/java/util/TreeMap.java Sun Oct 24 17:20:11 2004
@@ -1536,7 +1536,7 @@
* @param key the key to check
* @return true if the key is in range
*/
- final boolean keyInRange(Object key)
+ boolean keyInRange(Object key)
{
return ((minKey == nil || compare(key, minKey) >= 0)
&& (maxKey == nil || compare(key, maxKey) < 0));
Index: kaffe/libraries/javalib/java/util/prefs/AbstractPreferences.java
diff -u kaffe/libraries/javalib/java/util/prefs/AbstractPreferences.java:1.6 kaffe/libraries/javalib/java/util/prefs/AbstractPreferences.java:1.7
--- kaffe/libraries/javalib/java/util/prefs/AbstractPreferences.java:1.6 Sat May 1 17:18:38 2004
+++ kaffe/libraries/javalib/java/util/prefs/AbstractPreferences.java Sun Oct 24 17:20:11 2004
@@ -1,5 +1,5 @@
-/* AbstractPreferences - Partial implementation of a Preference node
- Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+/* AbstractPreferences -- Partial implementation of a Preference node
+ Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -1197,7 +1197,7 @@
* @exception BackingStoreException when the backing store cannot be
* reached
*/
- abstract protected String[] keysSpi() throws BackingStoreException;
+ protected abstract String[] keysSpi() throws BackingStoreException;
/**
* Returns the value associated with the key in this preferences node or
@@ -1207,7 +1207,7 @@
* key is valid, not null and that the node has not been removed.
* <code>key()</code> will catch any exceptions that this method throws.
*/
- abstract protected String getSpi(String key);
+ protected abstract String getSpi(String key);
/**
* Sets the value of the given preferences entry for this node.
@@ -1220,7 +1220,7 @@
* Called by <code>put()</code> with this node locked after checking that
* key and value are valid and non-null.
*/
- abstract protected void putSpi(String key, String value);
+ protected abstract void putSpi(String key, String value);
/**
*** Patch too long, truncated ***
More information about the kaffe
mailing list