X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fwidgets%2Fauth%2FCompositeCallbackHandler.java;h=bc99bc48bb8ff362d9e80e2becaac1f2e5dceaa3;hb=2efce0621cf742d6ef077a1f13f8c76843c20ffb;hp=a87a1458cd4881d0f9478f76db932e714b40b091;hpb=1819f201d384ec80725c6dcc18c46cc7b795c09a;p=lgpl%2Fargeo-commons.git
diff --git a/org.argeo.cms/src/org/argeo/cms/widgets/auth/CompositeCallbackHandler.java b/org.argeo.cms/src/org/argeo/cms/widgets/auth/CompositeCallbackHandler.java
index a87a1458c..bc99bc48b 100644
--- a/org.argeo.cms/src/org/argeo/cms/widgets/auth/CompositeCallbackHandler.java
+++ b/org.argeo.cms/src/org/argeo/cms/widgets/auth/CompositeCallbackHandler.java
@@ -10,7 +10,7 @@ import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.TextOutputCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
-import org.argeo.util.LocaleCallback;
+import org.argeo.util.LocaleChoice;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
@@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Text;
*
* Supported Argeo {@link Callback}s are:
*
- * - {@link LocaleCallback}
+ * - {@link LocaleChoice}
*
*
*/
@@ -98,7 +98,7 @@ public class CompositeCallbackHandler extends Composite implements
if (callback instanceof TextOutputCallback
|| callback instanceof NameCallback
|| callback instanceof PasswordCallback
- || callback instanceof LocaleCallback) {
+ || callback instanceof LocaleChoice) {
return;
} else {
throw new UnsupportedCallbackException(callback);
@@ -137,8 +137,8 @@ public class CompositeCallbackHandler extends Composite implements
createNameHandler(composite, (NameCallback) callback);
} else if (callback instanceof PasswordCallback) {
createPasswordHandler(composite, (PasswordCallback) callback);
- } else if (callback instanceof LocaleCallback) {
- createLocaleHandler(composite, (LocaleCallback) callback);
+ } else if (callback instanceof LocaleChoice) {
+ createLocaleHandler(composite, (LocaleChoice) callback);
}
}
}
@@ -220,12 +220,12 @@ public class CompositeCallbackHandler extends Composite implements
}
protected Combo createLocaleHandler(Composite composite,
- final LocaleCallback callback) {
+ final LocaleChoice callback) {
String[] labels = callback.getSupportedLocalesLabels();
if (labels.length == 0)
return null;
Label label = new Label(composite, SWT.NONE);
- label.setText(callback.getPrompt());
+ label.setText("Language");
final Combo combo = new Combo(composite, SWT.READ_ONLY);
combo.setItems(labels);