diff options
Diffstat (limited to 'libjava/classpath/javax/security')
15 files changed, 74 insertions, 74 deletions
diff --git a/libjava/classpath/javax/security/auth/Subject.java b/libjava/classpath/javax/security/auth/Subject.java index 03836345862..e9b0804a505 100644 --- a/libjava/classpath/javax/security/auth/Subject.java +++ b/libjava/classpath/javax/security/auth/Subject.java @@ -236,7 +236,7 @@ public final class Subject implements Serializable */ public static Object doAsPrivileged (final Subject subject, final PrivilegedExceptionAction action, - AccessControlContext acc) + AccessControlContext acc) throws PrivilegedActionException { final SecurityManager sm = System.getSecurityManager(); diff --git a/libjava/classpath/javax/security/auth/callback/ChoiceCallback.java b/libjava/classpath/javax/security/auth/callback/ChoiceCallback.java index ec12a668514..30bddd55931 100644 --- a/libjava/classpath/javax/security/auth/callback/ChoiceCallback.java +++ b/libjava/classpath/javax/security/auth/callback/ChoiceCallback.java @@ -108,7 +108,7 @@ public class ChoiceCallback implements Callback, Serializable * <code>choices</code>. */ public ChoiceCallback(String prompt, String[] choices, int defaultChoice, - boolean multipleSelectionsAllowed) + boolean multipleSelectionsAllowed) { super(); @@ -116,7 +116,7 @@ public class ChoiceCallback implements Callback, Serializable setChoices(choices); if (defaultChoice < 0 || defaultChoice >= this.choices.length) { - throw new IllegalArgumentException("default choice is out of bounds"); + throw new IllegalArgumentException("default choice is out of bounds"); } this.defaultChoice = defaultChoice; this.multipleSelectionsAllowed = multipleSelectionsAllowed; @@ -192,7 +192,7 @@ public class ChoiceCallback implements Callback, Serializable { if (!multipleSelectionsAllowed) { - throw new UnsupportedOperationException("not allowed"); + throw new UnsupportedOperationException("not allowed"); } this.selections = selections; @@ -213,7 +213,7 @@ public class ChoiceCallback implements Callback, Serializable { if ((prompt == null) || (prompt.length() == 0)) { - throw new IllegalArgumentException("invalid prompt"); + throw new IllegalArgumentException("invalid prompt"); } this.prompt = prompt; } @@ -222,14 +222,14 @@ public class ChoiceCallback implements Callback, Serializable { if (choices == null || choices.length == 0) { - throw new IllegalArgumentException("invalid choices"); + throw new IllegalArgumentException("invalid choices"); } for (int i = 0; i < choices.length; i++) { - if (choices[i] == null || choices[i].length() == 0) - { - throw new IllegalArgumentException("invalid choice at index #"+i); - } + if (choices[i] == null || choices[i].length() == 0) + { + throw new IllegalArgumentException("invalid choice at index #"+i); + } } this.choices = choices; } diff --git a/libjava/classpath/javax/security/auth/callback/ConfirmationCallback.java b/libjava/classpath/javax/security/auth/callback/ConfirmationCallback.java index 938b3017380..8f89bf5fae5 100644 --- a/libjava/classpath/javax/security/auth/callback/ConfirmationCallback.java +++ b/libjava/classpath/javax/security/auth/callback/ConfirmationCallback.java @@ -260,7 +260,7 @@ public class ConfirmationCallback implements Callback, Serializable * not correspond to one of the options in <code>optionType</code>. */ public ConfirmationCallback(String prompt, int messageType, int optionType, - int defaultOption) + int defaultOption) { super(); @@ -297,7 +297,7 @@ public class ConfirmationCallback implements Callback, Serializable * <code>options</code>. */ public ConfirmationCallback(String prompt, int messageType, String[] options, - int defaultOption) + int defaultOption) { super(); @@ -352,7 +352,7 @@ public class ConfirmationCallback implements Callback, Serializable { if (options != null) { - return UNSPECIFIED_OPTION; + return UNSPECIFIED_OPTION; } return optionType; } @@ -399,11 +399,11 @@ public class ConfirmationCallback implements Callback, Serializable { if (options != null) { - setOptions(options, selection); + setOptions(options, selection); } else { - setOptionType(optionType, selection); + setOptionType(optionType, selection); } } @@ -440,35 +440,35 @@ public class ConfirmationCallback implements Callback, Serializable switch (optionType) { case YES_NO_OPTION: - this.optionType = optionType; - switch (selectedOption) - { - case YES: - case NO: this.selection = selectedOption; break; - default: throw new IllegalArgumentException("invalid option"); - } - break; + this.optionType = optionType; + switch (selectedOption) + { + case YES: + case NO: this.selection = selectedOption; break; + default: throw new IllegalArgumentException("invalid option"); + } + break; case YES_NO_CANCEL_OPTION: - this.optionType = optionType; - switch (selectedOption) - { - case YES: - case NO: - case CANCEL: this.selection = selectedOption; break; - default: throw new IllegalArgumentException("invalid option"); - } - break; + this.optionType = optionType; + switch (selectedOption) + { + case YES: + case NO: + case CANCEL: this.selection = selectedOption; break; + default: throw new IllegalArgumentException("invalid option"); + } + break; case OK_CANCEL_OPTION: - this.optionType = optionType; - switch (selectedOption) - { - case OK: - case CANCEL: this.selection = selectedOption; break; - default: throw new IllegalArgumentException("invalid option"); - } - break; + this.optionType = optionType; + switch (selectedOption) + { + case OK: + case CANCEL: this.selection = selectedOption; break; + default: throw new IllegalArgumentException("invalid option"); + } + break; default: - throw new IllegalArgumentException("illegal option type"); + throw new IllegalArgumentException("illegal option type"); } } @@ -477,18 +477,18 @@ public class ConfirmationCallback implements Callback, Serializable { if ((selectedOption < 0) || (selectedOption > options.length - 1)) { - throw new IllegalArgumentException("invalid selection"); + throw new IllegalArgumentException("invalid selection"); } if ((options == null) || (options.length == 0)) { - throw new IllegalArgumentException("options is null or empty"); + throw new IllegalArgumentException("options is null or empty"); } for (int i = 0; i < options.length; i++) { - if ((options[i] == null) || (options[i].length() == 0)) - { - throw new IllegalArgumentException("options[" + i + "] is null or empty"); - } + if ((options[i] == null) || (options[i].length() == 0)) + { + throw new IllegalArgumentException("options[" + i + "] is null or empty"); + } } this.options = options; this.selection = selectedOption; @@ -498,7 +498,7 @@ public class ConfirmationCallback implements Callback, Serializable { if ((prompt == null) || (prompt.length() == 0)) { - throw new IllegalArgumentException("prompt is null or empty"); + throw new IllegalArgumentException("prompt is null or empty"); } this.prompt = prompt; } diff --git a/libjava/classpath/javax/security/auth/callback/NameCallback.java b/libjava/classpath/javax/security/auth/callback/NameCallback.java index 0e281d1cc8b..4b8bf1c6969 100644 --- a/libjava/classpath/javax/security/auth/callback/NameCallback.java +++ b/libjava/classpath/javax/security/auth/callback/NameCallback.java @@ -162,7 +162,7 @@ public class NameCallback implements Callback, Serializable { if ((prompt == null) || (prompt.length() == 0)) { - throw new IllegalArgumentException("invalid prompt"); + throw new IllegalArgumentException("invalid prompt"); } this.prompt = prompt; } @@ -171,7 +171,7 @@ public class NameCallback implements Callback, Serializable { if ((defaultName == null) || (defaultName.length() == 0)) { - throw new IllegalArgumentException("invalid default name"); + throw new IllegalArgumentException("invalid default name"); } this.defaultName = defaultName; } diff --git a/libjava/classpath/javax/security/auth/callback/PasswordCallback.java b/libjava/classpath/javax/security/auth/callback/PasswordCallback.java index e8c862aca3e..6309aacbada 100644 --- a/libjava/classpath/javax/security/auth/callback/PasswordCallback.java +++ b/libjava/classpath/javax/security/auth/callback/PasswordCallback.java @@ -149,11 +149,11 @@ public class PasswordCallback implements Callback, Serializable { if (inputPassword != null) { - for (int i = 0; i < inputPassword.length; i++) - { - inputPassword[i] = '\0'; - } - inputPassword = null; + for (int i = 0; i < inputPassword.length; i++) + { + inputPassword[i] = '\0'; + } + inputPassword = null; } } @@ -161,7 +161,7 @@ public class PasswordCallback implements Callback, Serializable { if ((prompt == null) || (prompt.length() == 0)) { - throw new IllegalArgumentException("invalid prompt"); + throw new IllegalArgumentException("invalid prompt"); } this.prompt = prompt; } diff --git a/libjava/classpath/javax/security/auth/callback/TextInputCallback.java b/libjava/classpath/javax/security/auth/callback/TextInputCallback.java index 98b0ae3c12d..1fe07132754 100644 --- a/libjava/classpath/javax/security/auth/callback/TextInputCallback.java +++ b/libjava/classpath/javax/security/auth/callback/TextInputCallback.java @@ -161,7 +161,7 @@ public class TextInputCallback implements Callback, Serializable { if ((prompt == null) || (prompt.length() == 0)) { - throw new IllegalArgumentException("invalid prompt"); + throw new IllegalArgumentException("invalid prompt"); } this.prompt = prompt; } @@ -170,7 +170,7 @@ public class TextInputCallback implements Callback, Serializable { if ((defaultText == null) || (defaultText.length() == 0)) { - throw new IllegalArgumentException("invalid default text"); + throw new IllegalArgumentException("invalid default text"); } this.defaultText = defaultText; } diff --git a/libjava/classpath/javax/security/auth/callback/TextOutputCallback.java b/libjava/classpath/javax/security/auth/callback/TextOutputCallback.java index 197cece5fe9..0ab3a040fc1 100644 --- a/libjava/classpath/javax/security/auth/callback/TextOutputCallback.java +++ b/libjava/classpath/javax/security/auth/callback/TextOutputCallback.java @@ -133,7 +133,7 @@ public class TextOutputCallback implements Callback, Serializable { if ((message == null) || (message.length() == 0)) { - throw new IllegalArgumentException("invalid message"); + throw new IllegalArgumentException("invalid message"); } this.message = message; } diff --git a/libjava/classpath/javax/security/auth/kerberos/DelegationPermission.java b/libjava/classpath/javax/security/auth/kerberos/DelegationPermission.java index 33e1f9893b3..42bb9c73ca7 100644 --- a/libjava/classpath/javax/security/auth/kerberos/DelegationPermission.java +++ b/libjava/classpath/javax/security/auth/kerberos/DelegationPermission.java @@ -64,12 +64,12 @@ public final class DelegationPermission /** * Create a new instance with the given name and actions. - * + * * The name consists of two parts: first the subordinate * service principal, then the target service principal. * Each principal is surrounded by quotes; the two are separated * by a space. - * + * * @param name the name * @param actions the actions; this is ignored */ diff --git a/libjava/classpath/javax/security/auth/kerberos/KerberosKey.java b/libjava/classpath/javax/security/auth/kerberos/KerberosKey.java index 3372a162f93..e5735fbd57b 100644 --- a/libjava/classpath/javax/security/auth/kerberos/KerberosKey.java +++ b/libjava/classpath/javax/security/auth/kerberos/KerberosKey.java @@ -50,7 +50,7 @@ import javax.security.auth.Destroyable; * This class represents a Kerberos key. See the Kerberos * authentication RFC for more information: * <a href="http://www.ietf.org/rfc/rfc1510.txt">RFC 1510</a>. - * + * * @since 1.4 */ public class KerberosKey diff --git a/libjava/classpath/javax/security/auth/kerberos/KerberosPrincipal.java b/libjava/classpath/javax/security/auth/kerberos/KerberosPrincipal.java index d52b5cf9e6c..4ba767226f3 100644 --- a/libjava/classpath/javax/security/auth/kerberos/KerberosPrincipal.java +++ b/libjava/classpath/javax/security/auth/kerberos/KerberosPrincipal.java @@ -107,7 +107,7 @@ public final class KerberosPrincipal * Create a new instance with the given name and type. The name is * parsed according to the rules in the RFC. If there is no realm, * then the local realm is used instead. - * + * * @param name the principal's name * @param type the principal's type */ @@ -202,6 +202,6 @@ public final class KerberosPrincipal public String toString() { // This is what came to mind. - return name + ":" + type; + return name + ":" + type; } } diff --git a/libjava/classpath/javax/security/auth/kerberos/ServicePermission.java b/libjava/classpath/javax/security/auth/kerberos/ServicePermission.java index 452f8e966ad..4412ea45957 100644 --- a/libjava/classpath/javax/security/auth/kerberos/ServicePermission.java +++ b/libjava/classpath/javax/security/auth/kerberos/ServicePermission.java @@ -48,7 +48,7 @@ import java.util.Vector; * This represents permission to access to a Kerberos service principal. * See the Kerberos authentication RFC for more information: * <a href="http://www.ietf.org/rfc/rfc1510.txt">RFC 1510</a>. - * + * * @since 1.4 */ public final class ServicePermission @@ -64,15 +64,15 @@ public final class ServicePermission /** * Create a new service permission with the indicated name and actions. - * + * * The name is the name of the kerberos principal for the service. - * + * * The actions are a comma-separated list of strings. The recognized * actions are "initiate" and "accept". The "initiate" action means * that the holder of the permission can access the service. The * "accept" action means that the holder of the permission can operate * as this service. - * + * * @param name the prinicpal's name * @param action the allowed actions */ diff --git a/libjava/classpath/javax/security/auth/login/AccountNotFoundException.java b/libjava/classpath/javax/security/auth/login/AccountNotFoundException.java index a052fbf6876..e74ca016311 100644 --- a/libjava/classpath/javax/security/auth/login/AccountNotFoundException.java +++ b/libjava/classpath/javax/security/auth/login/AccountNotFoundException.java @@ -40,7 +40,7 @@ package javax.security.auth.login; /** * An exception indicating that an account was not found. - * @since 1.5 + * @since 1.5 */ public class AccountNotFoundException extends AccountException { diff --git a/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java b/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java index 3c8b64d4c99..044c9105be3 100644 --- a/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java +++ b/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java @@ -97,7 +97,7 @@ public class AppConfigurationEntry public String toString() { - + return loginModuleName + "\t" + String.valueOf(controlFlag) + "\t" + String.valueOf(options); diff --git a/libjava/classpath/javax/security/auth/login/LoginContext.java b/libjava/classpath/javax/security/auth/login/LoginContext.java index 17641e65b55..b2e4b97b679 100644 --- a/libjava/classpath/javax/security/auth/login/LoginContext.java +++ b/libjava/classpath/javax/security/auth/login/LoginContext.java @@ -230,9 +230,9 @@ public class LoginContext Exception cause = null; try { - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - Class c = Class.forName(entry.getLoginModuleName(), true, cl); - module = (LoginModule) c.newInstance(); + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + Class c = Class.forName(entry.getLoginModuleName(), true, cl); + module = (LoginModule) c.newInstance(); } catch (ClassNotFoundException cnfe) { diff --git a/libjava/classpath/javax/security/sasl/Sasl.java b/libjava/classpath/javax/security/sasl/Sasl.java index 52210d971ac..402ad6edeab 100644 --- a/libjava/classpath/javax/security/sasl/Sasl.java +++ b/libjava/classpath/javax/security/sasl/Sasl.java @@ -1,4 +1,4 @@ -/* Sasl.java -- +/* Sasl.java -- Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. |