[cp-patches] Patch: FYI: minor cleanups

[Tom Tromey]

I'm checking this in.

This fixes a few minor nits with modifier ordering, redundant
modifiers, and unused imports.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * 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.

Index: gnu/java/nio/PipeImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/PipeImpl.java,v
retrieving revision 1.9
diff -u -r1.9 PipeImpl.java
--- gnu/java/nio/PipeImpl.java 21 Jul 2004 20:35:29 -0000 1.9
+++ gnu/java/nio/PipeImpl.java 4 Jan 2005 23:34:25 -0000
@@ -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 @@
       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 @@
       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
Index: gnu/java/net/PlainDatagramSocketImpl.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/net/PlainDatagramSocketImpl.java,v
retrieving revision 1.7
diff -u -r1.7 PlainDatagramSocketImpl.java
--- gnu/java/net/PlainDatagramSocketImpl.java 13 Oct 2004 14:32:33 -0000 1.7
+++ gnu/java/net/PlainDatagramSocketImpl.java 4 Jan 2005 23:34:25 -0000
@@ -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 @@
    *
    * @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 @@
    *
    * @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 @@
    *
    * @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 @@
    *
    * @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 @@
    *
    * @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 @@
    *
    * @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?
Index: gnu/java/net/PlainSocketImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/PlainSocketImpl.java,v
retrieving revision 1.8
diff -u -r1.8 PlainSocketImpl.java
--- gnu/java/net/PlainSocketImpl.java 19 Mar 2004 08:34:50 -0000 1.8
+++ gnu/java/net/PlainSocketImpl.java 4 Jan 2005 23:34:25 -0000
@@ -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 @@
    *
    * @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 @@
    *
    * @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 @@
    * 
    * @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 @@
    *
    * @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;
 
   /**
Index: gnu/java/security/der/DERWriter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/der/DERWriter.java,v
retrieving revision 1.3
diff -u -r1.3 DERWriter.java
--- gnu/java/security/der/DERWriter.java 14 Aug 2004 17:51:42 -0000 1.3
+++ gnu/java/security/der/DERWriter.java 4 Jan 2005 23:34:25 -0000
@@ -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.text.SimpleDateFormat;
 
-import java.util.BitSet;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
Index: gnu/java/rmi/server/ConnectionRunnerPool.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/rmi/server/ConnectionRunnerPool.java,v
retrieving revision 1.3
diff -u -r1.3 ConnectionRunnerPool.java
--- gnu/java/rmi/server/ConnectionRunnerPool.java 6 Nov 2004 23:41:18 -0000 1.3
+++ gnu/java/rmi/server/ConnectionRunnerPool.java 4 Jan 2005 23:34:25 -0000
@@ -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 @@
     max_size = size;
   }
   
-  private synchronized static ConnectionRunner getConnectionRunner()
+  private static synchronized ConnectionRunner getConnectionRunner()
   {
     if(freelist.size() == 0){
       if(size < max_size){
Index: gnu/java/text/FormatCharacterIterator.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/text/FormatCharacterIterator.java,v
retrieving revision 1.1
diff -u -r1.1 FormatCharacterIterator.java
--- gnu/java/text/FormatCharacterIterator.java 28 Apr 2004 19:17:08 -0000 1.1
+++ gnu/java/text/FormatCharacterIterator.java 4 Jan 2005 23:34:25 -0000
@@ -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 @@
       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;