[gatein-commits] gatein SVN: r6516 - in components/wsrp/trunk: consumer/src/main/java/org/gatein/wsrp/consumer and 1 other directories.

Author: chris.laprun(a)jboss.com Date: 2011-05-20 09:33:28 -0400 (Fri, 20 May 2011) New Revision: 6516 Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/Utils.java Log: - Renamed WSRPConstants.defaultLocale to DEFAULT_LOCALE and made it public to use it where needed. Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java =================================================================== --- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java 2011-05-20 09:03:50 UTC (rev 6515) +++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java 2011-05-20 13:33:28 UTC (rev 6516) @@ -212,13 +212,13 @@ } // init default locale at loading time as it is slow - private static String defaultLocale = WSRPUtils.toString(Locale.getDefault()); + public static String DEFAULT_LOCALE = WSRPUtils.toString(Locale.getDefault()); public static List<String> getDefaultLocales() { // return copy to prevent modifications by client code ArrayList<String> locales = new ArrayList<String>(2); - locales.add(defaultLocale); + locales.add(DEFAULT_LOCALE); locales.add("en"); return locales; } Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-05-20 09:03:50 UTC (rev 6515) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-05-20 13:33:28 UTC (rev 6516) @@ -331,7 +331,7 @@ else { // todo: deal with language more appropriately - prop = new RegistrationProperty(name, value, WSRPUtils.toString(Locale.getDefault()), this); + prop = new RegistrationProperty(name, value, WSRPConstants.DEFAULT_LOCALE, this); getOrCreateRegistrationPropertiesMap(false).put(name, prop); } Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2011-05-20 09:03:50 UTC (rev 6515) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2011-05-20 13:33:28 UTC (rev 6516) @@ -432,7 +432,7 @@ case PropertyChange.PREF_UPDATE: // todo: deal with language more appropriately updates.add(WSRPTypeFactory.createProperty(change.getKey(), - WSRPUtils.toString(Locale.getDefault()), change.getValue().get(0))); + WSRPConstants.DEFAULT_LOCALE, change.getValue().get(0))); break; default: Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/Utils.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/Utils.java 2011-05-20 09:03:50 UTC (rev 6515) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/Utils.java 2011-05-20 13:33:28 UTC (rev 6516) @@ -24,6 +24,7 @@ package org.gatein.wsrp.producer; import org.gatein.common.util.ParameterValidation; +import org.gatein.wsrp.WSRPConstants; import org.gatein.wsrp.WSRPTypeFactory; import org.gatein.wsrp.WSRPUtils; import org.gatein.wsrp.registration.LocalizedString; @@ -232,7 +233,7 @@ if (desiredLocales == null || desiredLocales.isEmpty()) { - desiredLocales = Collections.singletonList(WSRPUtils.toString(Locale.getDefault())); + desiredLocales = Collections.singletonList(WSRPConstants.DEFAULT_LOCALE); } // todo: rewrite getPreferredOrBestLocalizedMappingFor to take a List as argument