java.security.IdentityScope

["Raif S. Naffah" <raif at fl dot net dot au>]

hello there,

this patch addresses JDK 1.4 compatibility.

cheers;
rsn

in ChangeLog (in libjava), add:

2003-03-03  Raif S. Naffah  <raif at fl dot net dot au>

	* java.security.IdentityScope: added SVUID + documentation +
	fixed javadoc tags.


cvs -z9 diff -u -wb -B IdentityScope.java (in directory /data/workspace/cvs/gcc/libjava/java/security/)
Index: IdentityScope.java
===================================================================
RCS file: /cvsroot/gcc/gcc/libjava/java/security/IdentityScope.java,v
retrieving revision 1.2
diff -u -w -b -B -r1.2 IdentityScope.java
--- IdentityScope.java	22 Jan 2002 22:40:30 -0000	1.2
+++ IdentityScope.java	2 Mar 2003 17:57:19 -0000
@@ -50,19 +50,19 @@
 
    No identity within the same scope can have the same public key.
 
-   @since JDK 1.1
-
-   @deprecated Use java.security.KeyStore, the java.security.cert 
-   package, and java.security.Principal. 
-
    @author Mark Benvenuto       
+   @since 1.1
+   @deprecated This class is no longer used. Its functionality has been replaced
+   by <code>java.security.KeyStore</code>, the <code>java.security.cert</code>
+   package, and <code>java.security.Principal</code>.
  */
 public abstract class IdentityScope extends Identity
 {
+  static final long serialVersionUID = -2337346281189773310L;
   private static IdentityScope systemScope = null;
 
   /**
-     Creates a new instance of IdentityScope from Serialized Data
+     Creates a new instance of IdentityScope from Serialized Data.
    */
   protected IdentityScope()
   {
@@ -73,7 +73,7 @@
      Creates a new instance of IdentityScope with the specified name 
      and no scope.
 
-     @param name the name to use
+     @param name the name to use.
    */
   public IdentityScope(String name)
   {
@@ -84,11 +84,9 @@
      Creates a new instance of IdentityScope with the specified name 
      and IdentityScope.
 
-     @param name the name to use
-     @param scope the scope to use
-
-     @throws KeyManagementException if the identity scope is already 
-     present
+     @param name the name to use.
+     @param scope the scope to use.
+     @throws KeyManagementException if the identity scope is already present.
    */
   public IdentityScope(String name, IdentityScope scope)
     throws KeyManagementException
@@ -115,10 +113,9 @@
      This class checks the security manager with the call 
      checkSecurityAccess with "setSystemScope".
 
-     @param scope the new sustem scope
-
+     @param scope the new sustem scope.
      @throws SecurityException - if the security manager denies 
-     access to "setSystemScope"
+     access to "setSystemScope".
    */
   protected static void setSystemScope(IdentityScope scope)
   {
@@ -132,7 +129,7 @@
   /**
      Gets the number of entries within this IdentityScope.
 
-     @returns the number of entries
+     @return the number of entries.
    */
   public abstract int size();
 
@@ -140,10 +137,9 @@
      Gets the specified Identity within this scope
      by specified name.
 
-     @param name name of Identity to get
-
-     @returns an identity representing the name or null if it 
-     cannot be found
+     @param name name of Identity to get.
+     @return an identity representing the name or null if it
+     cannot be found.
    */
   public abstract Identity getIdentity(String name);
 
@@ -151,10 +147,9 @@
      Gets the specified Identity within this scope
      by the specified Principal.
 
-     @param principal The Principal of the Identity to get
-
-     @returns an identity representing the principal or null if it 
-     cannot be found
+     @param principal The Principal of the Identity to get.
+     @return an identity representing the principal or null if it
+     cannot be found.
    */
   public Identity getIdentity(Principal principal)
   {
@@ -165,18 +160,16 @@
      Gets the specified Identity within this scope
      by the specified public key.
 
-     @param key the PublicKey of the Identity to get
-
-     @returns an identity representing the public key or null if it 
-     cannot be found
+     @param key the PublicKey of the Identity to get.
+     @return an identity representing the public key or null if it
+     cannot be found.
    */
   public abstract Identity getIdentity(PublicKey key);
 
   /**
      Adds an identity to his scope.
 
-     @param identity the identity to add
-
+     @param identity the identity to add.
      @throws KeyManagementException if it is an invalid identity,
      an identity with the same key exists, or another error
      occurs.
@@ -187,8 +180,7 @@
   /**
      Removes an identity to his scope.
 
-     @param identity the identity to remove
-
+     @param identity the identity to remove.
      @throws KeyManagementException if it is a missing identity, 
      or another error occurs.
    */
@@ -198,7 +190,7 @@
   /**
      Returns an Enumeration of identities.
 
-     @returns an enumeration of the identities.
+     @return an enumeration of the identities.
    */
   public abstract Enumeration identities();
 
@@ -206,11 +198,10 @@
      Returns a string representing this IdentityScope.
      It includes the name, the scope name, and number of identities.
 
-     @returns a string representing this IdentityScope.
+     @return a string representing this IdentityScope.
    */
   public String toString()
   {
-    return (super.getName() + " " + super.getScope().getName()
-	    + " " + size());
+    return (super.getName() + " " + super.getScope().getName() + " " + size());
   }
 }