Improve CMS security layer documentation.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / auth / ConsoleCallbackHandler.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/ConsoleCallbackHandler.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/ConsoleCallbackHandler.java
index 4f1d3637bad56c79ef1b8fc343eb36e1cf34bd72..0979a215793a6fcc7fc1565c9f5ab64d3832fb13 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/auth/ConsoleCallbackHandler.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/ConsoleCallbackHandler.java
@@ -12,17 +12,14 @@ import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.TextOutputCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import org.argeo.cms.CmsException;
-
 /** Callback handler to be used with a command line UI. */
 public class ConsoleCallbackHandler implements CallbackHandler {
 
        @Override
-       public void handle(Callback[] callbacks) throws IOException,
-                       UnsupportedCallbackException {
+       public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
                Console console = System.console();
                if (console == null)
-                       throw new CmsException("No console available");
+                       throw new IllegalStateException("No console available");
 
                PrintWriter writer = console.writer();
                for (int i = 0; i < callbacks.length; i++) {
@@ -36,8 +33,7 @@ public class ConsoleCallbackHandler implements CallbackHandler {
                                        writer.write(" (" + callback.getDefaultName() + ")");
                                writer.write(" : ");
                                String answer = console.readLine();
-                               if (callback.getDefaultName() != null
-                                               && answer.trim().equals(""))
+                               if (callback.getDefaultName() != null && answer.trim().equals(""))
                                        callback.setName(callback.getDefaultName());
                                else
                                        callback.setName(answer);