You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2006/08/05 00:18:47 UTC
svn commit: r428906 - in /tapestry/tapestry5/tapestry-core/trunk/src:
main/java/org/apache/tapestry/internal/util/
test/java/org/apache/tapestry/internal/
test/java/org/apache/tapestry/internal/util/
Author: hlship
Date: Fri Aug 4 15:18:44 2006
New Revision: 428906
URL: http://svn.apache.org/viewvc?rev=428906&view=rev
Log:
Modify LocalizedNameGenerator to work with the JDK 1.5 for loop, by implementing Iterable (and Iterator).
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/LocalizedNameGenerator.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ClasspathResource.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/LocalizedNameGeneratorTest.java
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/LocalizedNameGenerator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/LocalizedNameGenerator.java?rev=428906&r1=428905&r2=428906&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/LocalizedNameGenerator.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/LocalizedNameGenerator.java Fri Aug 4 15:18:44 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.internal.util;
+import java.util.Iterator;
import java.util.Locale;
import java.util.NoSuchElementException;
@@ -28,7 +29,7 @@
* @author Howard Lewis Ship
*/
-public class LocalizedNameGenerator
+public class LocalizedNameGenerator implements Iterator<String>, Iterable<String>
{
private final int _baseNameLength;
@@ -136,7 +137,7 @@
* Returns true if there are more name variants to be returned, false otherwise.
*/
- public boolean more()
+ public boolean hasNext()
{
return _state != EXHAUSTED;
}
@@ -217,4 +218,17 @@
return null;
}
}
+
+ /** @throws UnsupportedOperationException */
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ /** So that LNG may be used with the for loop. */
+ public Iterator<String> iterator()
+ {
+ return this;
+ }
+
}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ClasspathResource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ClasspathResource.java?rev=428906&r1=428905&r2=428906&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ClasspathResource.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/ClasspathResource.java Fri Aug 4 15:18:44 2006
@@ -78,12 +78,8 @@
public Resource getLocalization(Locale locale)
{
- LocalizedNameGenerator g = new LocalizedNameGenerator(_path, locale);
-
- while (g.more())
+ for (String path : new LocalizedNameGenerator(_path, locale))
{
- String path = g.next();
-
URL url = _classLoader.getResource(path);
if (url == null)
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/LocalizedNameGeneratorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/LocalizedNameGeneratorTest.java?rev=428906&r1=428905&r2=428906&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/LocalizedNameGeneratorTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/LocalizedNameGeneratorTest.java Fri Aug 4 15:18:44 2006
@@ -31,11 +31,11 @@
for (String s : expected)
{
- assertTrue(g.more());
+ assertTrue(g.hasNext());
assertEquals(g.next(), s);
}
- assertFalse(g.more());
+ assertFalse(g.hasNext());
}
@Test