From depot-cvs-return-485-apmail-incubator-depot-cvs-archive=incubator.apache.org@incubator.apache.org Thu Jun 24 06:38:34 2004 Return-Path: Delivered-To: apmail-incubator-depot-cvs-archive@www.apache.org Received: (qmail 70018 invoked from network); 24 Jun 2004 06:38:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 24 Jun 2004 06:38:34 -0000 Received: (qmail 52432 invoked by uid 500); 24 Jun 2004 06:39:10 -0000 Delivered-To: apmail-incubator-depot-cvs-archive@incubator.apache.org Received: (qmail 52362 invoked by uid 500); 24 Jun 2004 06:39:09 -0000 Mailing-List: contact depot-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: depot-dev@incubator.apache.org Delivered-To: mailing list depot-cvs@incubator.apache.org Received: (qmail 52043 invoked by uid 99); 24 Jun 2004 06:39:05 -0000 X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Wed, 23 Jun 2004 23:39:05 -0700 Received: (qmail 69875 invoked by uid 65534); 24 Jun 2004 06:38:28 -0000 Date: 24 Jun 2004 06:38:28 -0000 Message-ID: <20040624063828.69873.qmail@minotaur.apache.org> From: nickchalko@apache.org To: depot-cvs@incubator.apache.org Subject: svn commit: rev 21629 - incubator/depot/trunk/version/src/java/org/apache/depot/version/impl/data/util X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: nickchalko Date: Wed Jun 23 23:38:27 2004 New Revision: 21629 Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/impl/data/util/VersionDataRangeIterator.java Log: Organized Imports. Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/impl/data/util/VersionDataRangeIterator.java ============================================================================== --- incubator/depot/trunk/version/src/java/org/apache/depot/version/impl/data/util/VersionDataRangeIterator.java (original) +++ incubator/depot/trunk/version/src/java/org/apache/depot/version/impl/data/util/VersionDataRangeIterator.java Wed Jun 23 23:38:27 2004 @@ -16,99 +16,81 @@ package org.apache.depot.version.impl.data.util; -import java.util.Iterator; - import org.apache.depot.version.impl.data.VersionData; /** * @author ajack */ public class VersionDataRangeIterator extends VersionDataIterator { - protected VersionDataRange m_range = null; + protected VersionDataRange m_range = null; + + public VersionDataRangeIterator(VersionData lower, VersionData higher) { + super(lower); - public VersionDataRangeIterator( - VersionData lower, - VersionData higher) { - super(lower); - - m_range = - new VersionDataRange( - VersionDataComparison.getGreaterThanOrEqual(lower), - VersionDataComparison.getLessThanOrEqual(higher)); - } - - public VersionDataRangeIterator( - VersionData lower, - VersionData higher, - VersionDataIncrementor incrementor) { - super(lower, incrementor); - - m_range = - new VersionDataRange( - VersionDataComparison.getGreaterThanOrEqual(lower), - VersionDataComparison.getLessThanOrEqual(higher)); - } - - public VersionDataRangeIterator(VersionDataRange range) { - super(range.getLower().getComparison()); - - m_range = range; - } - - public VersionDataRangeIterator( - VersionDataRange range, - VersionDataIncrementor incrementor) { - super(range.getLower().getComparison(), incrementor); - - m_range = range; - } - - /** - * @see java.util.Iterator#hasNext() - */ - public boolean hasNext() { - return (null != m_next); - } - - /** - * @see java.util.Iterator#remove() - */ - public void remove() { - skipToNext(); - } - - protected void skipToNext() { - super.skipToNext(); - - if (m_next != null) { - //VersionLogger.g_log.debug("RSkip :" + m_next); - - if (!m_range.inRange(m_next)) - m_next = null; - - //VersionLogger.g_log.debug("RNext:" + m_next); - } - } - - /* Tests ought be unit tests... - public static void main(String args[]) throws Exception { - VersionData lower = new VersionData(1, 1, "alpha", 1, 1, 1); - VersionData upper = new VersionData(1, 1, "alpha", 1, 1, 10); - - int count = 0; - for (Iterator i = - new VersionDataRangeIterator( - lower, - upper, - VersionDataIncrementor.POINT); - i.hasNext(); - ++count) { - System.out.println("Count:" + count); - i.next(); - } - - System.out.println("Total Count:" + count); - } - - */ -} + m_range = new VersionDataRange(VersionDataComparison + .getGreaterThanOrEqual(lower), VersionDataComparison + .getLessThanOrEqual(higher)); + } + + public VersionDataRangeIterator(VersionData lower, VersionData higher, + VersionDataIncrementor incrementor) { + super(lower, incrementor); + + m_range = new VersionDataRange(VersionDataComparison + .getGreaterThanOrEqual(lower), VersionDataComparison + .getLessThanOrEqual(higher)); + } + + public VersionDataRangeIterator(VersionDataRange range) { + super(range.getLower().getComparison()); + + m_range = range; + } + + public VersionDataRangeIterator(VersionDataRange range, + VersionDataIncrementor incrementor) { + super(range.getLower().getComparison(), incrementor); + + m_range = range; + } + + /** + * @see java.util.Iterator#hasNext() + */ + public boolean hasNext() { + return (null != m_next); + } + + /** + * @see java.util.Iterator#remove() + */ + public void remove() { + skipToNext(); + } + + protected void skipToNext() { + super.skipToNext(); + + if (m_next != null) { + //VersionLogger.g_log.debug("RSkip :" + m_next); + + if (!m_range.inRange(m_next)) + m_next = null; + + //VersionLogger.g_log.debug("RNext:" + m_next); + } + } + + /* + * Tests ought be unit tests... public static void main(String args[]) + * throws Exception { VersionData lower = new VersionData(1, 1, "alpha", 1, + * 1, 1); VersionData upper = new VersionData(1, 1, "alpha", 1, 1, 10); + * + * int count = 0; for (Iterator i = new VersionDataRangeIterator( lower, + * upper, VersionDataIncrementor.POINT); i.hasNext(); ++count) { + * System.out.println("Count:" + count); i.next(); } + * + * System.out.println("Total Count:" + count); } + * + */ +} \ No newline at end of file