2004-07-09 Michael Koch <konqueror@gmx.de>

	* java/security/AccessControlContext.java,
	java/security/SecureClassLoader.java:
	Fixed javadocs.


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

2 files changed, 69 insertions, 72 deletions

diff --git a/libjava/java/security/AccessControlContext.java b/libjava/java/security/AccessControlContext.java
index 5b9ac4a2548..62370224d11 100644
--- a/libjava/java/security/AccessControlContext.java
+++ b/libjava/java/security/AccessControlContext.java
@@ -1,5 +1,5 @@
 /* AccessControlContext.java --- Access Control Context Class
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,18 +38,18 @@ exception statement from your version. */
 package java.security;
 
 /**
-   AccessControlContext makes system resource access decsion 
-   based on permission rights.  
-
-   It is used for a specific context and has only one method
-   checkPermission. It is similar to AccessController except
-   that it makes decsions based on the current context instead
-   of the the current thread.
-
-   It is created by call AccessController.getContext method.
-
-   @author Mark Benvenuto
-   @since JDK 1.2
+ * AccessControlContext makes system resource access decsion 
+ * based on permission rights.  
+ *
+ * It is used for a specific context and has only one method
+ * checkPermission. It is similar to AccessController except
+ * that it makes decsions based on the current context instead
+ * of the the current thread.
+ *
+ * It is created by call AccessController.getContext method.
+ *
+ * @author Mark Benvenuto
+ * @since 1.2
  */
 public final class AccessControlContext
 {
@@ -57,11 +57,11 @@ public final class AccessControlContext
   private DomainCombiner combiner;
 
   /**
-     Construct a new AccessControlContext with the specified
-     ProtectionDomains. <code>context</code> must not be 
-     null and duplicates will be removed.
-
-     @param context The ProtectionDomains to use
+   * Construct a new AccessControlContext with the specified
+   * ProtectionDomains. <code>context</code> must not be 
+   * null and duplicates will be removed.
+   *
+   * @param context The ProtectionDomains to use
    */
   public AccessControlContext(ProtectionDomain[]context)
   {
@@ -91,12 +91,10 @@ public final class AccessControlContext
   }
 
   /**
-     Construct a new AccessControlContext with the specified
-     ProtectionDomains and DomainCombiner
-
-     @param context The ProtectionDomains to use
-
-     @since JDK 1.3
+   * Construct a new AccessControlContext with the specified
+   * ProtectionDomains and DomainCombiner
+   *
+   * @since 1.3
    */
   public AccessControlContext(AccessControlContext acc,
 			      DomainCombiner combiner)
@@ -106,9 +104,9 @@ public final class AccessControlContext
   }
 
   /**
-     Returns the Domain Combiner associated with the AccessControlContext
-
-     @returns the DomainCombiner
+   * Returns the Domain Combiner associated with the AccessControlContext
+   *
+   * @return the DomainCombiner
    */
   public DomainCombiner getDomainCombiner()
   {
@@ -116,12 +114,12 @@ public final class AccessControlContext
   }
 
   /**
-     Determines whether or not the specific permission is granted
-     depending on the context it is within. 
-
-     @param perm a permission to check
-
-     @throws AccessControlException if the permssion is not permitted
+   * Determines whether or not the specific permission is granted
+   * depending on the context it is within. 
+   *
+   * @param perm a permission to check
+   *
+   * @throws AccessControlException if the permssion is not permitted
    */
   public void checkPermission(Permission perm) throws AccessControlException
   {
@@ -133,14 +131,14 @@ public final class AccessControlContext
   }
 
   /**
-     Checks if two AccessControlContexts are equal.
-
-     It first checks if obj is an AccessControlContext class, and
-     then checks if each ProtectionDomain matches.
-
-     @param obj The object to compare this class to
-
-     @return true if equal, false otherwise
+   * Checks if two AccessControlContexts are equal.
+   *
+   * It first checks if obj is an AccessControlContext class, and
+   * then checks if each ProtectionDomain matches.
+   *
+   * @param obj The object to compare this class to
+   *
+   * @return true if equal, false otherwise
    */
   public boolean equals(Object obj)
   {
@@ -160,9 +158,9 @@ public final class AccessControlContext
   }
 
   /**
-     Computes a hash code of this class
-
-     @return a hash code representing this class
+   * Computes a hash code of this class
+   *
+   * @return a hash code representing this class
    */
   public int hashCode()
   {
diff --git a/libjava/java/security/SecureClassLoader.java b/libjava/java/security/SecureClassLoader.java
index 5f7ac211bf0..1f67a33dc2c 100644
--- a/libjava/java/security/SecureClassLoader.java
+++ b/libjava/java/security/SecureClassLoader.java
@@ -1,5 +1,5 @@
 /* SecureClassLoader.java --- A Secure Class Loader
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,13 +38,13 @@ exception statement from your version. */
 package java.security;
 
 /**
-   A Secure Class Loader for loading classes with additional 
-   support for specifying code source and permissions when
-   they are retrieved by the system policy handler.
-
-   @since JDK 1.2
-
-   @author Mark Benvenuto
+ * A Secure Class Loader for loading classes with additional 
+ * support for specifying code source and permissions when
+ * they are retrieved by the system policy handler.
+ *
+ * @since 1.2
+ *
+ * @author Mark Benvenuto
  */
 public class SecureClassLoader extends ClassLoader
 {
@@ -64,18 +64,18 @@ public class SecureClassLoader extends ClassLoader
   }
 
   /** 
-     Creates a class using an array of bytes and a 
-     CodeSource.
-
-     @param name the name to give the class.  null if unknown.
-     @param b the data representing the classfile, in classfile format.
-     @param off the offset into the data where the classfile starts.
-     @param len the length of the classfile data in the array.
-     @param cs the CodeSource for the class or null when unknown.
-
-     @return the class that was defined and optional CodeSource.
-
-     @exception ClassFormatError if the byte array is not in proper classfile format.
+   * Creates a class using an array of bytes and a 
+   * CodeSource.
+   *
+   * @param name the name to give the class.  null if unknown.
+   * @param b the data representing the classfile, in classfile format.
+   * @param off the offset into the data where the classfile starts.
+   * @param len the length of the classfile data in the array.
+   * @param cs the CodeSource for the class or null when unknown.
+   *
+   * @return the class that was defined and optional CodeSource.
+   *
+   * @exception ClassFormatError if the byte array is not in proper classfile format.
    */
   protected final Class defineClass(String name, byte[] b, int off, int len,
 				    CodeSource cs)
@@ -92,14 +92,13 @@ public class SecureClassLoader extends ClassLoader
   }
 
   /**
-     Returns a PermissionCollection for the specified CodeSource.
-     The default implementation invokes 
-     java.security.Policy.getPermissions.
-
-     This method is called by defineClass that takes a CodeSource
-     arguement to build a proper ProtectionDomain for the class
-     being defined.
-
+   * Returns a PermissionCollection for the specified CodeSource.
+   * The default implementation invokes 
+   * java.security.Policy.getPermissions.
+   *
+   * This method is called by defineClass that takes a CodeSource
+   * arguement to build a proper ProtectionDomain for the class
+   * being defined.
    */
   protected PermissionCollection getPermissions(CodeSource cs)
   {