X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fauth%2FConsoleCallbackHandler.java;h=44bc331592160ebc3a79f0fefdcc40790d71a421;hb=c873a0359345503b8e3ca07828bd99d525ec7cc0;hp=7ea9c07379b8d8b45c4e30f5595dbf90769d967f;hpb=6ddb7b6b224a00344a182761e42b2241a721224f;p=lgpl%2Fargeo-commons.git

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 7ea9c0737..44bc33159 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/auth/ConsoleCallbackHandler.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/ConsoleCallbackHandler.java
@@ -13,8 +13,7 @@ import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.TextOutputCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import org.argeo.ArgeoException;
-import org.argeo.util.LocaleCallback;
+import org.argeo.cms.CmsException;
 
 /** Callback handler to be used with a command line UI. */
 public class ConsoleCallbackHandler implements CallbackHandler {
@@ -24,7 +23,7 @@ public class ConsoleCallbackHandler implements CallbackHandler {
 			UnsupportedCallbackException {
 		Console console = System.console();
 		if (console == null)
-			throw new ArgeoException("No console available");
+			throw new CmsException("No console available");
 
 		PrintWriter writer = console.writer();
 		for (int i = 0; i < callbacks.length; i++) {
@@ -49,12 +48,12 @@ public class ConsoleCallbackHandler implements CallbackHandler {
 				char[] answer = console.readPassword();
 				callback.setPassword(answer);
 				Arrays.fill(answer, ' ');
-			} else if (callbacks[i] instanceof LocaleCallback) {
-				LocaleCallback callback = (LocaleCallback) callbacks[i];
-				writer.write(callback.getPrompt());
+			} else if (callbacks[i] instanceof LocaleChoice) {
+				LocaleChoice callback = (LocaleChoice) callbacks[i];
+				writer.write("Language");
 				writer.write("\n");
-				for (int j = 0; j < callback.getAvailableLocales().size(); j++) {
-					Locale locale = callback.getAvailableLocales().get(j);
+				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() + ") : ");