From commits-return-4905-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Wed Nov 28 23:03:14 2007 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 41868 invoked from network); 28 Nov 2007 23:03:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Nov 2007 23:03:13 -0000 Received: (qmail 29214 invoked by uid 500); 28 Nov 2007 23:03:01 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 29189 invoked by uid 500); 28 Nov 2007 23:03:01 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 29180 invoked by uid 99); 28 Nov 2007 23:03:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2007 15:03:01 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2007 23:03:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1CCC01A9832; Wed, 28 Nov 2007 15:02:42 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r599184 - /jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java Date: Wed, 28 Nov 2007 23:02:41 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071128230242.1CCC01A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Wed Nov 28 15:02:41 2007 New Revision: 599184 URL: http://svn.apache.org/viewvc?rev=599184&view=rev Log: JCR-1181: Avoid using the deprecated IteratorHelper Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java?rev=599184&r1=599183&r2=599184&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java (original) +++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java Wed Nov 28 15:02:41 2007 @@ -22,7 +22,6 @@ import org.apache.jackrabbit.spi.IdFactory; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; -import org.apache.jackrabbit.util.IteratorHelper; import java.util.List; import java.util.ArrayList; @@ -92,18 +91,25 @@ } NodeId nodeId = nodeInfo.getId(); nodeId = idFactory.createNodeId(nodeId.getUniqueID(), nodeId.getPath()); + final Iterator propIds = nodeInfo.getPropertyIds(); return new NodeInfoImpl(parentId, nodeInfo.getName(), nodeInfo.getPath(), nodeId, nodeInfo.getIndex(), nodeInfo.getNodetype(), nodeInfo.getMixins(), serRefs.iterator(), - new IteratorHelper(nodeInfo.getPropertyIds()) { + new Iterator() { + public boolean hasNext() { + return propIds.hasNext(); + } public Object next() { - PropertyId propId = (PropertyId) super.next(); + PropertyId propId = (PropertyId) propIds.next(); NodeId parentId = propId.getParentId(); idFactory.createNodeId( parentId.getUniqueID(), parentId.getPath()); return idFactory.createPropertyId( parentId, propId.getName()); + } + public void remove() { + throw new UnsupportedOperationException(); } }); }