Author: apetrelli
Date: Thu Feb 12 13:37:53 2009
New Revision: 743737
URL: http://svn.apache.org/viewvc?rev=743737&view=rev
Log:
TILES-365
Fixed loading and resolution of definitions when localization and automatic
resolution is turned on.
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java?rev=743737&r1=743736&r2=743737&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
Thu Feb 12 13:37:53 2009
@@ -214,6 +214,21 @@
* @since 2.1.0
*/
protected Map<String, Definition> loadDefinitionsFromURLs(Locale
customizationKey) {
+ Map<String, Definition> localeDefsMap =
loadRawDefinitionsFromURLs(customizationKey);
+ postDefinitionLoadOperations(localeDefsMap, customizationKey);
+
+ return localeDefsMap;
+ }
+
+ /**
+ * Loads the raw definitions from the URLs associated with a locale.
+ *
+ * @param customizationKey The locale to use when loading URLs.
+ * @return The loaded definitions.
+ * @since 2.1.3
+ */
+ protected Map<String, Definition> loadRawDefinitionsFromURLs(
+ Locale customizationKey) {
Map<String, Definition> localeDefsMap;
String postfix = LocaleUtil.calculatePostfix(customizationKey);
@@ -242,8 +257,6 @@
}
}
locale2definitionMap.put(customizationKey, localeDefsMap);
- postDefinitionLoadOperations(localeDefsMap, customizationKey);
-
return localeDefsMap;
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java?rev=743737&r1=743736&r2=743737&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
Thu Feb 12 13:37:53 2009
@@ -54,7 +54,7 @@
/** {...@inheritdoc} */
@Override
protected Map<String, Definition> loadParentDefinitions(Locale
parentLocale) {
- return loadDefinitionsFromURLs(parentLocale);
+ return loadRawDefinitionsFromURLs(parentLocale);
}
/** {...@inheritdoc} */
