* gnu/java/nio/SelectorImpl.java: Removed unused import.

	* gnu/java/security/der/DERWriter.java: Removed unused import.
	* gnu/java/net/protocol/http/Connection.java: Removed unused
	import.
	* gnu/java/nio/PipeImpl.java (read): Reordered modifiers.  Fixed
	indentation.
	(write): Likewise.
	* gnu/java/rmi/server/ConnectionRunnerPool.java
	(getConnectionRunner): Reordered modifiers.
	* gnu/java/text/FormatCharacterIterator.java (debug): Removed
	useless `final'.
	(dumpTable): Likewise.
	* gnu/java/net/PlainDatagramSocketImpl.java (bind): Reordered
	modifiers.
	(create, setOption, getOption, close, join, leave): Likewise.
	* gnu/java/net/PlainSocketImpl.java (create): Reordered
	modifiers.
	(bind, listen, accept): Likewise.

7 files changed, 44 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 0646934c2..942aec820 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
 2005-01-04  Tom Tromey  <tromey@redhat.com>
 
+	* gnu/java/nio/SelectorImpl.java: Removed unused import.
+	* gnu/java/security/der/DERWriter.java: Removed unused import.
+	* gnu/java/net/protocol/http/Connection.java: Removed unused
+	import.
+	* gnu/java/nio/PipeImpl.java (read): Reordered modifiers.  Fixed
+	indentation.
+	(write): Likewise.
+	* gnu/java/rmi/server/ConnectionRunnerPool.java
+	(getConnectionRunner): Reordered modifiers.
+	* gnu/java/text/FormatCharacterIterator.java (debug): Removed
+	useless `final'.
+	(dumpTable): Likewise.
+	* gnu/java/net/PlainDatagramSocketImpl.java (bind): Reordered
+	modifiers.
+	(create, setOption, getOption, close, join, leave): Likewise.
+	* gnu/java/net/PlainSocketImpl.java (create): Reordered
+	modifiers.
+	(bind, listen, accept): Likewise.
+
+2005-01-04  Tom Tromey  <tromey@redhat.com>
+
 	* Makefile.am (EXTRA_DIST): Added ChangeLog-2004.
 
 2005-01-04  Robert Schuster <thebohemian@gmx.net>
diff --git a/gnu/java/net/PlainDatagramSocketImpl.java b/gnu/java/net/PlainDatagramSocketImpl.java
index d5230634e..1e3425fcd 100644
--- a/gnu/java/net/PlainDatagramSocketImpl.java
+++ b/gnu/java/net/PlainDatagramSocketImpl.java
@@ -1,5 +1,5 @@
 /* PlainDatagramSocketImpl.java -- Default DatagramSocket implementation
-   Copyright (C) 1998, 1999, 2001, 2003, 2004  Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -123,7 +123,7 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl
    *
    * @exception SocketException If an error occurs
    */
-  protected native synchronized void bind(int port, InetAddress addr)
+  protected synchronized native void bind(int port, InetAddress addr)
     throws SocketException;
 
   /**
@@ -131,7 +131,7 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl
    *
    * @exception SocketException If an error occurs
    */
-  protected native synchronized void create() throws SocketException;
+  protected synchronized native void create() throws SocketException;
 
   /**
    * Sets the Time to Live value for the socket
@@ -227,7 +227,7 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl
    *
    * @exception SocketException If an error occurs
    */
-  public native synchronized void setOption(int option_id, Object val)
+  public synchronized native void setOption(int option_id, Object val)
     throws SocketException;
 
   /**
@@ -239,13 +239,13 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl
    *
    * @exception SocketException If an error occurs
    */
-  public native synchronized Object getOption(int option_id)
+  public synchronized native Object getOption(int option_id)
     throws SocketException;
 
   /**
    * Closes the socket
    */
-  protected native synchronized void close();
+  protected synchronized native void close();
 
   /**
    * Gets the Time to Live value for the socket
@@ -282,7 +282,7 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl
    *
    * @exception IOException If an error occurs
    */
-  protected native synchronized void join(InetAddress addr) throws IOException;
+  protected synchronized native void join(InetAddress addr) throws IOException;
 
   /**
    * Leaves a multicast group
@@ -291,7 +291,7 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl
    *
    * @exception IOException If an error occurs
    */
-  protected native synchronized void leave(InetAddress addr) throws IOException;
+  protected synchronized native void leave(InetAddress addr) throws IOException;
 
   /**
    * What does this method really do?
diff --git a/gnu/java/net/PlainSocketImpl.java b/gnu/java/net/PlainSocketImpl.java
index 2c5032fcf..93f43b86d 100644
--- a/gnu/java/net/PlainSocketImpl.java
+++ b/gnu/java/net/PlainSocketImpl.java
@@ -1,5 +1,5 @@
 /* PlainSocketImpl.java -- Default socket implementation
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -195,7 +195,7 @@ public final class PlainSocketImpl extends SocketImpl
    *
    * @param stream true for a stream socket, false for a datagram socket
    */
-  protected native synchronized void create(boolean stream) throws IOException;
+  protected synchronized native void create(boolean stream) throws IOException;
 
   /**
    * Connects to the remote hostname and port specified as arguments.
@@ -264,7 +264,7 @@ public final class PlainSocketImpl extends SocketImpl
    *
    * @exception IOException If an error occurs
    */
-  protected native synchronized void bind(InetAddress addr, int port)
+  protected synchronized native void bind(InetAddress addr, int port)
     throws IOException;
 
   /**
@@ -277,7 +277,7 @@ public final class PlainSocketImpl extends SocketImpl
    * 
    * @exception IOException If an error occurs
    */
-  protected native synchronized void listen(int queuelen)
+  protected synchronized native void listen(int queuelen)
     throws IOException;
 
   /**
@@ -286,7 +286,7 @@ public final class PlainSocketImpl extends SocketImpl
    *
    * @param impl The SocketImpl object to accept this connection.
    */
-  protected native synchronized void accept(SocketImpl impl)
+  protected synchronized native void accept(SocketImpl impl)
     throws IOException;
 
   /**
diff --git a/gnu/java/nio/PipeImpl.java b/gnu/java/nio/PipeImpl.java
index df79e17fd..ca374c52f 100644
--- a/gnu/java/nio/PipeImpl.java
+++ b/gnu/java/nio/PipeImpl.java
@@ -1,5 +1,5 @@
 /* PipeImpl.java -- 
-   Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -79,7 +79,8 @@ class PipeImpl extends Pipe
       return read (srcs, 0, srcs.length);
     }
 
-    public synchronized final long read (ByteBuffer[] srcs, int offset, int len)
+    public final synchronized long read (ByteBuffer[] srcs, int offset,
+					 int len)
       throws IOException
     {
       if (offset < 0
@@ -138,7 +139,7 @@ class PipeImpl extends Pipe
       return write (srcs, 0, srcs.length);
     }
 
-    public synchronized final long write (ByteBuffer[] srcs, int offset, int len)
+    public final synchronized long write (ByteBuffer[] srcs, int offset, int len)
       throws IOException
     {
       if (offset < 0
diff --git a/gnu/java/rmi/server/ConnectionRunnerPool.java b/gnu/java/rmi/server/ConnectionRunnerPool.java
index 5f5da8ca9..b917315cb 100644
--- a/gnu/java/rmi/server/ConnectionRunnerPool.java
+++ b/gnu/java/rmi/server/ConnectionRunnerPool.java
@@ -1,5 +1,5 @@
 /* gnu.java.rmi.server.ConnectionRunnerPool
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -118,7 +118,7 @@ class ConnectionRunnerPool
     max_size = size;
   }
   
-  private synchronized static ConnectionRunner getConnectionRunner()
+  private static synchronized ConnectionRunner getConnectionRunner()
   {
     if(freelist.size() == 0){
       if(size < max_size){
diff --git a/gnu/java/security/der/DERWriter.java b/gnu/java/security/der/DERWriter.java
index 8bf80b5fc..5568b69bb 100644
--- a/gnu/java/security/der/DERWriter.java
+++ b/gnu/java/security/der/DERWriter.java
@@ -1,5 +1,5 @@
 /* DERWriter.java -- write Java types in DER format.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,6 @@ import java.math.BigInteger;
 
 import java.text.SimpleDateFormat;
 
-import java.util.BitSet;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
diff --git a/gnu/java/text/FormatCharacterIterator.java b/gnu/java/text/FormatCharacterIterator.java
index 116198bdc..942641a08 100644
--- a/gnu/java/text/FormatCharacterIterator.java
+++ b/gnu/java/text/FormatCharacterIterator.java
@@ -1,6 +1,6 @@
 /* FormatCharacter.java -- Implementation of AttributedCharacterIterator for 
    formatters.
-   Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -494,13 +494,13 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
       mergeAttributes(new HashMap[] { null, attributes }, new int[] { range_start, range_end });
   }
 
-  final private void debug(String s)
+  private void debug(String s)
   {
     if (Configuration.DEBUG)
       System.out.println(s);
   }
 
-  final private void dumpTable()
+  private void dumpTable()
   {
     int start_range = 0;