Author: mck Date: Thu May 29 09:18:48 2014 New Revision: 1598228 URL: http://svn.apache.org/r1598228 Log: `svn merge -c1598227 ^/tiles/request/branches/TREQ_1_0_X .`
| restore Java6 compatibility | - (TREQ-19) Please make the significance of underscore (_) in tiles definition filename more obvious | - http://article.gmane.org/gmane.comp.apache.tiles.devel/681 Modified: tiles/request/trunk/ (props changed) tiles/request/trunk/tiles-request-api/src/main/java/org/apache/tiles/request/locale/PostfixedApplicationResource.java Propchange: tiles/request/trunk/ ------------------------------------------------------------------------------ Merged /tiles/request/branches/TREQ_1_0_X:r1598227 Modified: tiles/request/trunk/tiles-request-api/src/main/java/org/apache/tiles/request/locale/PostfixedApplicationResource.java URL: http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-api/src/main/java/org/apache/tiles/request/locale/PostfixedApplicationResource.java?rev=1598228&r1=1598227&r2=1598228&view=diff ============================================================================== --- tiles/request/trunk/tiles-request-api/src/main/java/org/apache/tiles/request/locale/PostfixedApplicationResource.java (original) +++ tiles/request/trunk/tiles-request-api/src/main/java/org/apache/tiles/request/locale/PostfixedApplicationResource.java Thu May 29 09:18:48 2014 @@ -22,7 +22,6 @@ package org.apache.tiles.request.locale; import java.util.Arrays; -import java.util.IllformedLocaleException; import java.util.List; import java.util.Locale; import org.apache.tiles.request.ApplicationResource; @@ -201,6 +200,27 @@ public abstract class PostfixedApplicati } private static Locale localeFrom(String localeString) { + Locale result; + int countryIndex = localeString.indexOf('_'); + if (countryIndex < 0) { + result = new Locale(localeString); + } else { + int variantIndex = localeString.indexOf('_', countryIndex + 1); + if (variantIndex < 0) { + result = new Locale( + localeString.substring(0, countryIndex), + localeString.substring(countryIndex + 1)); + } else { + result = new Locale( + localeString.substring(0, countryIndex), + localeString.substring(countryIndex + 1, variantIndex), + localeString.substring(variantIndex + 1)); + } + } + return result; + } + /* + private static Locale java7_localeFrom(String localeString) { Locale.Builder builder = new Locale.Builder(); try { int countryIndex = localeString.indexOf('_'); @@ -221,6 +241,7 @@ public abstract class PostfixedApplicati } return builder.build(); } + */ private static Locale validateLocale(Locale locale) { List<Locale> availableLocales = Arrays.asList(Locale.getAvailableLocales());
