Author: apetrelli
Date: Sat Dec 2 08:48:37 2006
New Revision: 481578
URL: http://svn.apache.org/viewvc?view=rev&rev=481578
Log:
Renamed UrlDefinitionsFactory.isLocaleProcessed to isContextProcessed.
Its name was "isContextProcessed" and it was renamed by a mistake.
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java?view=diff&rev=481578&r1=481577&r2=481578
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
Sat Dec 2 08:48:37 2006
@@ -138,7 +138,7 @@
if (tilesContext != null) {
tilesContext.getRequestLocale();
- if (!isLocaleProcessed(tilesContext)) {
+ if (!isContextProcessed(tilesContext)) {
synchronized (definitions) {
addDefinitions(definitions, tilesContext);
}
@@ -192,7 +192,7 @@
Locale locale = tilesContext.getRequestLocale();
List<String> postfixes = calculatePostixes(locale);
- if (isLocaleProcessed(tilesContext)) {
+ if (isContextProcessed(tilesContext)) {
return;
} else {
processedLocales.add(locale);
@@ -250,17 +250,17 @@
}
/**
- * Indicates whether a given locale has been processed or not.
+ * Indicates whether a given context has been processed or not.
* <p/>
* This method can be used to avoid unnecessary synchronization of the
* DefinitionsFactory in multi-threaded situations. Check the return of
- * isLoacaleProcessed before synchronizing the object and reading
+ * isContextProcessed before synchronizing the object and reading
* locale-specific definitions.
*
* @param tilesContext The Tiles context to check.
- * @return true if the given lcoale has been processed and false otherwise.
+ * @return true if the given context has been processed and false
otherwise.
*/
- protected boolean isLocaleProcessed(TilesRequestContext tilesContext) {
+ protected boolean isContextProcessed(TilesRequestContext tilesContext) {
return processedLocales.contains(tilesContext.getRequestLocale());
}
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java?view=diff&rev=481578&r1=481577&r2=481578
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java
Sat Dec 2 08:48:37 2006
@@ -52,9 +52,9 @@
* Exposes the <code>isLocaleProcessed</code> method of
* <code>UrlDefinitionsFactory</code>
*
- * @see
org.apache.tiles.definition.UrlDefinitionsFactory#isLocaleProcessed(org.apache.tiles.context.TilesRequestContext)
+ * @see
org.apache.tiles.definition.UrlDefinitionsFactory#isContextProcessed(org.apache.tiles.context.TilesRequestContext)
*/
- public boolean isLocaleProcessed(TilesRequestContext tilesContext) {
- return super.isLocaleProcessed(tilesContext);
+ public boolean isContextProcessed(TilesRequestContext tilesContext) {
+ return super.isContextProcessed(tilesContext);
}
}
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java?view=diff&rev=481578&r1=481577&r2=481578
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
Sat Dec 2 08:48:37 2006
@@ -164,9 +164,9 @@
}
/**
- * Tests the isLocaleProcessed method.
+ * Tests the isContextProcessed method.
*/
- public void testIsLocaleProcessed() throws Exception {
+ public void testIsContextProcessed() throws Exception {
MockPublicUrlDefinitionsFactory factory = new
MockPublicUrlDefinitionsFactory();
// Set up multiple data sources.
@@ -182,11 +182,11 @@
TilesRequestContext tilesContext =
new MockOnlyLocaleTilesContext(Locale.US);
assertFalse("Locale should not be processed.",
- factory.isLocaleProcessed(tilesContext));
+ factory.isContextProcessed(tilesContext));
factory.addDefinitions(definitions, tilesContext);
assertTrue("Locale should be processed.",
- factory.isLocaleProcessed(tilesContext));
+ factory.isContextProcessed(tilesContext));
}
/**
