2003-10-11 Michael Koch <konqueror@gmx.de>

	* java/security/Key.java,
	* java/security/PrivateKey.java,
	* java/security/PublicKey.java,
	* java/security/acl/Acl.java,
	* java/security/acl/AclEntry.java,
	* java/security/acl/Group.java,
	* java/security/acl/Owner.java,
	* java/security/acl/Permission.java,
	* java/security/cert/X509Extension.java,
	* java/security/interfaces/DSAKey.java,
	* java/security/interfaces/DSAKeyPairGenerator.java,
	* java/security/interfaces/DSAParams.java,
	* java/security/interfaces/DSAPrivateKey.java,
	* java/security/interfaces/DSAPublicKey.java,
	* java/security/interfaces/RSAKey.java,
	* java/security/interfaces/RSAPrivateCrtKey.java,
	* java/security/interfaces/RSAPrivateKey.java,
	* java/security/interfaces/RSAPublicKey.java:
	Removed redundant modifiers.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72360 138bc75d-0d04-0410-961f-82ee72b054a4

19 files changed, 82 insertions, 55 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ac3325092f6..8374e3f7be1 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,27 @@
 2003-10-11  Michael Koch  <konqueror@gmx.de>
 
+	* java/security/Key.java,
+	* java/security/PrivateKey.java,
+	* java/security/PublicKey.java,
+	* java/security/acl/Acl.java,
+	* java/security/acl/AclEntry.java,
+	* java/security/acl/Group.java,
+	* java/security/acl/Owner.java,
+	* java/security/acl/Permission.java,
+	* java/security/cert/X509Extension.java,
+	* java/security/interfaces/DSAKey.java,
+	* java/security/interfaces/DSAKeyPairGenerator.java,
+	* java/security/interfaces/DSAParams.java,
+	* java/security/interfaces/DSAPrivateKey.java,
+	* java/security/interfaces/DSAPublicKey.java,
+	* java/security/interfaces/RSAKey.java,
+	* java/security/interfaces/RSAPrivateCrtKey.java,
+	* java/security/interfaces/RSAPrivateKey.java,
+	* java/security/interfaces/RSAPublicKey.java:
+	Removed redundant modifiers.
+
+2003-10-11  Michael Koch  <konqueror@gmx.de>
+
 	* gnu/java/rmi/server/ProtocolConstants.java,
 	gnu/java/security/der/DER.java:
 	Removing redundant modifiers.
diff --git a/libjava/java/security/Key.java b/libjava/java/security/Key.java
index ee2be037588..195e50bb527 100644
--- a/libjava/java/security/Key.java
+++ b/libjava/java/security/Key.java
@@ -64,7 +64,7 @@ public interface Key extends Serializable
   /**
    * The version identifier used for serialization.
    */
-  public static final long serialVersionUID = 6603384152749567654L;
+  long serialVersionUID = 6603384152749567654L;
 
   /**
    * This method returns the name of the algorithm for this key.  This is a
diff --git a/libjava/java/security/PrivateKey.java b/libjava/java/security/PrivateKey.java
index 53d898318d1..40b97f58b9a 100644
--- a/libjava/java/security/PrivateKey.java
+++ b/libjava/java/security/PrivateKey.java
@@ -58,5 +58,5 @@ public interface PrivateKey extends Key
   /**
    * The version identifier used for serialization.
    */
-  public static final long serialVersionUID = 6034044314589513430L;
+  long serialVersionUID = 6034044314589513430L;
 } // interface PrivateKey
diff --git a/libjava/java/security/PublicKey.java b/libjava/java/security/PublicKey.java
index 9b013ec0a60..81ab764615f 100644
--- a/libjava/java/security/PublicKey.java
+++ b/libjava/java/security/PublicKey.java
@@ -56,5 +56,5 @@ public interface PublicKey extends Key
   /**
    * The version identifier used for serialization.
    */
-  public static final long serialVersionUID = 7187392471159151072L;
+  long serialVersionUID = 7187392471159151072L;
 } // interface PublicKey
diff --git a/libjava/java/security/acl/Acl.java b/libjava/java/security/acl/Acl.java
index 07d07ecd4a4..4229c92ddb7 100644
--- a/libjava/java/security/acl/Acl.java
+++ b/libjava/java/security/acl/Acl.java
@@ -69,7 +69,7 @@ public interface Acl extends Owner
    *
    * @return The name of this ACL
    */
-  public abstract String getName();
+  String getName();
 
   /**
    * This method sets the name of the ACL
@@ -79,7 +79,7 @@ public interface Acl extends Owner
    *
    * @exception NotOwnerException If the caller is not an owner of this ACL.
    */
-  public abstract void setName(Principal caller, String name)
+  void setName(Principal caller, String name)
     throws NotOwnerException;
 
   /**
@@ -88,11 +88,13 @@ public interface Acl extends Owner
    * @param caller The <code>Principal</code> requesting the addition
    * @param entry The ACL entry to add
    *
-   * @return <code>true</code> if the entry was added, <code>false</code> if there is already an entry of the same type for the <code>Principal</code>.
+   * @return <code>true</code> if the entry was added, <code>false</code>
+   * if there is already an entry of the same type for the
+   * <code>Principal</code>.
    *
    * @exception NotOwnerException If the caller is not an owner of this ACL.
    */
-  public abstract boolean addEntry(Principal caller, AclEntry entry) 
+  boolean addEntry(Principal caller, AclEntry entry) 
     throws NotOwnerException;
 
   /**
@@ -101,11 +103,12 @@ public interface Acl extends Owner
    * @param caller The <code>Principal</code> requesting the deletion.
    * @param entry The ACL entry to delete
    *
-   * @return <code>true</code> if the entry was deleted, or <code>false</code> if this entry was not part of the ACL to begin with
+   * @return <code>true</code> if the entry was deleted, or <code>false</code>
+   * if this entry was not part of the ACL to begin with
    *
    * @exception NotOwnerException If the caller is not an owner of this ACL.
    */
-  public abstract boolean removeEntry(Principal caller, AclEntry entry)
+  boolean removeEntry(Principal caller, AclEntry entry)
     throws NotOwnerException;
 
   /**
@@ -114,7 +117,7 @@ public interface Acl extends Owner
    *
    * @return An enumeration of the ACL entries
    */
-  public abstract Enumeration entries();
+  Enumeration entries();
 
   /**
    * This method tests whether or not the specified <code>Principal</code>
@@ -123,9 +126,10 @@ public interface Acl extends Owner
    * @param user The <code>Principal</code> to test
    * @param perm The <code>Permission</code> to test for
    *
-   * @return <code>true</code> if the user has been granted the permission, <code>false</code> otherwise
+   * @return <code>true</code> if the user has been granted the permission,
+   * <code>false</code> otherwise
    */
-  public abstract boolean checkPermission(Principal user, Permission perm);
+  boolean checkPermission(Principal user, Permission perm);
 
   /**
    * This method returns a list of <code>Permission</code>'s that are granted
@@ -138,12 +142,12 @@ public interface Acl extends Owner
    *
    * @return A list of permissions for the <code>Principal</code>.
    */
-  public abstract Enumeration getPermissions(Principal user);
+  Enumeration getPermissions(Principal user);
 
   /**
    * This method returns the ACL as a <code>String</code>
    *
    * @return A <code>String</code> representation of this ACL
    */
-  public abstract String toString();
+  String toString();
 }
diff --git a/libjava/java/security/acl/AclEntry.java b/libjava/java/security/acl/AclEntry.java
index 4c3b6cdc30a..0cb99a81818 100644
--- a/libjava/java/security/acl/AclEntry.java
+++ b/libjava/java/security/acl/AclEntry.java
@@ -63,7 +63,7 @@ public interface AclEntry extends Cloneable
    *
    * @return The <code>Principal</code> for this ACL entry
    */
-  public abstract Principal getPrincipal();
+  Principal getPrincipal();
 
   /**
    * This method sets ths <code>Principal</code> associated with this
@@ -74,7 +74,7 @@ public interface AclEntry extends Cloneable
    *
    * @return <code>true</code> if the <code>Principal</code> was successfully set or <code>false</code> if this entry already has a <code>Principal</code>.
    */
-  public abstract boolean setPrincipal(Principal user);
+  boolean setPrincipal(Principal user);
 
   /**
    * This method sets this ACL entry to be a <em>negative</em> entry, indicating
@@ -82,14 +82,14 @@ public interface AclEntry extends Cloneable
    * to the entry's <code>Principal</code>.  Note that there is no way to
    * undo this operation.
    */
-  public abstract void setNegativePermissions();
+  void setNegativePermissions();
 
   /**
    * This method tests whether or not this ACL entry is a negative entry or not.
    *
    * @return <code>true</code> if this ACL entry is negative, <code>false</code> otherwise
    */
-  public abstract boolean isNegative();
+  boolean isNegative();
 
   /**
    * This method adds the specified permission to this ACL entry.
@@ -98,7 +98,7 @@ public interface AclEntry extends Cloneable
    *
    * @return <code>true</code> if the permission was added or <code>false</code> if it was already set for this entry
    */
-  public abstract boolean addPermission(Permission permission);
+  boolean addPermission(Permission permission);
 
   /**
    * This method deletes the specified permission to this ACL entry.
@@ -107,7 +107,7 @@ public interface AclEntry extends Cloneable
    *
    * @return <code>true</code> if the permission was successfully deleted or <code>false</code> if the permission was not part of this ACL to begin with
    */
-  public abstract boolean removePermission(Permission perm);
+  boolean removePermission(Permission perm);
 
   /**
    * This method tests whether or not the specified permission is associated
@@ -117,7 +117,7 @@ public interface AclEntry extends Cloneable
    *
    * @return <code>true</code> if this permission is associated with this entry or <code>false</code> otherwise
    */
-  public abstract boolean checkPermission(Permission permission);
+  boolean checkPermission(Permission permission);
 
   /**
    * This method returns a list of all <code>Permission</code> objects
@@ -125,19 +125,19 @@ public interface AclEntry extends Cloneable
    *
    * @return A list of permissions for this ACL entry
    */
-  public abstract Enumeration permissions();
+  Enumeration permissions();
 
   /**
    * This method returns this object as a <code>String</code>.
    *
    * @return A <code>String</code> representation of this object
    */
-  public abstract String toString();
+  String toString();
 
   /**
    * This method returns a clone of this ACL entry
    *
    * @return A clone of this ACL entry
    */
-  public abstract Object clone();
+  Object clone();
 }
diff --git a/libjava/java/security/acl/Group.java b/libjava/java/security/acl/Group.java
index 281af24d05e..10718a76b7e 100644
--- a/libjava/java/security/acl/Group.java
+++ b/libjava/java/security/acl/Group.java
@@ -59,7 +59,7 @@ public interface Group extends Principal
    *
    * @return <code>true</code> if the user was successfully added or <code>false</code> if the user is already a member
    */
-  public abstract boolean addMember(Principal user);
+  boolean addMember(Principal user);
 
   /**
    * This method deletes a member from the group.
@@ -68,7 +68,7 @@ public interface Group extends Principal
    *
    * @return <code>true</code> if the user was successfully deleted or <code>false</code> if the user is not a member of the group
    */
-  public abstract boolean removeMember(Principal user);
+  boolean removeMember(Principal user);
 
   /**
    * This method tests whether or not a given <code>Principal</code> is a
@@ -78,7 +78,7 @@ public interface Group extends Principal
    *
    * @return <code>true</code> if the user is member, <code>false</code> otherwise
    */
-  public abstract boolean isMember(Principal member);
+  boolean isMember(Principal member);
 
   /**
    * This method returns a list of all members of the group as an 
@@ -86,5 +86,5 @@ public interface Group extends Principal
    *
    * @return The list of all members of the group
    */
-  public abstract Enumeration members();
+  Enumeration members();
 }
diff --git a/libjava/java/security/acl/Owner.java b/libjava/java/security/acl/Owner.java
index e34e412bb6c..7732fc7f7b0 100644
--- a/libjava/java/security/acl/Owner.java
+++ b/libjava/java/security/acl/Owner.java
@@ -64,7 +64,7 @@ public interface Owner
    *
    * @exception NotOwnerException If the caller is not already an owner of this ACL
    */
-  public abstract boolean addOwner(Principal caller, Principal owner) 
+  boolean addOwner(Principal caller, Principal owner) 
     throws NotOwnerException;
 
   /**
@@ -82,7 +82,7 @@ public interface Owner
    * @exception NotOwnerException If the caller is not already an owner of this ACL
    * @exception LastOwnerException If completing the operation would delete the last ACL owner
    */
-  public abstract boolean deleteOwner(Principal caller, Principal owner) 
+  boolean deleteOwner(Principal caller, Principal owner) 
     throws NotOwnerException, LastOwnerException;
 
   /**
@@ -91,5 +91,5 @@ public interface Owner
    *
    * @return <code>true</code> if the <code>Principal</code> is an owner, <code>false</code> otherwise
    */
-  public abstract boolean isOwner(Principal owner);
+  boolean isOwner(Principal owner);
 }
diff --git a/libjava/java/security/acl/Permission.java b/libjava/java/security/acl/Permission.java
index 7112523dffe..ca5000f8bbc 100644
--- a/libjava/java/security/acl/Permission.java
+++ b/libjava/java/security/acl/Permission.java
@@ -56,12 +56,12 @@ public interface Permission
    *
    * @return <code>true</code> if the specified permission is the same as this one, <code>false</code> otherwise
    */
-  public abstract boolean equals(Object perm);
+  boolean equals (Object perm);
 
   /**
    * This method returns this <code>Permission</code> as a <code>String</code>.
    *
    * @return A <code>String</code> representing this permission.
    */
-  public String toString();
+  String toString();
 }
diff --git a/libjava/java/security/cert/X509Extension.java b/libjava/java/security/cert/X509Extension.java
index c0fe0200ceb..8e33bb5ad4a 100644
--- a/libjava/java/security/cert/X509Extension.java
+++ b/libjava/java/security/cert/X509Extension.java
@@ -81,7 +81,7 @@ public interface X509Extension
 
      @return true if has unsupported extension, false otherwise	
   */
-  public boolean hasUnsupportedCriticalExtension();
+  boolean hasUnsupportedCriticalExtension();
 
   /**
      Returns a set of the CRITICAL extension OIDs from the 
@@ -91,7 +91,7 @@ public interface X509Extension
      @return A Set containing the OIDs. If there are no CRITICAL
      extensions or extensions at all this returns null.
   */
-  public Set getCriticalExtensionOIDs();
+  Set getCriticalExtensionOIDs();
 
   /**
      Returns a set of the NON-CRITICAL extension OIDs from the 
@@ -101,13 +101,13 @@ public interface X509Extension
      @return A Set containing the OIDs. If there are no NON-CRITICAL
      extensions or extensions at all this returns null.
   */
-  public Set getNonCriticalExtensionOIDs();
+  Set getNonCriticalExtensionOIDs();
 
   /**
      Returns the DER encoded OCTET string for the specified
      extension value identified by a OID. The OID is a string
      of number separated by periods. Ex: 12.23.45.67
   */
-  public byte[] getExtensionValue(String oid);
+  byte[] getExtensionValue(String oid);
 
 }
diff --git a/libjava/java/security/interfaces/DSAKey.java b/libjava/java/security/interfaces/DSAKey.java
index b2eb80240ae..ea0aa1a4b70 100644
--- a/libjava/java/security/interfaces/DSAKey.java
+++ b/libjava/java/security/interfaces/DSAKey.java
@@ -52,5 +52,5 @@ public interface DSAKey
    *
    * @return The DSA parameters
    */
-  public abstract DSAParams getParams();
+  DSAParams getParams();
 }
diff --git a/libjava/java/security/interfaces/DSAKeyPairGenerator.java b/libjava/java/security/interfaces/DSAKeyPairGenerator.java
index d888bed699c..dc957a31881 100644
--- a/libjava/java/security/interfaces/DSAKeyPairGenerator.java
+++ b/libjava/java/security/interfaces/DSAKeyPairGenerator.java
@@ -62,7 +62,7 @@ public interface DSAKeyPairGenerator
    *
    * @exception InvalidParameterException If the parameters passed are not valid
    */
-  public abstract void initialize(DSAParams params, SecureRandom random)
+  void initialize (DSAParams params, SecureRandom random)
     throws InvalidParameterException;
 
   /**
@@ -80,7 +80,6 @@ public interface DSAKeyPairGenerator
    *
    * @exception InvalidParameterException If a parameter is invalid
    */
-  public abstract void initialize(int modlen, boolean genParams, 
-				  SecureRandom random)
+  void initialize (int modlen, boolean genParams, SecureRandom random)
     throws InvalidParameterException;
 }
diff --git a/libjava/java/security/interfaces/DSAParams.java b/libjava/java/security/interfaces/DSAParams.java
index f72fad80987..5239abe05de 100644
--- a/libjava/java/security/interfaces/DSAParams.java
+++ b/libjava/java/security/interfaces/DSAParams.java
@@ -54,19 +54,19 @@ public interface DSAParams
    *
    * @return The DSA base value
    */
-  public abstract BigInteger getG();
+  BigInteger getG();
 
   /**
    * Returns the prime, or 'p' value
    *
    * @return The DSA prime value
    */
-  public abstract BigInteger getP();
+  BigInteger getP();
 
   /**
    * Returns the subprime, or 'q' value
    *
    * @return The DSA subprime value
    */
-  public abstract BigInteger getQ();
+  BigInteger getQ();
 }
diff --git a/libjava/java/security/interfaces/DSAPrivateKey.java b/libjava/java/security/interfaces/DSAPrivateKey.java
index ae4d3519801..201d54f2f30 100644
--- a/libjava/java/security/interfaces/DSAPrivateKey.java
+++ b/libjava/java/security/interfaces/DSAPrivateKey.java
@@ -52,5 +52,5 @@ public interface DSAPrivateKey extends DSAKey, PrivateKey
   /**
    * This method returns the value of the DSA private key
    */
-  public BigInteger getX();
+  BigInteger getX();
 }
diff --git a/libjava/java/security/interfaces/DSAPublicKey.java b/libjava/java/security/interfaces/DSAPublicKey.java
index 3575dd76816..74f24482dcf 100644
--- a/libjava/java/security/interfaces/DSAPublicKey.java
+++ b/libjava/java/security/interfaces/DSAPublicKey.java
@@ -52,5 +52,5 @@ public interface DSAPublicKey extends DSAKey, PublicKey
   /**
    * This method returns the value of the DSA public key
    */
-  public BigInteger getY();
+  BigInteger getY();
 }
diff --git a/libjava/java/security/interfaces/RSAKey.java b/libjava/java/security/interfaces/RSAKey.java
index 1541884e75c..83cc286cfe0 100644
--- a/libjava/java/security/interfaces/RSAKey.java
+++ b/libjava/java/security/interfaces/RSAKey.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package java.security.interfaces;
 
+import java.math.BigInteger;
+
 /**
    A generic RSA Key interface for public and private keys
 
@@ -51,5 +53,5 @@ public interface RSAKey
 
      @returns a modulus
    */
-  public java.math.BigInteger getModulus();
+  BigInteger getModulus();
 }
diff --git a/libjava/java/security/interfaces/RSAPrivateCrtKey.java b/libjava/java/security/interfaces/RSAPrivateCrtKey.java
index 1e2dfa05248..8af1bb9168e 100644
--- a/libjava/java/security/interfaces/RSAPrivateCrtKey.java
+++ b/libjava/java/security/interfaces/RSAPrivateCrtKey.java
@@ -54,40 +54,40 @@ public interface RSAPrivateCrtKey extends RSAPrivateKey
    *
    * @return The public exponent for this key
    */
-  public abstract BigInteger getPublicExponent();
+  BigInteger getPublicExponent();
 
   /**
    * Returns the primeP value
    *
    * @return The primeP value
    */
-  public abstract BigInteger getPrimeP();
+  BigInteger getPrimeP();
 
   /**
    * Returns the primeQ value
    *
    * @return The primeQ value
    */
-  public abstract BigInteger getPrimeQ();
+  BigInteger getPrimeQ();
 
   /**
    * Returns the primeExponentP
    *
    * @return The primeExponentP
    */
-  public abstract BigInteger getPrimeExponentP();
+  BigInteger getPrimeExponentP();
 
   /**
    * Returns the primeExponentQ
    *
    * @return The primeExponentQ
    */
-  public abstract BigInteger getPrimeExponentQ();
+  BigInteger getPrimeExponentQ();
 
   /**
    * Returns the CRT coefficient
    *
    * @return The CRT coefficient
    */
-  public abstract BigInteger getCrtCoefficient();
+  BigInteger getCrtCoefficient();
 }
diff --git a/libjava/java/security/interfaces/RSAPrivateKey.java b/libjava/java/security/interfaces/RSAPrivateKey.java
index e0bc4b90ea2..34b9798b627 100644
--- a/libjava/java/security/interfaces/RSAPrivateKey.java
+++ b/libjava/java/security/interfaces/RSAPrivateKey.java
@@ -54,5 +54,5 @@ public interface RSAPrivateKey extends PrivateKey, RSAKey
    *
    * @return The private exponent value for this key
    */
-  public abstract BigInteger getPrivateExponent();
+  BigInteger getPrivateExponent();
 }
diff --git a/libjava/java/security/interfaces/RSAPublicKey.java b/libjava/java/security/interfaces/RSAPublicKey.java
index 743d86c69de..b9b532cd9b0 100644
--- a/libjava/java/security/interfaces/RSAPublicKey.java
+++ b/libjava/java/security/interfaces/RSAPublicKey.java
@@ -54,5 +54,5 @@ public interface RSAPublicKey extends PublicKey, RSAKey
    *
    * @return The public exponent value for this key
    */
-  public abstract BigInteger getPublicExponent();
+  BigInteger getPublicExponent();
 }