You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/07/26 13:54:13 UTC
svn commit: r797916 - in /tiles/framework/trunk:
tiles-core/src/main/java/org/apache/tiles/util/ tiles-freemarker/
tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/
tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/
Author: apetrelli
Date: Sun Jul 26 11:54:13 2009
New Revision: 797916
URL: http://svn.apache.org/viewvc?rev=797916&view=rev
Log:
TILES-440
Created IteratorEnumeration in tiles-core.
Replaced it in tiles-freemarker and tiles-velocity.
Added:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/IteratorEnumeration.java (with props)
Modified:
tiles/framework/trunk/tiles-freemarker/pom.xml
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
Added: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/IteratorEnumeration.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/IteratorEnumeration.java?rev=797916&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/IteratorEnumeration.java (added)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/IteratorEnumeration.java Sun Jul 26 11:54:13 2009
@@ -0,0 +1,80 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tiles.util;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+
+/**
+ * Copied and modified from Apache Commons Collections 3.2.1.<br>
+ *
+ * Adapter to make an {@link Iterator Iterator} instance appear to be an
+ * {@link Enumeration Enumeration} instance.
+ *
+ * @param <E> The type of the enumerated elements.
+ * @since Commons Collections 1.0
+ * @version $Revision$ $Date: 2008-04-10 13:33:15 +0100 (Thu, 10 Apr
+ * 2008) $
+ *
+ * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
+ */
+public class IteratorEnumeration<E> implements Enumeration<E> {
+
+ /** The iterator being decorated. */
+ private Iterator<E> iterator;
+
+ /**
+ * Constructs a new <code>IteratorEnumeration</code> that will use the given
+ * iterator.
+ *
+ * @param iterator the iterator to use
+ */
+ public IteratorEnumeration(Iterator<E> iterator) {
+ this.iterator = iterator;
+ }
+
+ // Iterator interface
+ // -------------------------------------------------------------------------
+
+ /**
+ * Returns true if the underlying iterator has more elements.
+ *
+ * @return true if the underlying iterator has more elements
+ */
+ public boolean hasMoreElements() {
+ return iterator.hasNext();
+ }
+
+ /**
+ * Returns the next element from the underlying iterator.
+ *
+ * @return the next element from the underlying iterator.
+ * @throws java.util.NoSuchElementException if the underlying iterator has
+ * no more elements
+ */
+ public E nextElement() {
+ return iterator.next();
+ }
+
+ // Properties
+ // -------------------------------------------------------------------------
+}
Propchange: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/IteratorEnumeration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/IteratorEnumeration.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-freemarker/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/pom.xml?rev=797916&r1=797915&r2=797916&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/pom.xml (original)
+++ tiles/framework/trunk/tiles-freemarker/pom.xml Sun Jul 26 11:54:13 2009
@@ -84,10 +84,5 @@
<version>2.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java?rev=797916&r1=797915&r2=797916&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java Sun Jul 26 11:54:13 2009
@@ -32,7 +32,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.collections.iterators.IteratorEnumeration;
import org.apache.tiles.Attribute;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.freemarker.FreeMarkerTilesException;
@@ -42,6 +41,7 @@
import org.apache.tiles.servlet.context.ExternalWriterHttpServletResponse;
import org.apache.tiles.servlet.context.ServletTilesRequestContext;
import org.apache.tiles.servlet.context.ServletUtil;
+import org.apache.tiles.util.IteratorEnumeration;
/**
* FreeMarker renderer for rendering FreeMarker templates as Tiles attributes.
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java?rev=797916&r1=797915&r2=797916&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java Sun Jul 26 11:54:13 2009
@@ -28,13 +28,13 @@
import javax.servlet.ServletContext;
-import org.apache.commons.collections.iterators.IteratorEnumeration;
import org.apache.tiles.Attribute;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.impl.InvalidTemplateException;
import org.apache.tiles.renderer.impl.AbstractBaseAttributeRenderer;
import org.apache.tiles.servlet.context.ServletTilesRequestContext;
import org.apache.tiles.servlet.context.ServletUtil;
+import org.apache.tiles.util.IteratorEnumeration;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.JeeConfig;