diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fe249bb3ece6..efad45dc702e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,44 @@
+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
+
 2004-10-22  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* gnu/java/net/natPlainSocketImplPosix.cc
diff --git a/libjava/java/lang/Math.java b/libjava/java/lang/Math.java
index aac33aa299d6..f1f68c4832b1 100644
--- a/libjava/java/lang/Math.java
+++ b/libjava/java/lang/Math.java
@@ -298,7 +298,7 @@ public final class Math
    * @param a the angle (in radians)
    * @return sin(a)
    */
-  public native static double sin(double a);
+  public static native double sin(double a);
 
   /**
    * The trigonometric function <em>cos</em>. The cosine of NaN or infinity is
@@ -307,7 +307,7 @@ public final class Math
    * @param a the angle (in radians)
    * @return cos(a)
    */
-  public native static double cos(double a);
+  public static native double cos(double a);
 
   /**
    * The trigonometric function <em>tan</em>. The tangent of NaN or infinity
@@ -317,7 +317,7 @@ public final class Math
    * @param a the angle (in radians)
    * @return tan(a)
    */
-  public native static double tan(double a);
+  public static native double tan(double a);
 
   /**
    * The trigonometric function <em>arcsin</em>. The range of angles returned
@@ -328,7 +328,7 @@ public final class Math
    * @param a the sin to turn back into an angle
    * @return arcsin(a)
    */
-  public native static double asin(double a);
+  public static native double asin(double a);
 
   /**
    * The trigonometric function <em>arccos</em>. The range of angles returned
@@ -339,7 +339,7 @@ public final class Math
    * @param a the cos to turn back into an angle
    * @return arccos(a)
    */
-  public native static double acos(double a);
+  public static native double acos(double a);
 
   /**
    * The trigonometric function <em>arcsin</em>. The range of angles returned
@@ -351,7 +351,7 @@ public final class Math
    * @return arcsin(a)
    * @see #atan2(double, double)
    */
-  public native static double atan(double a);
+  public static native double atan(double a);
 
   /**
    * A special version of the trigonometric function <em>arctan</em>, for
@@ -400,7 +400,7 @@ public final class Math
    * @return <em>theta</em> in the conversion of (x, y) to (r, theta)
    * @see #atan(double)
    */
-  public native static double atan2(double y, double x);
+  public static native double atan2(double y, double x);
 
   /**
    * Take <em>e</em><sup>a</sup>.  The opposite of <code>log()</code>. If the
@@ -414,7 +414,7 @@ public final class Math
    * @see #log(double)
    * @see #pow(double, double)
    */
-  public native static double exp(double a);
+  public static native double exp(double a);
 
   /**
    * Take ln(a) (the natural log).  The opposite of <code>exp()</code>. If the
@@ -430,7 +430,7 @@ public final class Math
    * @return the natural log of <code>a</code>
    * @see #exp(double)
    */
-  public native static double log(double a);
+  public static native double log(double a);
 
   /**
    * Take a square root. If the argument is NaN or negative, the result is
@@ -444,7 +444,7 @@ public final class Math
    * @return the square root of the argument
    * @see #pow(double, double)
    */
-  public native static double sqrt(double a);
+  public static native double sqrt(double a);
 
   /**
    * Raise a number to a power. Special cases:<ul>
@@ -514,7 +514,7 @@ public final class Math
    * @param b the power to raise it to
    * @return a<sup>b</sup>
    */
-  public native static double pow(double a, double b);
+  public static native double pow(double a, double b);
 
   /**
    * Get the IEEE 754 floating point remainder on two numbers. This is the
@@ -530,7 +530,7 @@ public final class Math
    * @return the IEEE 754-defined floating point remainder of x/y
    * @see #rint(double)
    */
-  public native static double IEEEremainder(double x, double y);
+  public static native double IEEEremainder(double x, double y);
 
   /**
    * Take the nearest integer that is that is greater than or equal to the
@@ -541,7 +541,7 @@ public final class Math
    * @param a the value to act upon
    * @return the nearest integer &gt;= <code>a</code>
    */
-  public native static double ceil(double a);
+  public static native double ceil(double a);
 
   /**
    * Take the nearest integer that is that is less than or equal to the
@@ -551,7 +551,7 @@ public final class Math
    * @param a the value to act upon
    * @return the nearest integer &lt;= <code>a</code>
    */
-  public native static double floor(double a);
+  public static native double floor(double a);
 
   /**
    * Take the nearest integer to the argument.  If it is exactly between
@@ -561,7 +561,7 @@ public final class Math
    * @param a the value to act upon
    * @return the nearest integer to <code>a</code>
    */
-  public native static double rint(double a);
+  public static native double rint(double a);
 
   /**
    * Take the nearest integer to the argument.  This is equivalent to
diff --git a/libjava/java/lang/StackTraceElement.java b/libjava/java/lang/StackTraceElement.java
index e1e07f3fb2d7..02500d80a8fe 100644
--- a/libjava/java/lang/StackTraceElement.java
+++ b/libjava/java/lang/StackTraceElement.java
@@ -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 @@ public class StackTraceElement implements Serializable
    * @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 @@ public class StackTraceElement implements Serializable
    * @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();
   }
diff --git a/libjava/java/nio/Buffer.java b/libjava/java/nio/Buffer.java
index e7173852be24..f86829bf3625 100644
--- a/libjava/java/nio/Buffer.java
+++ b/libjava/java/nio/Buffer.java
@@ -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 @@ public abstract class Buffer
    * @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) ||
diff --git a/libjava/java/nio/ByteBuffer.java b/libjava/java/nio/ByteBuffer.java
index e502e0031994..4d3b1dc7d736 100644
--- a/libjava/java/nio/ByteBuffer.java
+++ b/libjava/java/nio/ByteBuffer.java
@@ -77,7 +77,7 @@ public abstract class ByteBuffer extends Buffer
    * @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 @@ public abstract class ByteBuffer extends Buffer
    * 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);
   }
diff --git a/libjava/java/nio/CharBuffer.java b/libjava/java/nio/CharBuffer.java
index 700c56750f3a..096b736ca49d 100644
--- a/libjava/java/nio/CharBuffer.java
+++ b/libjava/java/nio/CharBuffer.java
@@ -74,7 +74,7 @@ public abstract class CharBuffer extends Buffer
    * @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 @@ public abstract class CharBuffer extends Buffer
    *
    * @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 @@ public abstract class CharBuffer extends Buffer
    * @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 @@ public abstract class CharBuffer extends Buffer
    *
    * @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);
   }
diff --git a/libjava/java/nio/DoubleBuffer.java b/libjava/java/nio/DoubleBuffer.java
index dd16ee049620..70010508e896 100644
--- a/libjava/java/nio/DoubleBuffer.java
+++ b/libjava/java/nio/DoubleBuffer.java
@@ -68,7 +68,7 @@ public abstract class DoubleBuffer extends Buffer
    * @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 @@ public abstract class DoubleBuffer extends Buffer
    * 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);
   }
diff --git a/libjava/java/nio/FloatBuffer.java b/libjava/java/nio/FloatBuffer.java
index 2ead8cbc494c..6ff80f1bfaa0 100644
--- a/libjava/java/nio/FloatBuffer.java
+++ b/libjava/java/nio/FloatBuffer.java
@@ -68,7 +68,7 @@ public abstract class FloatBuffer extends Buffer
    * @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 @@ public abstract class FloatBuffer extends Buffer
    * 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);
   }
diff --git a/libjava/java/nio/IntBuffer.java b/libjava/java/nio/IntBuffer.java
index 814e0414bc6c..e1833367d5d4 100644
--- a/libjava/java/nio/IntBuffer.java
+++ b/libjava/java/nio/IntBuffer.java
@@ -68,7 +68,7 @@ public abstract class IntBuffer extends Buffer
    * @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 @@ public abstract class IntBuffer extends Buffer
    * 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);
   }
diff --git a/libjava/java/nio/LongBuffer.java b/libjava/java/nio/LongBuffer.java
index 6e9ef34e8eb2..6f393d1629d6 100644
--- a/libjava/java/nio/LongBuffer.java
+++ b/libjava/java/nio/LongBuffer.java
@@ -68,7 +68,7 @@ public abstract class LongBuffer extends Buffer
    * @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 @@ public abstract class LongBuffer extends Buffer
    * 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);
   }
diff --git a/libjava/java/nio/ShortBuffer.java b/libjava/java/nio/ShortBuffer.java
index db03076b6291..7b34d70ed82d 100644
--- a/libjava/java/nio/ShortBuffer.java
+++ b/libjava/java/nio/ShortBuffer.java
@@ -68,7 +68,7 @@ public abstract class ShortBuffer extends Buffer
    * @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 @@ public abstract class ShortBuffer extends Buffer
    * 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);
   }
diff --git a/libjava/java/nio/charset/Charset.java b/libjava/java/nio/charset/Charset.java
index ad570409a043..5bb78f63ca9a 100644
--- a/libjava/java/nio/charset/Charset.java
+++ b/libjava/java/nio/charset/Charset.java
@@ -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.
 
@@ -158,7 +158,7 @@ public abstract class Charset implements Comparable
   // 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 ();
   }
diff --git a/libjava/java/rmi/server/RMIClassLoader.java b/libjava/java/rmi/server/RMIClassLoader.java
index 4e36bf72c20d..f33ee80501c3 100644
--- a/libjava/java/rmi/server/RMIClassLoader.java
+++ b/libjava/java/rmi/server/RMIClassLoader.java
@@ -1,5 +1,5 @@
 /* RMIClassLoader.java --
-   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -55,7 +55,7 @@ import java.util.StringTokenizer;
  */
 public class RMIClassLoader
 {
-  static private class MyClassLoader extends URLClassLoader
+  private static class MyClassLoader extends URLClassLoader
   {
     private MyClassLoader (URL[] urls, ClassLoader parent, String annotation)
     {
diff --git a/libjava/java/rmi/server/RMISocketFactory.java b/libjava/java/rmi/server/RMISocketFactory.java
index 85ff5806d10f..60ada6add446 100644
--- a/libjava/java/rmi/server/RMISocketFactory.java
+++ b/libjava/java/rmi/server/RMISocketFactory.java
@@ -47,9 +47,9 @@ import java.net.Socket;
 public abstract class RMISocketFactory
   implements RMIClientSocketFactory, RMIServerSocketFactory
 {
-  static private RMISocketFactory defaultFactory;
-  static private RMISocketFactory currentFactory;
-  static private RMIFailureHandler currentHandler;
+  private static RMISocketFactory defaultFactory;
+  private static RMISocketFactory currentFactory;
+  private static RMIFailureHandler currentHandler;
 
   static
     {
diff --git a/libjava/java/security/Policy.java b/libjava/java/security/Policy.java
index 817d62377490..25765db95d97 100644
--- a/libjava/java/security/Policy.java
+++ b/libjava/java/security/Policy.java
@@ -1,5 +1,5 @@
 /* Policy.java --- Policy Manager Class
-   Copyright (C) 1999, 2003, Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -95,7 +95,7 @@ import java.util.Map;
  */
 public abstract class Policy
 {
-  static private Policy currentPolicy;
+  private static Policy currentPolicy;
 
   /** Map of ProtectionDomains to PermissionCollections for this instance. */
   private Map pd2pc = null;
diff --git a/libjava/java/text/ChoiceFormat.java b/libjava/java/text/ChoiceFormat.java
index f23bd128a5e6..ff3c9f667d9e 100644
--- a/libjava/java/text/ChoiceFormat.java
+++ b/libjava/java/text/ChoiceFormat.java
@@ -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)
diff --git a/libjava/java/text/CollationElementIterator.java b/libjava/java/text/CollationElementIterator.java
index 90091e34884d..91f341f55b23 100644
--- a/libjava/java/text/CollationElementIterator.java
+++ b/libjava/java/text/CollationElementIterator.java
@@ -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);
diff --git a/libjava/java/text/DateFormat.java b/libjava/java/text/DateFormat.java
index c0ca73794e66..8b705663d68d 100644
--- a/libjava/java/text/DateFormat.java
+++ b/libjava/java/text/DateFormat.java
@@ -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
diff --git a/libjava/java/text/DecimalFormat.java b/libjava/java/text/DecimalFormat.java
index eda4d0437401..94487c802047 100644
--- a/libjava/java/text/DecimalFormat.java
+++ b/libjava/java/text/DecimalFormat.java
@@ -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
diff --git a/libjava/java/text/DecimalFormatSymbols.java b/libjava/java/text/DecimalFormatSymbols.java
index be045857188a..7a4e56e9a421 100644
--- a/libjava/java/text/DecimalFormatSymbols.java
+++ b/libjava/java/text/DecimalFormatSymbols.java
@@ -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)
diff --git a/libjava/java/text/MessageFormat.java b/libjava/java/text/MessageFormat.java
index 1c681795fa1a..0d6894134808 100644
--- a/libjava/java/text/MessageFormat.java
+++ b/libjava/java/text/MessageFormat.java
@@ -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);
diff --git a/libjava/java/text/NumberFormat.java b/libjava/java/text/NumberFormat.java
index 00d3030f0ee9..368292686bca 100644
--- a/libjava/java/text/NumberFormat.java
+++ b/libjava/java/text/NumberFormat.java
@@ -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
diff --git a/libjava/java/text/RuleBasedCollator.java b/libjava/java/text/RuleBasedCollator.java
index 8b7fe16ac787..c2cff5a0c8c2 100644
--- a/libjava/java/text/RuleBasedCollator.java
+++ b/libjava/java/text/RuleBasedCollator.java
@@ -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;
diff --git a/libjava/java/text/SimpleDateFormat.java b/libjava/java/text/SimpleDateFormat.java
index ea3e09fab462..35083eb887e0 100644
--- a/libjava/java/text/SimpleDateFormat.java
+++ b/libjava/java/text/SimpleDateFormat.java
@@ -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;
diff --git a/libjava/java/util/BitSet.java b/libjava/java/util/BitSet.java
index f81ba1506ed8..d152ba1d96b4 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 6e9eda92a739..1f0b27a56e8c 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 d7b5e54e4a87..5ae4b40389a3 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 f29edb617aa3..5d15786307f0 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 4e8883994ed9..54fd097a0ef8 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 5272bc173016..440536845d73 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 58ee353721ce..f976033a0df9 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 86a1c0c0de71..71fad3ad11f0 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 876279c8c626..69f4426e6d34 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 ce8aacf176fb..c0f0231951f2 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);
-
 }
 
diff --git a/libjava/javax/crypto/interfaces/DHPrivateKey.java b/libjava/javax/crypto/interfaces/DHPrivateKey.java
index 63b9c15c416c..7f9ea391f2e1 100644
--- a/libjava/javax/crypto/interfaces/DHPrivateKey.java
+++ b/libjava/javax/crypto/interfaces/DHPrivateKey.java
@@ -57,9 +57,8 @@ import java.security.PrivateKey;
  */
 public interface DHPrivateKey extends DHKey, PrivateKey
 {
-
   /** Compatible with JDK1.4. */
-  static final long serialVersionUID = 2211791113380396553L;
+  long serialVersionUID = 2211791113380396553L;
 
   /**
    * Returns the private value <i>x</i>.
diff --git a/libjava/javax/crypto/interfaces/DHPublicKey.java b/libjava/javax/crypto/interfaces/DHPublicKey.java
index 5e0b35bf008e..1fcb8144a3af 100644
--- a/libjava/javax/crypto/interfaces/DHPublicKey.java
+++ b/libjava/javax/crypto/interfaces/DHPublicKey.java
@@ -56,9 +56,8 @@ import java.security.PublicKey;
  */
 public interface DHPublicKey extends DHKey, PublicKey
 {
-
   /** Compatible with JDK1.4. */
-  static final long serialVersionUID = -6628103563352519193L;
+  long serialVersionUID = -6628103563352519193L;
 
   /**
    * Get the public value <i>y</i>.
diff --git a/libjava/javax/crypto/interfaces/PBEKey.java b/libjava/javax/crypto/interfaces/PBEKey.java
index 533491898495..30d25323f376 100644
--- a/libjava/javax/crypto/interfaces/PBEKey.java
+++ b/libjava/javax/crypto/interfaces/PBEKey.java
@@ -51,9 +51,8 @@ import javax.crypto.SecretKey;
  */
 public interface PBEKey extends SecretKey
 {
-
   /** Compatible with JDK1.4. */
-  static final long serialVersionUID = -1430015993304333921L;
+  long serialVersionUID = -1430015993304333921L;
 
   /**
    * Retruns the iteration count, or 0 if not specified.
diff --git a/libjava/javax/net/ssl/HandshakeCompletedEvent.java b/libjava/javax/net/ssl/HandshakeCompletedEvent.java
index f19dd6a29fd6..ecb0ac9294a2 100644
--- a/libjava/javax/net/ssl/HandshakeCompletedEvent.java
+++ b/libjava/javax/net/ssl/HandshakeCompletedEvent.java
@@ -52,7 +52,6 @@ import javax.security.cert.X509Certificate;
  */
 public class HandshakeCompletedEvent extends java.util.EventObject
 {
-
   // Fields.
   // -------------------------------------------------------------------
 
@@ -60,7 +59,7 @@ public class HandshakeCompletedEvent extends java.util.EventObject
   private static final long serialVersionUID = 7914963744257769778L;
 
   /** The session. */
-  private transient final SSLSession session;
+  private final transient SSLSession session;
 
   // Constructor.
   // -------------------------------------------------------------------
diff --git a/libjava/javax/security/auth/Subject.java b/libjava/javax/security/auth/Subject.java
index 264a41c0561a..5391acec8251 100644
--- a/libjava/javax/security/auth/Subject.java
+++ b/libjava/javax/security/auth/Subject.java
@@ -59,12 +59,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Set;
 
-/**
- *
- */
 public final class Subject implements Serializable
 {
-
   // Fields.
   // -------------------------------------------------------------------------
 
@@ -81,8 +77,8 @@ public final class Subject implements Serializable
    */
   private boolean readOnly;
 
-  private transient final SecureSet pubCred;
-  private transient final SecureSet privCred;
+  private final transient SecureSet pubCred;
+  private final transient SecureSet privCred;
 
   // Constructors.
   // -------------------------------------------------------------------------
@@ -371,7 +367,6 @@ public final class Subject implements Serializable
    */
   private static class SecureSet extends AbstractSet implements Serializable
   {
-
     // Fields.
     // -----------------------------------------------------------------------
 
@@ -383,7 +378,7 @@ public final class Subject implements Serializable
 
     private final Subject subject;
     private final LinkedList elements;
-    private transient final int type;
+    private final transient int type;
 
     // Constructors.
     // -----------------------------------------------------------------------