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

10 files changed, 68 insertions, 72 deletions

diff --git a/libjava/java/util/BitSet.java b/libjava/java/util/BitSet.java
index f81ba15..d152ba1 100644
--- a/libjava/java/util/BitSet.java
+++ b/libjava/java/util/BitSet.java
@@ -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 @@ public class BitSet implements Cloneable, Serializable
    *
    * @param lastElt the size needed for the bits array
    */
-  private final void ensure(int lastElt)
+  private void ensure(int lastElt)
   {
     if (lastElt >= bits.length)
       {
diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java
index 6e9eda9..1f0b27a 100644
--- a/libjava/java/util/Calendar.java
+++ b/libjava/java/util/Calendar.java
@@ -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 @@ public abstract class Calendar implements Serializable, Cloneable
       }
   }
 
-  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=",
diff --git a/libjava/java/util/Collections.java b/libjava/java/util/Collections.java
index d7b5e54..5ae4b40 100644
--- a/libjava/java/util/Collections.java
+++ b/libjava/java/util/Collections.java
@@ -1,5 +1,6 @@
 /* Collections.java -- Utility class with methods to operate on collections
-   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.
 
@@ -1053,7 +1054,7 @@ public class Collections
   /**
    * The object for {@link #reverseOrder()}.
    */
-  static private final ReverseComparator rcInstance = new ReverseComparator();
+  private static final ReverseComparator rcInstance = new ReverseComparator();
 
   /**
    * The implementation of {@link #reverseOrder()}. This class name
@@ -1067,7 +1068,7 @@ public class Collections
     /**
      * Compatible with JDK 1.4.
      */
-    static private final long serialVersionUID = 7207038068494060240L;
+    private static final long serialVersionUID = 7207038068494060240L;
 
     /**
      * A private constructor adds overhead.
diff --git a/libjava/java/util/IdentityHashMap.java b/libjava/java/util/IdentityHashMap.java
index f29edb6..5d15786 100644
--- a/libjava/java/util/IdentityHashMap.java
+++ b/libjava/java/util/IdentityHashMap.java
@@ -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 @@ public class IdentityHashMap extends AbstractMap
    * @author Tom Tromey <tromey@redhat.com>
    * @author Eric Blake <ebb9@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 @@ public class IdentityHashMap extends AbstractMap
      * @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();
diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java
index 4e88839..54fd097 100644
--- a/libjava/java/util/Locale.java
+++ b/libjava/java/util/Locale.java
@@ -416,7 +416,7 @@ public final class Locale implements Serializable, Cloneable
    * @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 @@ public final class Locale implements Serializable, Cloneable
    * @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 @@ public final class Locale implements Serializable, Cloneable
    * @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 @@ public final class Locale implements Serializable, Cloneable
    * @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 @@ public final class Locale implements Serializable, Cloneable
    *
    * @return String version of this locale, suitable for display to the user
    */
-  public final String getDisplayName()
+  public String getDisplayName()
   {
     return getDisplayName(defaultLocale);
   }
diff --git a/libjava/java/util/TreeMap.java b/libjava/java/util/TreeMap.java
index 5272bc1..4405368 100644
--- a/libjava/java/util/TreeMap.java
+++ b/libjava/java/util/TreeMap.java
@@ -1536,7 +1536,7 @@ public class TreeMap extends AbstractMap
      * @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));
diff --git a/libjava/java/util/logging/LogRecord.java b/libjava/java/util/logging/LogRecord.java
index 58ee353..f976033 100644
--- a/libjava/java/util/logging/LogRecord.java
+++ b/libjava/java/util/logging/LogRecord.java
@@ -1,6 +1,6 @@
 /* LogRecord.java --
    A class for the state associated with individual logging events
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -388,7 +388,7 @@ public class LogRecord
    * Allocates a sequence number for a new LogRecord.  This class
    * method is only called by the LogRecord constructor.
    */
-  private synchronized static long allocateSeqNum()
+  private static synchronized long allocateSeqNum()
   {
     lastSeqNum += 1;
     return lastSeqNum;
diff --git a/libjava/java/util/logging/XMLFormatter.java b/libjava/java/util/logging/XMLFormatter.java
index 86a1c0c..71fad3a 100644
--- a/libjava/java/util/logging/XMLFormatter.java
+++ b/libjava/java/util/logging/XMLFormatter.java
@@ -98,10 +98,8 @@ public class XMLFormatter
    * @param content the element content, or <code>null</code> to
    *        have no output whatsoever appended to <code>buf</code>.
    */
-  private static final void appendTag(StringBuffer buf,
-				      int indent,
-				      String tag,
-				      String content)
+  private static void appendTag(StringBuffer buf, int indent,
+                                String tag, String content)
   {
     int i;
 
@@ -175,10 +173,8 @@ public class XMLFormatter
    *
    * @param content the element content.
    */
-  private static final void appendTag(StringBuffer buf,
-				      int indent,
-				      String tag,
-				      long content)
+  private static void appendTag(StringBuffer buf, int indent,
+                                String tag, long content)
   {
     appendTag(buf, indent, tag, Long.toString(content));
   }
diff --git a/libjava/java/util/prefs/AbstractPreferences.java b/libjava/java/util/prefs/AbstractPreferences.java
index 876279c..69f4426 100644
--- a/libjava/java/util/prefs/AbstractPreferences.java
+++ b/libjava/java/util/prefs/AbstractPreferences.java
@@ -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 @@ public abstract class AbstractPreferences extends Preferences {
      * @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 @@ public abstract class AbstractPreferences extends Preferences {
      * 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 @@ public abstract class AbstractPreferences extends Preferences {
      * 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);
 
     /**
      * Removes the given key entry from this preferences node.
@@ -1233,7 +1233,7 @@ public abstract class AbstractPreferences extends Preferences {
      * Called by <code>remove()</code> with this node locked after checking
      * that the key is valid and non-null.
      */
-    abstract protected void removeSpi(String key);
+    protected abstract void removeSpi(String key);
 
     /**
      * Writes all entries of this preferences node that have not yet been
@@ -1245,7 +1245,7 @@ public abstract class AbstractPreferences extends Preferences {
      * <p>
      * Called (indirectly) by <code>flush()</code> with this node locked.
      */
-    abstract protected void flushSpi() throws BackingStoreException;
+    protected abstract void flushSpi() throws BackingStoreException;
 
     /**
      * Writes all entries of this preferences node that have not yet been
@@ -1257,7 +1257,7 @@ public abstract class AbstractPreferences extends Preferences {
      * <p>
      * Called (indirectly) by <code>sync()</code> with this node locked.
      */
-    abstract protected void syncSpi() throws BackingStoreException;
+    protected abstract void syncSpi() throws BackingStoreException;
 
     /**
      * Clears this node from this VM and removes it from the backing store.
@@ -1266,5 +1266,5 @@ public abstract class AbstractPreferences extends Preferences {
      * Called (indirectly) by <code>removeNode()</code> with this node locked
      * after all the sub nodes of this node have already been removed.
      */
-    abstract protected void removeNodeSpi() throws BackingStoreException;
+    protected abstract void removeNodeSpi() throws BackingStoreException;
 }
diff --git a/libjava/java/util/prefs/Preferences.java b/libjava/java/util/prefs/Preferences.java
index ce8aacf..c0f0231 100644
--- a/libjava/java/util/prefs/Preferences.java
+++ b/libjava/java/util/prefs/Preferences.java
@@ -1,5 +1,5 @@
-/* Preferences - Preference node containing key value entries and subnodes
-   Copyright (C) 2001 Free Software Foundation, Inc.
+/* Preferences -- Preference node containing key value entries and subnodes
+   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -307,20 +307,20 @@ public abstract class Preferences {
      * plus a '/' plus its own name. If the node is the root node and has no
      * parent then its name is "" and its absolute path name is "/".
      */
-    abstract public String absolutePath();
+    public abstract String absolutePath();
 
     /**
      * Returns true if this node comes from the user preferences tree, false
      * if it comes from the system preferences tree.
      */
-    abstract public boolean isUserNode();
+    public abstract boolean isUserNode();
 
     /**
      * Returns the name of this preferences node. The name of the node cannot
      * be null, can be mostly 80 characters and cannot contain any '/'
      * characters. The root node has as name "".
      */
-    abstract public String name();
+    public abstract String name();
 
     /**
      * Returns the String given by
@@ -328,7 +328,7 @@ public abstract class Preferences {
      * (isUserNode() ? "User":"System") + " Preference Node: " + absolutePath()
      * </code>
      */
-    abstract public String toString();
+    public abstract String toString();
 
     // abstract methods (navigation)
 
@@ -340,7 +340,7 @@ public abstract class Preferences {
      *            reached
      * @exception IllegalStateException when this node has been removed
      */
-    abstract public String[] childrenNames() throws BackingStoreException;
+    public abstract String[] childrenNames() throws BackingStoreException;
 
     /**
      * Returns a sub node of this preferences node if the given path is
@@ -353,7 +353,7 @@ public abstract class Preferences {
      * string "/" (indicating the root node) or any name on the path is more
      * then 80 characters long
      */
-    abstract public Preferences node(String path);
+    public abstract Preferences node(String path);
 
     /**
      * Returns true if the node that the path points to exists in memory or
@@ -371,7 +371,7 @@ public abstract class Preferences {
      * string "/" (indicating the root node) or any name on the path is more
      * then 80 characters long
      */
-    abstract public boolean nodeExists(String path)
+    public abstract boolean nodeExists(String path)
                                 throws BackingStoreException;
 
     /**
@@ -380,21 +380,21 @@ public abstract class Preferences {
      *
      * @exception IllegalStateException if this node has been removed
      */
-    abstract public Preferences parent();
+    public abstract Preferences parent();
 
     // abstract methods (export)
 
     /**
      * XXX
      */
-    abstract public void exportNode(OutputStream os)
+    public abstract void exportNode(OutputStream os)
                                 throws BackingStoreException,
                                        IOException;
 
     /**
      * XXX
      */
-    abstract public void exportSubtree(OutputStream os)
+    public abstract void exportSubtree(OutputStream os)
                                 throws BackingStoreException,
                                        IOException;
 
@@ -408,7 +408,7 @@ public abstract class Preferences {
      *            reached
      * @exception IllegalStateException if this node has been removed
      */
-    abstract public String[] keys() throws BackingStoreException;
+    public abstract String[] keys() throws BackingStoreException;
 
     /**
      * Returns the value associated with the key in this preferences node. If
@@ -420,7 +420,7 @@ public abstract class Preferences {
      * @exception IllegalStateException if this node has been removed
      * @exception NullPointerException if key is null
      */
-    abstract public String get(String key, String defaultVal);
+    public abstract String get(String key, String defaultVal);
 
     /**
      * Convenience method for getting the given entry as a boolean.
@@ -432,7 +432,7 @@ public abstract class Preferences {
      * @exception IllegalStateException if this node has been removed
      * @exception NullPointerException if key is null
      */
-    abstract public boolean getBoolean(String key, boolean defaultVal);
+    public abstract boolean getBoolean(String key, boolean defaultVal);
 
     /**
      * Convenience method for getting the given entry as a byte array.
@@ -445,7 +445,7 @@ public abstract class Preferences {
      * @exception IllegalStateException if this node has been removed
      * @exception NullPointerException if key is null
      */
-    abstract public byte[] getByteArray(String key, byte[] defaultVal);
+    public abstract byte[] getByteArray(String key, byte[] defaultVal);
 
     /**
      * Convenience method for getting the given entry as a double.
@@ -457,7 +457,7 @@ public abstract class Preferences {
      * @exception IllegalStateException if this node has been removed
      * @exception NullPointerException if key is null
      */
-    abstract public double getDouble(String key, double defaultVal);
+    public abstract double getDouble(String key, double defaultVal);
 
     /**
      * Convenience method for getting the given entry as a float.
@@ -469,7 +469,7 @@ public abstract class Preferences {
      * @exception IllegalStateException if this node has been removed
      * @exception NullPointerException if key is null
      */
-    abstract public float getFloat(String key, float defaultVal);
+    public abstract float getFloat(String key, float defaultVal);
 
     /**
      * Convenience method for getting the given entry as an integer.
@@ -481,7 +481,7 @@ public abstract class Preferences {
      * @exception IllegalStateException if this node has been removed
      * @exception NullPointerException if key is null
      */
-    abstract public int getInt(String key, int defaultVal);
+    public abstract int getInt(String key, int defaultVal);
 
     /**
      * Convenience method for getting the given entry as a long.
@@ -493,7 +493,7 @@ public abstract class Preferences {
      * @exception IllegalStateException if this node has been removed
      * @exception NullPointerException if key is null
      */
-    abstract public long getLong(String key, long defaultVal);
+    public abstract long getLong(String key, long defaultVal);
 
     /**
      * Sets the value of the given preferences entry for this node.
@@ -507,7 +507,7 @@ public abstract class Preferences {
      * @exception IllegalArgumentException if either key or value are to large
      * @exception IllegalStateException when this node has been removed
      */
-    abstract public void put(String key, String value);
+    public abstract void put(String key, String value);
 
     /**
      * Convenience method for setting the given entry as a boolean.
@@ -518,7 +518,7 @@ public abstract class Preferences {
      * @exception IllegalArgumentException if the key length is to large
      * @exception IllegalStateException when this node has been removed
      */
-    abstract public void putBoolean(String key, boolean value);
+    public abstract void putBoolean(String key, boolean value);
 
     /**
      * Convenience method for setting the given entry as an array of bytes.
@@ -533,7 +533,7 @@ public abstract class Preferences {
      * @exception IllegalArgumentException if either key or value are to large
      * @exception IllegalStateException when this node has been removed
      */
-    abstract public void putByteArray(String key, byte[] value);
+    public abstract void putByteArray(String key, byte[] value);
 
     /**
      * Convenience method for setting the given entry as a double.
@@ -544,7 +544,7 @@ public abstract class Preferences {
      * @exception IllegalArgumentException if the key length is to large
      * @exception IllegalStateException when this node has been removed
      */
-    abstract public void putDouble(String key, double value);
+    public abstract void putDouble(String key, double value);
 
     /**
      * Convenience method for setting the given entry as a float.
@@ -555,7 +555,7 @@ public abstract class Preferences {
      * @exception IllegalArgumentException if the key length is to large
      * @exception IllegalStateException when this node has been removed
      */
-    abstract public void putFloat(String key, float value);
+    public abstract void putFloat(String key, float value);
 
     /**
      * Convenience method for setting the given entry as an integer.
@@ -566,7 +566,7 @@ public abstract class Preferences {
      * @exception IllegalArgumentException if the key length is to large
      * @exception IllegalStateException when this node has been removed
      */
-    abstract public void putInt(String key, int value);
+    public abstract void putInt(String key, int value);
 
     /**
      * Convenience method for setting the given entry as a long.
@@ -577,7 +577,7 @@ public abstract class Preferences {
      * @exception IllegalArgumentException if the key length is to large
      * @exception IllegalStateException when this node has been removed
      */
-    abstract public void putLong(String key, long value);
+    public abstract void putLong(String key, long value);
 
     /**
      * Removes the preferences entry from this preferences node.
@@ -589,7 +589,7 @@ public abstract class Preferences {
      * @exception IllegalArgumentException if the key length is to large
      * @exception IllegalStateException when this node has been removed
      */
-    abstract public void remove(String key);
+    public abstract void remove(String key);
 
     // abstract methods (preference node manipulation)
 
@@ -604,7 +604,7 @@ public abstract class Preferences {
      *            reached
      * @exception IllegalStateException if this node has been removed
      */
-    abstract public void clear() throws BackingStoreException;
+    public abstract void clear() throws BackingStoreException;
 
     /**
      * Writes all preference changes on this and any subnode that have not
@@ -618,7 +618,7 @@ public abstract class Preferences {
      *            reached
      * @exception IllegalStateException if this node has been removed
      */
-    abstract public void flush() throws BackingStoreException;
+    public abstract void flush() throws BackingStoreException;
 
     /**
      * Writes and reads all preference changes to and from this and any
@@ -630,7 +630,7 @@ public abstract class Preferences {
      *            reached
      * @exception IllegalStateException if this node has been removed
      */
-    abstract public void sync() throws BackingStoreException;
+    public abstract void sync() throws BackingStoreException;
 
     /**
      * Removes this and all subnodes from the backing store and clears all
@@ -651,19 +651,18 @@ public abstract class Preferences {
      * @exception IllegalStateException if this node has already been removed
      * @exception UnsupportedOperationException if this is a root node
      */
-    abstract public void removeNode() throws BackingStoreException;
+    public abstract void removeNode() throws BackingStoreException;
 
     // abstract methods (listeners)
 
-    abstract public void addNodeChangeListener(NodeChangeListener listener);
+    public abstract void addNodeChangeListener(NodeChangeListener listener);
 
-    abstract public void addPreferenceChangeListener
+    public abstract void addPreferenceChangeListener
                             (PreferenceChangeListener listener);
 
-    abstract public void removeNodeChangeListener(NodeChangeListener listener);
+    public abstract void removeNodeChangeListener(NodeChangeListener listener);
 
-    abstract public void removePreferenceChangeListener
+    public abstract void removePreferenceChangeListener
                             (PreferenceChangeListener listener);
-
 }