Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@apache.org Received: (qmail 18682 invoked from network); 22 Jun 2002 23:54:02 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 22 Jun 2002 23:54:02 -0000 Received: (qmail 19418 invoked by uid 97); 22 Jun 2002 23:54:06 -0000 Delivered-To: qmlist-jakarta-archive-commons-dev@jakarta.apache.org Received: (qmail 19399 invoked by uid 97); 22 Jun 2002 23:54:05 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 19388 invoked by uid 97); 22 Jun 2002 23:54:04 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 22 Jun 2002 23:53:55 -0000 Message-ID: <20020622235355.15992.qmail@icarus.apache.org> From: jstrachan@apache.org To: jakarta-commons-sandbox-cvs@apache.org Subject: cvs commit: jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression ExpressionSupport.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N jstrachan 2002/06/22 16:53:55 Modified: jelly/src/java/org/apache/commons/jelly/expression ExpressionSupport.java Log: Added support for Enumeration in iteration expressions Revision Changes Path 1.4 +10 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression/ExpressionSupport.java Index: ExpressionSupport.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression/ExpressionSupport.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ExpressionSupport.java 17 May 2002 15:18:15 -0000 1.3 +++ ExpressionSupport.java 22 Jun 2002 23:53:55 -0000 1.4 @@ -62,11 +62,13 @@ package org.apache.commons.jelly.expression; import java.util.Collections; +import java.util.Enumeration; import java.util.Iterator; import java.util.List; import java.util.Map; import org.apache.commons.collections.ArrayIterator; +import org.apache.commons.collections.EnumerationIterator; import org.apache.commons.collections.SingletonIterator; import org.apache.commons.jelly.JellyContext; @@ -125,6 +127,9 @@ } else if ( value.getClass().isArray() ) { return new ArrayIterator( value ); + } + else if ( value instanceof Enumeration ) { + return new EnumerationIterator((Enumeration ) value); } else { // XXX: should we return single iterator? -- To unsubscribe, e-mail: For additional commands, e-mail: