--- a/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/LoginPane.java Thu Dec 09 14:15:58 2010 -0500
+++ b/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/LoginPane.java Thu Dec 09 14:16:23 2010 -0500
@@ -474,11 +474,7 @@
}
});
- DialogMessage help = new DialogMessage(Finder.getString(
- "login.message.roleauth", host.getValue(),
- user.getValue(), role.getValue()));
-
- promptForAuth(request.getMessages(), help, properties);
+ promptForAuth(request.getMessages(), properties);
}
/**
@@ -510,10 +506,7 @@
}
});
- DialogMessage help = new DialogMessage(Finder.getString(
- "login.message.userauth", host.getValue(), user.getValue()));
-
- promptForAuth(request.getMessages(), help, properties);
+ promptForAuth(request.getMessages(), properties);
}
//
@@ -611,22 +604,20 @@
/**
* Prompt the user for login information.
*
- * @param messages - messages to instruct the user
+ * @param messages
+ * messages to instruct the user
*
- * @param help - on-screen help.
- *
- * @param properties - A {@code List} of {@code LoginProperty} objects.
+ * @param properties
+ * {@code List} of {@code LoginProperty} objects.
* NOTE: Only instances of {@code StringLoginProperty} and
* {@code PasswordLoginProperty} are allowed.
*/
private void promptForAuth(final List<DialogMessage> messages,
- DialogMessage help, final List<LoginProperty> properties)
+ final List<LoginProperty> properties)
throws ActionAbortedException, ActionRegressedException {
assert !EventQueue.isDispatchThread();
- messages.add(help);
-
final Map<LoginProperty, JTextComponent> map =
new HashMap<LoginProperty, JTextComponent>();