harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r451539 - in /incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth: ./ callback/
Date Sat, 30 Sep 2006 04:30:26 GMT
Author: ndbeyer
Date: Fri Sep 29 21:30:25 2006
New Revision: 451539

URL: http://svn.apache.org/viewvc?view=rev&rev=451539
Log:
Remove unnecessary comments, format code and comments.

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/AuthPermission.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/DestroyFailedException.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Destroyable.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Policy.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/PrivateCredentialPermission.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/RefreshFailedException.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Refreshable.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Subject.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/Callback.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/CallbackHandler.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/ChoiceCallback.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/ConfirmationCallback.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/LanguageCallback.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/NameCallback.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/PasswordCallback.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/TextInputCallback.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/TextOutputCallback.java
    incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/UnsupportedCallbackException.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/AuthPermission.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/AuthPermission.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/AuthPermission.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/AuthPermission.java Fri Sep 29 21:30:25 2006
@@ -15,34 +15,21 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth;
 
 import java.security.BasicPermission;
 
 import org.apache.harmony.auth.internal.nls.Messages;
 
-/** 
- * @com.intel.drl.spec_ref 
- * 
- */
-
 public final class AuthPermission extends BasicPermission {
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     private static final long serialVersionUID = 5806031445061587174L;
 
     private static final String CREATE_LOGIN_CONTEXT = "createLoginContext"; //$NON-NLS-1$
 
     private static final String CREATE_LOGIN_CONTEXT_ANY = "createLoginContext.*"; //$NON-NLS-1$
 
-    // inits permission name.  
+    // inits permission name.
     private static String init(String name) {
 
         if (name == null) {
@@ -55,16 +42,10 @@
         return name;
     }
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     public AuthPermission(String name) {
         super(init(name));
     }
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     public AuthPermission(String name, String actions) {
         super(init(name), actions);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/DestroyFailedException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/DestroyFailedException.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/DestroyFailedException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/DestroyFailedException.java Fri Sep 29 21:30:25 2006
@@ -15,35 +15,16 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth;
 
-/** 
- * @com.intel.drl.spec_ref 
- * 
- */
-
 public class DestroyFailedException extends Exception {
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     private static final long serialVersionUID = -7790152857282749162L;
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     public DestroyFailedException() {
         super();
     }
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     public DestroyFailedException(String message) {
         super(message);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Destroyable.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Destroyable.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Destroyable.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Destroyable.java Fri Sep 29 21:30:25 2006
@@ -15,28 +15,12 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth;
 
-/** 
- * @com.intel.drl.spec_ref 
- * 
- */
-
 public interface Destroyable {
-    
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
+
     void destroy() throws DestroyFailedException;
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     boolean isDestroyed();
 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Policy.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Policy.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Policy.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Policy.java Fri Sep 29 21:30:25 2006
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/**
-* @author Alexey V. Varlamov
-* @version $Revision$
-*/
-
 package javax.security.auth;
 
 import java.security.AccessController;
@@ -31,55 +26,35 @@
 import org.apache.harmony.auth.DefaultSubjectPolicy;
 import org.apache.harmony.auth.internal.nls.Messages;
 
-
 /**
- * @com.intel.drl.spec_ref
- * 
  * @deprecated Use
- *             {@link java.security.Policy#getPermissions(java.security.ProtectionDomain)
- *             Policy.getPermissions(ProtectionDomain)} and
- *             {@link java.security.ProtectionDomain#ProtectionDomain(java.security.CodeSource, java.security.PermissionCollection, ClassLoader, java.security.Principal[])
- *             ProtectionDomain(CodeSource, PermissionCollection, ClassLoader,
- *             Principal[]} to establish a policy's permissions for a principal.
+ *             {@link java.security.Policy#getPermissions(java.security.ProtectionDomain)}
+ *             and
+ *             {@link java.security.ProtectionDomain#ProtectionDomain(java.security.CodeSource, java.security.PermissionCollection, ClassLoader, java.security.Principal[])}
+ *             to establish a policy's permissions for a principal.
  */
 @Deprecated
-public abstract class Policy 
-{
-
+public abstract class Policy {
     // Key to security properties, defining default policy provider.
     private static final String POLICY_PROVIDER = "auth.policy.provider"; //$NON-NLS-1$
 
     // The AuthPermission required to set custom Policy.
-    private static final AuthPermission SET_POLICY = new AuthPermission(
-            "setPolicy"); //$NON-NLS-1$
+    private static final AuthPermission SET_POLICY = new AuthPermission("setPolicy"); //$NON-NLS-1$
 
     // The AuthPermission required to get current Policy.
-    private static final AuthPermission GET_POLICY = new AuthPermission(
-            "getPolicy"); //$NON-NLS-1$
+    private static final AuthPermission GET_POLICY = new AuthPermission("getPolicy"); //$NON-NLS-1$
 
     // the current policy object
     private static Policy activePolicy;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
-    public abstract PermissionCollection getPermissions(Subject subject,
-            CodeSource cs);
+    public abstract PermissionCollection getPermissions(Subject subject, CodeSource cs);
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public abstract void refresh();
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     protected Policy() {
+        super();
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public static Policy getPolicy() {
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -90,8 +65,8 @@
     }
 
     /**
-     * Shortcut accessor for friendly classes, to skip security checks.
-     * If active policy was set to <code>null</code>, tries to load a default 
+     * Shortcut accessor for friendly classes, to skip security checks. If
+     * active policy was set to <code>null</code>, tries to load a default
      * provider, so this method never returns <code>null</code>. <br>
      * This method is synchronized with setPolicy()
      */
@@ -99,7 +74,7 @@
         Policy current = activePolicy;
         if (current == null) {
             synchronized (Policy.class) {
-                // double check in case value has been reassigned 
+                // double check in case value has been reassigned
                 // while we've been awaiting monitor
                 if (activePolicy == null) {
                     activePolicy = getDefaultProvider();
@@ -110,14 +85,14 @@
         return current;
     }
 
-    // Reads name of default policy provider from security.properties,
-    // loads the class and instantiates the provider.<br> 
-    // In case of any exception, wraps it with SecurityException and throws
-    // further.
+    /**
+     * Reads name of default policy provider from security.properties, loads the
+     * class and instantiates the provider. In case of any exception, wraps it
+     * with SecurityException and throws further.
+     */
     private static final Policy getDefaultProvider() {
         final String defaultClass = AccessController
-                .doPrivileged(new PolicyUtils.SecurityPropertyAccessor(
-                        POLICY_PROVIDER));
+                .doPrivileged(new PolicyUtils.SecurityPropertyAccessor(POLICY_PROVIDER));
 
         if (defaultClass == null) {
             return new DefaultSubjectPolicy();
@@ -126,11 +101,11 @@
         Object policy = AccessController.doPrivileged(new PrivilegedAction<Object>() {
             public Object run() {
                 try {
-                    return Class.forName(defaultClass, true,
-                            ClassLoader.getSystemClassLoader()).newInstance();
+                    return Class
+                            .forName(defaultClass, true, ClassLoader.getSystemClassLoader())
+                            .newInstance();
                 } catch (Exception e) {
-                    SecurityException se = new SecurityException(
-                            Messages.getString("auth.08")); //$NON-NLS-1$
+                    SecurityException se = new SecurityException(Messages.getString("auth.08")); //$NON-NLS-1$
                     se.initCause(e);
                     throw se;
                 }
@@ -143,9 +118,6 @@
         return (Policy) policy;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public static void setPolicy(Policy policy) {
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/PrivateCredentialPermission.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/PrivateCredentialPermission.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/PrivateCredentialPermission.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/PrivateCredentialPermission.java Fri Sep 29 21:30:25 2006
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/**
-* @author Stepan M. Mishura, Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth;
 
 import java.io.IOException;
@@ -32,33 +27,63 @@
 
 import org.apache.harmony.auth.internal.nls.Messages;
 
-/** 
- * @com.intel.drl.spec_ref 
- *
- */
-
 public final class PrivateCredentialPermission extends Permission {
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     private static final long serialVersionUID = 5284372143517237068L;
 
     // allowed action
     private static final String READ = "read"; //$NON-NLS-1$
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     private String credentialClass;
 
     // current offset        
     private transient int offset;
+
     // owners set
     private transient CredOwner[] set;
+    
+    public PrivateCredentialPermission(String name, String action) {
+        super(name);
+        if (READ.equalsIgnoreCase(action)) {
+            initTargetName(name);
+        } else {
+            throw new IllegalArgumentException(Messages.getString("auth.11")); //$NON-NLS-1$
+        }
+    }
+
+    /**
+     * Creates a <code>PrivateCredentialPermission</code> from the Credential Class 
+     * and Set of Principals
+     * 
+     * @param credentialClass - credential class name
+     * @param principals - principal set
+     */
+    PrivateCredentialPermission(String credentialClass, Set<Principal> principals) {
+        super(credentialClass);
+        this.credentialClass = credentialClass;
 
-    // Initialize a PivateCredentialPermission object and checks that a target name has 
-    // a correct format: CredentialClass 1*(PrincipalClass "PrincipalName")
+        set = new CredOwner[principals.size()];
+        for (Principal p : principals) {
+            CredOwner element = new CredOwner(p.getClass().getName(), p.getName());
+            // check for duplicate elements
+            boolean found = false;
+            for (int ii = 0; ii < offset; ii++) {
+                if (set[ii].equals(element)) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                set[offset++] = element;
+            }
+        }
+    }
+
+    /**
+     * Initialize a PivateCredentialPermission object and checks that a target
+     * name has a correct format: CredentialClass 1*(PrincipalClass
+     * "PrincipalName")
+     */
     private void initTargetName(String name) {
 
         if (name == null) {
@@ -74,8 +99,7 @@
         // get CredentialClass
         int beg = name.indexOf(' ');
         if (beg == -1) {
-            throw new IllegalArgumentException(
-                    Messages.getString("auth.10")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("auth.10")); //$NON-NLS-1$
         }
         credentialClass = name.substring(0, beg);
 
@@ -88,15 +112,13 @@
             j = name.indexOf('"', i + 2);
 
             if (i == -1 || j == -1 || name.charAt(i + 1) != '"') {
-                throw new IllegalArgumentException(
-                        Messages.getString("auth.10")); //$NON-NLS-1$
+                throw new IllegalArgumentException(Messages.getString("auth.10")); //$NON-NLS-1$
             }
         }
 
         // name MUST have one pair at least
         if (count < 1) {
-            throw new IllegalArgumentException(
-                    Messages.getString("auth.10")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("auth.10")); //$NON-NLS-1$
         }
 
         beg = name.indexOf(' ');
@@ -129,60 +151,11 @@
         }
     }
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
-    private void readObject(ObjectInputStream ois) throws IOException,
-            ClassNotFoundException {
+    private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
         ois.defaultReadObject();
         initTargetName(getName());
     }
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
-    public PrivateCredentialPermission(String name, String action) {
-        super(name);
-        if (READ.equalsIgnoreCase(action)) {
-            initTargetName(name);
-        } else {
-            throw new IllegalArgumentException(Messages.getString("auth.11")); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Creates a <code>PrivateCredentialPermission</code> from the Credential Class 
-     * and Set of Principals
-     * 
-     * @param credentialClass - credential class name
-     * @param principals - principal set
-     */
-    PrivateCredentialPermission(String credentialClass, Set<Principal> principals) {
-
-        super(credentialClass);
-        this.credentialClass = credentialClass;
-
-        set = new CredOwner[principals.size()];
-        for (Principal p : principals) {
-            CredOwner element = new CredOwner(p.getClass().getName(), p
-                    .getName());
-            // check for duplicate elements
-            boolean found = false;
-            for (int ii = 0; ii < offset; ii++) {
-                if (set[ii].equals(element)) {
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) {
-                set[offset++] = element;
-            }
-        }
-    }
-
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     public String[][] getPrincipals() {
 
         String[][] s = new String[offset][2];
@@ -194,24 +167,15 @@
         return s;
     }
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     @Override
     public String getActions() {
         return READ;
     }
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     public String getCredentialClass() {
         return credentialClass;
     }
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     @Override
     public int hashCode() {
         int hash = 0;
@@ -221,9 +185,6 @@
         return getCredentialClass().hashCode() + hash;
     }
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     @Override
     public boolean equals(Object obj) {
         if (obj == this) {
@@ -236,14 +197,10 @@
 
         PrivateCredentialPermission that = (PrivateCredentialPermission) obj;
 
-        return credentialClass.equals(that.credentialClass) &&
-                (offset == that.offset) &&
-                sameMembers(set, that.set, offset);
+        return credentialClass.equals(that.credentialClass) && (offset == that.offset)
+                && sameMembers(set, that.set, offset);
     }
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     @Override
     public boolean implies(Permission permission) {
 
@@ -279,16 +236,15 @@
         return true;
     }
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     @Override
     public PermissionCollection newPermissionCollection() {
         return null;
     }
-    
-    // Returns true if the two arrays have the same length, 
-    // and every member of one array is contained in another array 
+
+    /**
+     * Returns true if the two arrays have the same length, and every member of
+     * one array is contained in another array
+     */
     private boolean sameMembers(Object[] ar1, Object[] ar2, int length) {
         if (ar1 == null && ar2 == null) {
             return true;
@@ -312,34 +268,23 @@
         return true;
     }
 
-    /** 
-     * @com.intel.drl.spec_ref
-     *
-     */
     private static final class CredOwner implements Serializable {
 
-        /** 
-         * @com.intel.drl.spec_ref 
-         */
         private static final long serialVersionUID = -5607449830436408266L;
 
-        /** 
-         * @com.intel.drl.spec_ref 
-         */
         String principalClass;
 
-        /** 
-         * @com.intel.drl.spec_ref 
-         */
         String principalName;
+
         // whether class name contains wildcards
         private transient boolean isClassWildcard;
+
         // whether pname contains wildcards
         private transient boolean isPNameWildcard;
 
         // Creates a new CredOwner with the specified Principal Class and Principal Name 
         CredOwner(String principalClass, String principalName) {
-
+            super();
             if ("*".equals(principalClass)) { //$NON-NLS-1$
                 isClassWildcard = true;
             }
@@ -349,8 +294,7 @@
             }
 
             if (isClassWildcard && !isPNameWildcard) {
-                throw new IllegalArgumentException(
-                        Messages.getString("auth.12")); //$NON-NLS-1$
+                throw new IllegalArgumentException(Messages.getString("auth.12")); //$NON-NLS-1$
             }
 
             this.principalClass = principalClass;
@@ -365,10 +309,8 @@
 
             CredOwner co = (CredOwner) obj;
 
-            if (isClassWildcard
-                    || principalClass.equals(co.principalClass)) {
-                if (isPNameWildcard
-                        || principalName.equals(co.principalName)) {
+            if (isClassWildcard || principalClass.equals(co.principalClass)) {
+                if (isPNameWildcard || principalName.equals(co.principalName)) {
                     return true;
                 }
             }
@@ -379,8 +321,7 @@
         @Override
         public boolean equals(Object obj) {
             return principalClass.equals(((CredOwner) obj).principalClass)
-                    && principalName
-                            .equals(((CredOwner) obj).principalName);
+                    && principalName.equals(((CredOwner) obj).principalName);
         }
 
         // Returns the hash code value for this object.
@@ -389,4 +330,4 @@
             return principalClass.hashCode() + principalName.hashCode();
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/RefreshFailedException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/RefreshFailedException.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/RefreshFailedException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/RefreshFailedException.java Fri Sep 29 21:30:25 2006
@@ -15,36 +15,17 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth;
 
-/** 
- * @com.intel.drl.spec_ref 
- * 
- */
-
 public class RefreshFailedException extends Exception {
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     private static final long serialVersionUID = 5058444488565265840L;
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     public RefreshFailedException() {
         super();
     }
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
     public RefreshFailedException(String message) {
         super(message);
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Refreshable.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Refreshable.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Refreshable.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Refreshable.java Fri Sep 29 21:30:25 2006
@@ -15,28 +15,12 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth;
 
-/**
- * @com.intel.drl.spec_ref
- *  
- */
-
 public interface Refreshable {
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
-    public void refresh() throws RefreshFailedException;
+    void refresh() throws RefreshFailedException;
 
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
-    public boolean isCurrent();
+    boolean isCurrent();
 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Subject.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Subject.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Subject.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/Subject.java Fri Sep 29 21:30:25 2006
@@ -345,24 +345,23 @@
 
         private LinkedList<SST> elements;
 
-        //
-        // Is used to define a set type for serialization.
-        //
-        // A type can be principal, priv. or pub. credential set.
-        // The spec. doesn't clearly says that priv. and pub. credential
-        // sets can be serialized and what classes they are.
-        // It is only possible to figure out from writeObject method
-        // comments that priv. credential set is serializable and it is
-        // an instance of SecureSet class. So pub. credential was
-        // implemented by analogy
-        //
-        // Compatibility issue: the class follows its specified serial form.
-        // Also according to the serialization spec. adding new field is a
-        // compatible change. So is ok for principal set (because the default
-        // value for integer is zero). But priv. or pub. credential set
-        // it is not compatible because most probably other implementations
-        // resolve this issue in other way
-        //
+        /*
+         * Is used to define a set type for serialization.
+         * 
+         * A type can be principal, priv. or pub. credential set. The spec.
+         * doesn't clearly says that priv. and pub. credential sets can be
+         * serialized and what classes they are. It is only possible to figure
+         * out from writeObject method comments that priv. credential set is
+         * serializable and it is an instance of SecureSet class. So pub.
+         * credential was implemented by analogy
+         * 
+         * Compatibility issue: the class follows its specified serial form.
+         * Also according to the serialization spec. adding new field is a
+         * compatible change. So is ok for principal set (because the default
+         * value for integer is zero). But priv. or pub. credential set it is
+         * not compatible because most probably other implementations resolve
+         * this issue in other way
+         */
         private int setType;
 
         // Defines principal set for serialization.
@@ -412,8 +411,10 @@
             }
         }
 
-        // verifies specified element, checks set state,
-        // and security permission to modify set before adding new element
+        /*
+         * verifies specified element, checks set state, and security permission
+         * to modify set before adding new element
+         */
         @Override
         public boolean add(SST o) {
 
@@ -434,21 +435,20 @@
         public Iterator<SST> iterator() {
 
             if (permission == _PRIVATE_CREDENTIALS) {
-
-                // private credential set requires iterator with
-                // additional security check (PrivateCredentialPermission)
+                /*
+                 * private credential set requires iterator with additional
+                 * security check (PrivateCredentialPermission)
+                 */
                 return new SecureIterator(elements.iterator()) {
-
-                    // checks permission to access next private credential
-                    // moves to the next element even SecurityException was thrown
+                    /*
+                     * checks permission to access next private credential moves
+                     * to the next element even SecurityException was thrown
+                     */
                     @Override
                     public SST next() {
-
                         SST obj = iterator.next();
-
                         checkPermission(new PrivateCredentialPermission(obj
                                 .getClass().getName(), principals));
-
                         return obj;
                     }
                 };
@@ -470,8 +470,10 @@
             return elements.size();
         }
 
-        // return set with elements that are instances
-        // or subclasses of the specified class
+        /**
+         * return set with elements that are instances or subclasses of the
+         * specified class
+         */
         protected final <E> Set<E> get(final Class<E> c) {
 
             if (c == null) {
@@ -567,7 +569,9 @@
             out.defaultWriteObject();
         }
 
-        //Represents iterator for subject's secure set
+        /**
+         * Represents iterator for subject's secure set
+         */
         private class SecureIterator implements Iterator<SST> {
             protected Iterator<SST> iterator;
 
@@ -583,8 +587,10 @@
                 return iterator.next();
             }
 
-            // checks set state, and security permission to modify set
-            // before removing current element
+            /**
+             * checks set state, and security permission to modify set before
+             * removing current element
+             */
             public void remove() {
                 checkState();
                 checkPermission(permission);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/SubjectDomainCombiner.java Fri Sep 29 21:30:25 2006
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/**
-* @author Stepan M. Mishura
-* @version $Revision$
-*/
-
 package javax.security.auth;
 
 import java.security.DomainCombiner;
@@ -37,6 +32,7 @@
             "getSubjectFromDomainCombiner"); //$NON-NLS-1$
 
     public SubjectDomainCombiner(Subject subject) {
+        super();
         if (subject == null) {
             throw new NullPointerException();
         }
@@ -44,7 +40,6 @@
     }
 
     public Subject getSubject() {
-
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
             sm.checkPermission(_GET);
@@ -55,7 +50,6 @@
 
     public ProtectionDomain[] combine(ProtectionDomain[] currentDomains,
             ProtectionDomain[] assignedDomains) {
-
         // get array length for combining protection domains
         int len = 0;
         if (currentDomains != null) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/Callback.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/Callback.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/Callback.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/Callback.java Fri Sep 29 21:30:25 2006
@@ -15,17 +15,7 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth.callback;
 
-/**
- * @com.intel.drl.spec_ref
- *
- */
 public interface Callback {
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/CallbackHandler.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/CallbackHandler.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/CallbackHandler.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/CallbackHandler.java Fri Sep 29 21:30:25 2006
@@ -15,24 +15,10 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth.callback;
 
-/**
- * @com.intel.drl.spec_ref
- *
- */
-
 public interface CallbackHandler {
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
-    public void handle(Callback[] callbacks) throws java.io.IOException,
-            UnsupportedCallbackException;
+    void handle(Callback[] callbacks) throws java.io.IOException, UnsupportedCallbackException;
 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/ChoiceCallback.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/ChoiceCallback.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/ChoiceCallback.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/ChoiceCallback.java Fri Sep 29 21:30:25 2006
@@ -15,56 +15,28 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth.callback;
 
 import java.io.Serializable;
 
 import org.apache.harmony.auth.internal.nls.Messages;
 
-/**
- * @com.intel.drl.spec_ref
- *
- */
 public class ChoiceCallback implements Callback, Serializable {
-    
-    /** 
-     * @com.intel.drl.spec_ref 
-     */
-    private static final long serialVersionUID = -3975664071579892167L; 
-
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
+    private static final long serialVersionUID = -3975664071579892167L;
+
     private int defaultChoice;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     private String prompt;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     private boolean multipleSelectionsAllowed;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     private String[] choices;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     private int[] selections;
 
-    // sets the choices.
     private void setChoices(String[] choices) {
-        if (choices == null || choices.length == 0){
+        if (choices == null || choices.length == 0) {
             throw new IllegalArgumentException(Messages.getString("auth.1C")); //$NON-NLS-1$
         }
         for (int i = 0; i < choices.length; i++) {
@@ -77,15 +49,13 @@
 
     }
 
-    // sets the prompt.
     private void setPrompt(String prompt) {
         if (prompt == null || prompt.length() == 0) {
             throw new IllegalArgumentException(Messages.getString("auth.14")); //$NON-NLS-1$
         }
         this.prompt = prompt;
     }
-    
-    // sets the defaultChoice.
+
     private void setDefaultChoice(int defaultChoice) {
         if (0 > defaultChoice || defaultChoice >= choices.length) {
             throw new IllegalArgumentException(Messages.getString("auth.1D")); //$NON-NLS-1$
@@ -93,63 +63,40 @@
         this.defaultChoice = defaultChoice;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public ChoiceCallback(String prompt, String[] choices, int defaultChoice,
             boolean multipleSelectionsAllowed) {
+        super();
         setPrompt(prompt);
         setChoices(choices);
         setDefaultChoice(defaultChoice);
         this.multipleSelectionsAllowed = multipleSelectionsAllowed;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public boolean allowMultipleSelections() {
         return multipleSelectionsAllowed;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public String[] getChoices() {
         return choices;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public int getDefaultChoice() {
         return defaultChoice;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public String getPrompt() {
         return prompt;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public int[] getSelectedIndexes() {
         return selections;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public void setSelectedIndex(int selection) {
         this.selections = new int[1];
         this.selections[0] = selection;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public void setSelectedIndexes(int[] selections) {
         if (!multipleSelectionsAllowed) {
             throw new UnsupportedOperationException();
@@ -159,5 +106,4 @@
         // this.selections = new int[selections.length]
         //System.arraycopy(selections, 0, this.selections, 0, this.selections.length);
     }
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/ConfirmationCallback.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/ConfirmationCallback.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/ConfirmationCallback.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/ConfirmationCallback.java Fri Sep 29 21:30:25 2006
@@ -15,157 +15,83 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth.callback;
 
 import java.io.Serializable;
 
 import org.apache.harmony.auth.internal.nls.Messages;
 
-/**
- * @com.intel.drl.spec_ref
- *
- */
 public class ConfirmationCallback implements Callback, Serializable {
- 
-    /**
-     * @com.intel.drl.spec_ref
-     */
-    private static final long serialVersionUID = -9095656433782481624L; 
-
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
+    private static final long serialVersionUID = -9095656433782481624L;
+
     public static final int YES = 0; // default options
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public static final int NO = 1;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public static final int CANCEL = 2;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public static final int OK = 3;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public static final int YES_NO_OPTION = 0; // options type
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public static final int YES_NO_CANCEL_OPTION = 1;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public static final int OK_CANCEL_OPTION = 2;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public static final int UNSPECIFIED_OPTION = -1;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public static final int INFORMATION = 0; // messages type
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public static final int WARNING = 1;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public static final int ERROR = 2;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     private String prompt;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     private int messageType;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     private int optionType = UNSPECIFIED_OPTION;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     private int defaultOption;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     private String[] options;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     private int selection;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
-    public ConfirmationCallback(int messageType, int optionType,
-            int defaultOption) {
 
-        if (messageType > ERROR ||
-                messageType < INFORMATION) {
+    public ConfirmationCallback(int messageType, int optionType, int defaultOption) {
+        super();
+        if (messageType > ERROR || messageType < INFORMATION) {
             throw new IllegalArgumentException(Messages.getString("auth.16")); //$NON-NLS-1$
         }
 
         switch (optionType) {
-        case YES_NO_OPTION:
-            if (defaultOption != YES && defaultOption != NO) {
-                throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
-            }
-            break;
-        case YES_NO_CANCEL_OPTION:
-            if (defaultOption != YES && defaultOption != NO
-                    && defaultOption != CANCEL) {
-                throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
-            }
-            break;
-        case OK_CANCEL_OPTION:
-            if (defaultOption != OK && defaultOption != CANCEL) {
-                throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
-            }
-            break;
-        default:
-            throw new IllegalArgumentException(Messages.getString("auth.18")); //$NON-NLS-1$
+            case YES_NO_OPTION:
+                if (defaultOption != YES && defaultOption != NO) {
+                    throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
+                }
+                break;
+            case YES_NO_CANCEL_OPTION:
+                if (defaultOption != YES && defaultOption != NO && defaultOption != CANCEL) {
+                    throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
+                }
+                break;
+            case OK_CANCEL_OPTION:
+                if (defaultOption != OK && defaultOption != CANCEL) {
+                    throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
+                }
+                break;
+            default:
+                throw new IllegalArgumentException(Messages.getString("auth.18")); //$NON-NLS-1$
         }
         this.messageType = messageType;
         this.optionType = optionType;
         this.defaultOption = defaultOption;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
-    public ConfirmationCallback(int messageType, String[] options,
-            int defaultOption) {
-
-        if (messageType > ERROR ||
-                messageType < INFORMATION) {
+    public ConfirmationCallback(int messageType, String[] options, int defaultOption) {
+        super();
+        if (messageType > ERROR || messageType < INFORMATION) {
             throw new IllegalArgumentException(Messages.getString("auth.16")); //$NON-NLS-1$
         }
 
@@ -177,49 +103,45 @@
                 throw new IllegalArgumentException(Messages.getString("auth.1A")); //$NON-NLS-1$
             }
         }
-        if (0 > defaultOption  || defaultOption >= options.length) {
+        if (0 > defaultOption || defaultOption >= options.length) {
             throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
         }
-        //FIXME:System.arraycopy(options, 0 , new String[this.options.length], 0, this.options.length);
+        // FIXME:System.arraycopy(options, 0 , new String[this.options.length],
+        // 0, this.options.length);
         this.options = options;
         this.defaultOption = defaultOption;
         this.messageType = messageType;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public ConfirmationCallback(String prompt, int messageType, int optionType,
             int defaultOption) {
-
+        super();
         if (prompt == null || prompt.length() == 0) {
             throw new IllegalArgumentException(Messages.getString("auth.14")); //$NON-NLS-1$
         }
-        
-        if (messageType > ERROR ||
-                messageType < INFORMATION) {
+
+        if (messageType > ERROR || messageType < INFORMATION) {
             throw new IllegalArgumentException(Messages.getString("auth.16")); //$NON-NLS-1$
         }
 
         switch (optionType) {
-        case YES_NO_OPTION:
-            if (defaultOption != YES && defaultOption != NO) {
-                throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
-            }
-            break;
-        case YES_NO_CANCEL_OPTION:
-            if (defaultOption != YES && defaultOption != NO
-                    && defaultOption != CANCEL) {
-                throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
-            }
-            break;
-        case OK_CANCEL_OPTION:
-            if (defaultOption != OK && defaultOption != CANCEL) {
-                throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
-            }
-            break;
-        default:
-            throw new IllegalArgumentException(Messages.getString("auth.18")); //$NON-NLS-1$
+            case YES_NO_OPTION:
+                if (defaultOption != YES && defaultOption != NO) {
+                    throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
+                }
+                break;
+            case YES_NO_CANCEL_OPTION:
+                if (defaultOption != YES && defaultOption != NO && defaultOption != CANCEL) {
+                    throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
+                }
+                break;
+            case OK_CANCEL_OPTION:
+                if (defaultOption != OK && defaultOption != CANCEL) {
+                    throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
+                }
+                break;
+            default:
+                throw new IllegalArgumentException(Messages.getString("auth.18")); //$NON-NLS-1$
         }
         this.prompt = prompt;
         this.messageType = messageType;
@@ -227,18 +149,14 @@
         this.defaultOption = defaultOption;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
-    public ConfirmationCallback(String prompt, int messageType,
-            String[] options, int defaultOption) {
-
+    public ConfirmationCallback(String prompt, int messageType, String[] options,
+            int defaultOption) {
+        super();
         if (prompt == null || prompt.length() == 0) {
             throw new IllegalArgumentException(Messages.getString("auth.14")); //$NON-NLS-1$
         }
 
-        if (messageType > ERROR ||
-                messageType < INFORMATION) {
+        if (messageType > ERROR || messageType < INFORMATION) {
             throw new IllegalArgumentException(Messages.getString("auth.16")); //$NON-NLS-1$
         }
 
@@ -250,89 +168,67 @@
                 throw new IllegalArgumentException(Messages.getString("auth.1A")); //$NON-NLS-1$
             }
         }
-        if (0 > defaultOption  || defaultOption >= options.length) {
+        if (0 > defaultOption || defaultOption >= options.length) {
             throw new IllegalArgumentException(Messages.getString("auth.17")); //$NON-NLS-1$
         }
-        //FIXME:System.arraycopy(options, 0 , new String[this.options.length], 0, this.options.length);
+        // FIXME:System.arraycopy(options, 0 , new String[this.options.length],
+        // 0, this.options.length);
         this.options = options;
         this.defaultOption = defaultOption;
         this.messageType = messageType;
         this.prompt = prompt;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public String getPrompt() {
         return prompt;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public int getMessageType() {
         return messageType;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public int getDefaultOption() {
         return defaultOption;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public String[] getOptions() {
-         return options;
+        return options;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public int getOptionType() {
         return optionType;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public int getSelectedIndex() {
         return selection;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public void setSelectedIndex(int selection) {
         if (options != null) {
-            if ( 0 <= selection && selection <= options.length) {
+            if (0 <= selection && selection <= options.length) {
                 this.selection = selection;
             } else {
                 throw new ArrayIndexOutOfBoundsException(Messages.getString("auth.1B")); //$NON-NLS-1$
             }
         } else {
             switch (optionType) {
-            case YES_NO_OPTION:
-                if (selection != YES && selection != NO) {
-                    throw new IllegalArgumentException(Messages.getString("auth.19")); //$NON-NLS-1$
-                }
-                break;
-            case YES_NO_CANCEL_OPTION:
-                if (selection != YES && selection != NO
-                        && selection != CANCEL) {
-                    throw new IllegalArgumentException(Messages.getString("auth.19")); //$NON-NLS-1$
-                }
-                break;
-            case OK_CANCEL_OPTION:
-                if (selection != OK && selection != CANCEL) {
-                    throw new IllegalArgumentException(Messages.getString("auth.19")); //$NON-NLS-1$
-                }
-                break;
+                case YES_NO_OPTION:
+                    if (selection != YES && selection != NO) {
+                        throw new IllegalArgumentException(Messages.getString("auth.19")); //$NON-NLS-1$
+                    }
+                    break;
+                case YES_NO_CANCEL_OPTION:
+                    if (selection != YES && selection != NO && selection != CANCEL) {
+                        throw new IllegalArgumentException(Messages.getString("auth.19")); //$NON-NLS-1$
+                    }
+                    break;
+                case OK_CANCEL_OPTION:
+                    if (selection != OK && selection != CANCEL) {
+                        throw new IllegalArgumentException(Messages.getString("auth.19")); //$NON-NLS-1$
+                    }
+                    break;
             }
             this.selection = selection;
         }
     }
-    
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/LanguageCallback.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/LanguageCallback.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/LanguageCallback.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/LanguageCallback.java Fri Sep 29 21:30:25 2006
@@ -15,48 +15,25 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth.callback;
 
 import java.io.Serializable;
 import java.util.Locale;
 
-/**
- * @com.intel.drl.spec_ref
- *
- */
 public class LanguageCallback implements Callback, Serializable {
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
-    private static final long serialVersionUID = 2019050433478903213L; 
-
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
+    private static final long serialVersionUID = 2019050433478903213L;
+
     private Locale locale;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public LanguageCallback() {
+        super();
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public Locale getLocale() {
         return locale;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public void setLocale(Locale locale) {
         this.locale = locale;
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/NameCallback.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/NameCallback.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/NameCallback.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/NameCallback.java Fri Sep 29 21:30:25 2006
@@ -15,44 +15,22 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth.callback;
 
 import java.io.Serializable;
 
 import org.apache.harmony.auth.internal.nls.Messages;
 
-/**
- * @com.intel.drl.spec_ref
- *
- */
 public class NameCallback implements Callback, Serializable {
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
-    private static final long serialVersionUID = 3770938795909392253L; 
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+    private static final long serialVersionUID = 3770938795909392253L;
+
     private String prompt;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     private String defaultName;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */ 
+
     private String inputName;
-    
-    // sets the prompt
+
     private void setPrompt(String prompt) {
         if (prompt == null || prompt.length() == 0) {
             throw new IllegalArgumentException(Messages.getString("auth.14")); //$NON-NLS-1$
@@ -60,53 +38,36 @@
         this.prompt = prompt;
     }
 
-    // sets the default name
     private void setDefaultName(String defaultName) {
         if (defaultName == null || defaultName.length() == 0) {
             throw new IllegalArgumentException(Messages.getString("auth.1E")); //$NON-NLS-1$
         }
         this.defaultName = defaultName;
     }
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public NameCallback(String prompt) {
+        super();
         setPrompt(prompt);
     }
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public NameCallback(String prompt, String defaultName) {
+        super();
         setPrompt(prompt);
         setDefaultName(defaultName);
     }
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public String getPrompt() {
         return prompt;
     }
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public String getDefaultName() {
         return defaultName;
     }
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
-    public void setName(String name){
+
+    public void setName(String name) {
         this.inputName = name;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public String getName() {
         return inputName;
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/PasswordCallback.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/PasswordCallback.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/PasswordCallback.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/PasswordCallback.java Fri Sep 29 21:30:25 2006
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth.callback;
 
 import java.io.Serializable;
@@ -27,33 +22,16 @@
 
 import org.apache.harmony.auth.internal.nls.Messages;
 
-/**
- * @com.intel.drl.spec_ref
- *
- */
 public class PasswordCallback implements Callback, Serializable {
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     private static final long serialVersionUID = 2267422647454909926L;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     private String prompt;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */    
     boolean echoOn;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     private char[] inputPassword;
-    
-    // sets the prompt
+
     private void setPrompt(String prompt) throws IllegalArgumentException {
         if (prompt == null || prompt.length() == 0) {
             throw new IllegalArgumentException(Messages.getString("auth.14")); //$NON-NLS-1$
@@ -61,45 +39,31 @@
         this.prompt = prompt;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public PasswordCallback(String prompt, boolean echoOn) {
+        super();
         setPrompt(prompt);
         this.echoOn = echoOn;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public String getPrompt() {
         return prompt;
     }
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public boolean isEchoOn() {
         return echoOn;
     }
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public void setPassword(char[] password) {
         if (password == null) {
-            this.inputPassword = password;        
+            this.inputPassword = password;
         } else {
             inputPassword = new char[password.length];
-            System.arraycopy(password , 0, inputPassword, 0, inputPassword.length);   
+            System.arraycopy(password, 0, inputPassword, 0, inputPassword.length);
         }
     }
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     public char[] getPassword() {
-        if (inputPassword != null){
+        if (inputPassword != null) {
             char[] tmp = new char[inputPassword.length];
             System.arraycopy(inputPassword, 0, tmp, 0, tmp.length);
             return tmp;
@@ -107,9 +71,6 @@
         return null;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public void clearPassword() {
         if (inputPassword != null) {
             Arrays.fill(inputPassword, '\u0000');

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/TextInputCallback.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/TextInputCallback.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/TextInputCallback.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/TextInputCallback.java Fri Sep 29 21:30:25 2006
@@ -15,44 +15,22 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth.callback;
 
 import java.io.Serializable;
 
 import org.apache.harmony.auth.internal.nls.Messages;
 
-/**
- * @com.intel.drl.spec_ref
- *
- */
 public class TextInputCallback implements Callback, Serializable {
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
-    private static final long serialVersionUID = -8064222478852811804L; 
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+    private static final long serialVersionUID = -8064222478852811804L;
+
     private String defaultText;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     private String prompt;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     private String inputText;
 
-    // sets the prompt
     private void setPrompt(String prompt) {
         if (prompt == null || prompt.length() == 0) {
             throw new IllegalArgumentException(Messages.getString("auth.14")); //$NON-NLS-1$
@@ -60,7 +38,6 @@
         this.prompt = prompt;
     }
 
-    // sets the default text
     private void setDefaultText(String defaultText) {
         if (defaultText == null || defaultText.length() == 0) {
             throw new IllegalArgumentException(Messages.getString("auth.15")); //$NON-NLS-1$
@@ -68,47 +45,30 @@
         this.defaultText = defaultText;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public TextInputCallback(String prompt) {
+        super();
         setPrompt(prompt);
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public TextInputCallback(String prompt, String defaultText) {
+        super();
         setPrompt(prompt);
         setDefaultText(defaultText);
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public String getDefaultText() {
         return defaultText;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public String getPrompt() {
         return prompt;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public String getText() {
         return inputText;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public void setText(String text) {
         this.inputText = text;
     }
-
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/TextOutputCallback.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/TextOutputCallback.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/TextOutputCallback.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/TextOutputCallback.java Fri Sep 29 21:30:25 2006
@@ -15,56 +15,26 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth.callback;
 
 import java.io.Serializable;
 
 import org.apache.harmony.auth.internal.nls.Messages;
 
-/**
- * @com.intel.drl.spec_ref
- *
- */
 public class TextOutputCallback implements Callback, Serializable {
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
-    private static final long serialVersionUID = 1689502495511663102L; 
-
-    /**
-     * @com.intel.drl.spec_ref
-     */
+    private static final long serialVersionUID = 1689502495511663102L;
+
     public static final int INFORMATION = 0;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public static final int WARNING = 1;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public static final int ERROR = 2;
-    
-    /**
-     * @com.intel.drl.spec_ref
-     */
+
     private String message;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     private int messageType;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public TextOutputCallback(int messageType, String message) {
         if (messageType > ERROR || messageType < INFORMATION) {
             throw new IllegalArgumentException(Messages.getString("auth.16")); //$NON-NLS-1$
@@ -76,17 +46,11 @@
         this.message = message;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public String getMessage() {
         return message;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public int getMessageType() {
         return messageType;
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/UnsupportedCallbackException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/UnsupportedCallbackException.java?view=diff&rev=451539&r1=451538&r2=451539
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/UnsupportedCallbackException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/callback/UnsupportedCallbackException.java Fri Sep 29 21:30:25 2006
@@ -15,50 +15,25 @@
  *  limitations under the License.
  */
 
-/**
-* @author Maxim V. Makarov
-* @version $Revision$
-*/
-
 package javax.security.auth.callback;
 
-/**
- * @com.intel.drl.spec_ref
- *
- */
 public class UnsupportedCallbackException extends Exception {
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
-    private static final long serialVersionUID = -6873556327655666839L; 
-
-    /**
-     * @com.intel.drl.spec_ref
-     */
+    private static final long serialVersionUID = -6873556327655666839L;
+
     private Callback callback;
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public UnsupportedCallbackException(Callback callback) {
         super();
         this.callback = callback;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public UnsupportedCallbackException(Callback callback, String message) {
         super(message);
         this.callback = callback;
     }
 
-    /**
-     * @com.intel.drl.spec_ref
-     */
     public Callback getCallback() {
         return callback;
     }
-
-}
\ No newline at end of file
+}



Mime
View raw message