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 4edcb6341f27d35a9a319e49af3a6ede27420a6f..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
@@ -4,7 +4,6 @@ import java.io.Console;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Arrays;
-import java.util.Locale;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
@@ -13,17 +12,14 @@ import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.TextOutputCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import org.argeo.ArgeoException;
-
 /** 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 ArgeoException("No console available");
+                       throw new IllegalStateException("No console available");
 
                PrintWriter writer = console.writer();
                for (int i = 0; i < callbacks.length; i++) {
@@ -37,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);
@@ -48,21 +43,22 @@ public class ConsoleCallbackHandler implements CallbackHandler {
                                char[] answer = console.readPassword();
                                callback.setPassword(answer);
                                Arrays.fill(answer, ' ');
-                       } else if (callbacks[i] instanceof LocaleChoice) {
-                               LocaleChoice callback = (LocaleChoice) callbacks[i];
-                               writer.write("Language");
-                               writer.write("\n");
-                               for (int j = 0; j < callback.getLocales().size(); j++) {
-                                       Locale locale = callback.getLocales().get(j);
-                                       writer.print(j + " : " + locale.getDisplayName() + "\n");
-                               }
-                               writer.write("(" + callback.getDefaultIndex() + ") : ");
-                               String answer = console.readLine();
-                               if (answer.trim().equals(""))
-                                       callback.setSelectedIndex(callback.getDefaultIndex());
-                               else
-                                       callback.setSelectedIndex(new Integer(answer.trim()));
                        }
+//                     else if (callbacks[i] instanceof LocaleChoice) {
+//                             LocaleChoice callback = (LocaleChoice) callbacks[i];
+//                             writer.write("Language");
+//                             writer.write("\n");
+//                             for (int j = 0; j < callback.getLocales().size(); j++) {
+//                                     Locale locale = callback.getLocales().get(j);
+//                                     writer.print(j + " : " + locale.getDisplayName() + "\n");
+//                             }
+//                             writer.write("(" + callback.getDefaultIndex() + ") : ");
+//                             String answer = console.readLine();
+//                             if (answer.trim().equals(""))
+//                                     callback.setSelectedIndex(callback.getDefaultIndex());
+//                             else
+//                                     callback.setSelectedIndex(new Integer(answer.trim()));
+//                     }
                }
        }