Patch: FYI: minor cleanups

[Tom Tromey]

I'm checking this in.

This removes some redundant modifiers and some `extends Object'
occurrences.  As such it is just a minor cleanup.

FYI there are some remaining redundant modifiers in java.util.zip.

This includes my patchlet from yesterday that I didn't commit as cvs
was down for a while.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * java/rmi/MarshalledObject.java (MarshalledObject): Removed
        redundant `extends'.
        * java/security/Security.java (Security): Removed redundant
        `extends'.
        * java/security/spec/DSAPublicKeySpec.java (DSAPublicKeySpec):
        Removed redundant `extends'.
        * java/security/spec/DSAPrivateKeySpec.java (DSAPrivateKeySpec):
        Removed redundant `extends'.
        * java/security/spec/DSAParameterSpec.java (DSAParameterSpec):
        Removed redundant `extends'.
        * javax/naming/directory/SearchControls.java (SearchControls):
        Removed redundant `extends'.
        * javax/naming/spi/DirStateFactory.java (Result): Removed
        redundant modifiers.
        * java/util/Map.java (Entry): Removed redundant modifiers.
        * java/text/AttributedCharacterIterator.java (Attribute): Removed
        redundant modifiers.
        * java/security/Security.java (provides): Removed unused label.

Index: java/rmi/MarshalledObject.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/MarshalledObject.java,v
retrieving revision 1.5
diff -u -r1.5 MarshalledObject.java
--- java/rmi/MarshalledObject.java 15 Nov 2003 22:41:59 -0000 1.5
+++ java/rmi/MarshalledObject.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,8 +46,7 @@
 /**
  * FIXME - doc missing
  */
-public final class MarshalledObject
-  extends Object implements Serializable 
+public final class MarshalledObject implements Serializable 
 {
   
   //The following fields are from Java API Documentation "Serialized form"
Index: java/security/Security.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/Security.java,v
retrieving revision 1.26
diff -u -r1.26 Security.java
--- java/security/Security.java 30 Nov 2003 14:49:59 -0000 1.26
+++ java/security/Security.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* Security.java --- Java base security class implementation
-   Copyright (C) 1999, 2001, 2002, 2003, Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -59,7 +59,7 @@
  *
  * @author Mark Benvenuto <address@hidden>
  */
-public final class Security extends Object
+public final class Security
 {
   private static final String ALG_ALIAS = "Alg.Alias.";
 
@@ -670,7 +670,7 @@
     outer: for (int r = 0; r < 3; r++) // guard against circularity
       {
         serviceDotAlgorithm = (svc+"."+String.valueOf(algo)).trim();
-        inner: for (it = p.keySet().iterator(); it.hasNext(); )
+        for (it = p.keySet().iterator(); it.hasNext(); )
           {
             key = (String) it.next();
             if (key.equalsIgnoreCase(serviceDotAlgorithm)) // eureka
Index: java/security/spec/DSAParameterSpec.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/java/security/spec/DSAParameterSpec.java,v
retrieving revision 1.4
diff -u -r1.4 DSAParameterSpec.java
--- java/security/spec/DSAParameterSpec.java 5 Dec 2002 11:15:06 -0000 1.4
+++ java/security/spec/DSAParameterSpec.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* DSAParameterSpec.java --- DSA Parameter Specificaton class
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@
 
        @author Mark Benvenuto
 */
-public class DSAParameterSpec extends Object implements 
AlgorithmParameterSpec, DSAParams
+public class DSAParameterSpec implements AlgorithmParameterSpec, DSAParams
 {
   private BigInteger p = null;
   private BigInteger q = null;
Index: java/security/spec/DSAPrivateKeySpec.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/java/security/spec/DSAPrivateKeySpec.java,v
retrieving revision 1.4
diff -u -r1.4 DSAPrivateKeySpec.java
--- java/security/spec/DSAPrivateKeySpec.java 5 Dec 2002 11:15:06 -0000 1.4
+++ java/security/spec/DSAPrivateKeySpec.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* DSAPrivateKeySpec.java --- DSA Private Key Specificaton class
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,7 +47,7 @@
 
        @author Mark Benvenuto
 */
-public class DSAPrivateKeySpec extends Object implements KeySpec 
+public class DSAPrivateKeySpec implements KeySpec 
 {
   private BigInteger x = null;
   private BigInteger p = null;
Index: java/security/spec/DSAPublicKeySpec.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/java/security/spec/DSAPublicKeySpec.java,v
retrieving revision 1.5
diff -u -r1.5 DSAPublicKeySpec.java
--- java/security/spec/DSAPublicKeySpec.java 25 Apr 2003 04:58:12 -0000 1.5
+++ java/security/spec/DSAPublicKeySpec.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* DSAPublicKeySpec.java --- DSA Public Key Specificaton class
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,7 +47,7 @@
 
        @author Mark Benvenuto
 */
-public class DSAPublicKeySpec extends Object implements KeySpec 
+public class DSAPublicKeySpec implements KeySpec 
 {
   private BigInteger y = null;
   private BigInteger p = null;
Index: java/text/AttributedCharacterIterator.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/java/text/AttributedCharacterIterator.java,v
retrieving revision 1.7
diff -u -r1.7 AttributedCharacterIterator.java
--- java/text/AttributedCharacterIterator.java 15 Oct 2003 13:28:21 -0000 1.7
+++ java/text/AttributedCharacterIterator.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* AttributedCharacterIterator.java -- Iterate over attributes
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -60,7 +60,7 @@
   /**
    * This class defines attribute keys that are used as text attributes.
    */
-  public static class Attribute implements Serializable
+  class Attribute implements Serializable
   {
     private static final long serialVersionUID = -9142742483513960612L;
 
Index: java/util/Map.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Map.java,v
retrieving revision 1.11
diff -u -r1.11 Map.java
--- java/util/Map.java 15 Oct 2003 12:29:35 -0000 1.11
+++ java/util/Map.java 2 Apr 2004 21:19:13 -0000
@@ -1,6 +1,6 @@
 /* Map.java: interface Map -- An object that maps keys to values
              interface Map.Entry -- an Entry in a Map
-   Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -264,7 +264,7 @@
    * @since 1.2
    * @status updated to 1.4
    */
-  static interface Entry
+  interface Entry
   {
     /**
      * Get the key corresponding to this entry.
Index: javax/naming/directory/SearchControls.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/naming/directory/SearchControls.java,v
retrieving revision 1.1
diff -u -r1.1 SearchControls.java
--- javax/naming/directory/SearchControls.java 23 Nov 2002 21:44:28 -0000 1.1
+++ javax/naming/directory/SearchControls.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* SearchControls.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,7 @@
  * @date June 5, 2001
  */
 
-public class SearchControls extends Object implements Serializable
+public class SearchControls implements Serializable
 {
   public static final int OBJECT_SCOPE = 0;
   public static final int ONELEVEL_SCOPE = 1;
Index: javax/naming/spi/DirStateFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/DirStateFactory.java,v
retrieving revision 1.3
diff -u -r1.3 DirStateFactory.java
--- javax/naming/spi/DirStateFactory.java 26 Dec 2003 20:27:04 -0000 1.3
+++ javax/naming/spi/DirStateFactory.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* DirStateFactory.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -53,7 +53,7 @@
 {
   // Inner class
 
-  public static class Result
+  class Result
   {
     private Object obj;
     private Attributes outAttrs;