You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/03/25 09:14:29 UTC
svn commit: r1460540 - in
/syncope/trunk/console/src/main/java/org/apache/syncope/console:
SyncopeSession.java commons/Constants.java pages/Login.java
Author: ilgrosso
Date: Mon Mar 25 08:14:29 2013
New Revision: 1460540
URL: http://svn.apache.org/r1460540
Log:
[SYNCOPE-340] Small refactory to ease adding new languages
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java?rev=1460540&r1=1460539&r2=1460540&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java Mon Mar 25 08:14:29 2013
@@ -18,8 +18,12 @@
*/
package org.apache.syncope.console;
-import java.text.SimpleDateFormat;
+import java.text.DateFormat;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
import org.apache.syncope.client.services.proxy.ConfigurationServiceProxy;
import org.apache.syncope.client.services.proxy.ConnectorServiceProxy;
import org.apache.syncope.client.services.proxy.EntitlementServiceProxy;
@@ -51,7 +55,6 @@ import org.apache.syncope.common.service
import org.apache.syncope.common.services.UserService;
import org.apache.syncope.common.services.UserWorkflowService;
import org.apache.syncope.common.services.WorkflowService;
-import org.apache.syncope.console.commons.Constants;
import org.apache.wicket.Session;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
import org.apache.wicket.protocol.http.WebApplication;
@@ -68,6 +71,9 @@ public class SyncopeSession extends WebS
private static final long serialVersionUID = 7743446298924805872L;
+ public static final List<Locale> SUPPORTED_LOCALES = Arrays.asList(new Locale[] {
+ Locale.ENGLISH, Locale.ITALIAN});
+
private String userId;
private String version;
@@ -78,7 +84,7 @@ public class SyncopeSession extends WebS
private final RestTemplate restTemplate;
- private final HashMap<Class<?>, SpringServiceProxy> services = new HashMap<Class<?>, SpringServiceProxy>();
+ private final Map<Class<?>, SpringServiceProxy> services = new HashMap<Class<?>, SpringServiceProxy>();
public static SyncopeSession get() {
return (SyncopeSession) Session.get();
@@ -96,7 +102,7 @@ public class SyncopeSession extends WebS
setupRESTClients();
}
- protected void setupRESTClients() {
+ private void setupRESTClients() {
services.put(ConfigurationService.class, new ConfigurationServiceProxy(baseURL, restTemplate));
services.put(ConnectorService.class, new ConnectorServiceProxy(baseURL, restTemplate));
services.put(EntitlementService.class, new EntitlementServiceProxy(baseURL, restTemplate));
@@ -115,7 +121,7 @@ public class SyncopeSession extends WebS
}
@SuppressWarnings("unchecked")
- public <T> T getService(Class<T> service) {
+ public <T> T getService(final Class<T> service) {
return (T) services.get(service);
}
@@ -156,19 +162,9 @@ public class SyncopeSession extends WebS
return this.roles.hasAnyRole(roles);
}
- public SimpleDateFormat getDateFormat() {
- String language = "en";
- if (getLocale() != null) {
- language = getLocale().getLanguage();
- }
-
- SimpleDateFormat formatter;
- if ("it".equals(language)) {
- formatter = new SimpleDateFormat(Constants.ITALIAN_DATE_FORMAT);
- } else {
- formatter = new SimpleDateFormat(Constants.ENGLISH_DATE_FORMAT);
- }
+ public DateFormat getDateFormat() {
+ final Locale locale = getLocale() == null ? Locale.ENGLISH : getLocale();
- return formatter;
+ return DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, locale);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java?rev=1460540&r1=1460539&r2=1460540&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java Mon Mar 25 08:14:29 2013
@@ -74,10 +74,6 @@ public final class Constants {
public static final String PAGEPARAM_CURRENT_PAGE = "_current_page";
- public static final String ITALIAN_DATE_FORMAT = "dd/MM/yyyy HH:mm:ss";
-
- public static final String ENGLISH_DATE_FORMAT = "MM/dd/yyyy HH:mm:ss";
-
public static final String PREF_POLICY_PAGINATOR_ROWS = "policy.paginator.rows";
public static final String ENUM_VALUES_SEPARATOR = ";";
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java?rev=1460540&r1=1460539&r2=1460540&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java Mon Mar 25 08:14:29 2013
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.console.pages;
-import java.util.Arrays;
-import java.util.List;
import java.util.Locale;
import java.util.Set;
import org.apache.http.HttpResponse;
@@ -101,7 +99,7 @@ public class Login extends WebPage {
passwordField.setMarkupId("password");
form.add(passwordField);
- languageSelect = new LocaleDropDown("language", Arrays.asList(new Locale[]{Locale.ENGLISH, Locale.ITALIAN}));
+ languageSelect = new LocaleDropDown("language");
form.add(languageSelect);
@@ -244,9 +242,8 @@ public class Login extends WebPage {
}
}
- public LocaleDropDown(final String id, final List<Locale> supportedLocales) {
-
- super(id, supportedLocales);
+ public LocaleDropDown(final String id) {
+ super(id, SyncopeSession.SUPPORTED_LOCALES);
setChoiceRenderer(new LocaleRenderer());
setModel(new IModel<Locale>() {