Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3C27B79A8 for ; Wed, 17 Aug 2011 16:55:14 +0000 (UTC) Received: (qmail 41508 invoked by uid 500); 17 Aug 2011 16:55:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 41430 invoked by uid 500); 17 Aug 2011 16:55:13 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 41418 invoked by uid 99); 17 Aug 2011 16:55:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Aug 2011 16:55:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Aug 2011 16:55:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8E7E323889B1 for ; Wed, 17 Aug 2011 16:54:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1158826 - in /directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm: ./ search/impl/ Date: Wed, 17 Aug 2011 16:54:49 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110817165450.8E7E323889B1@eris.apache.org> Author: elecharny Date: Wed Aug 17 16:54:49 2011 New Revision: 1158826 URL: http://svn.apache.org/viewvc?rev=1158826&view=rev Log: o Moved the beforeValue and afterValue methods to AbstractInexCursor o Added Javadoc Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java?rev=1158826&r1=1158825&r2=1158826&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java Wed Aug 17 16:54:49 2011 @@ -74,6 +74,24 @@ public abstract class AbstractIndexCurso throw new UnsupportedOperationException( getUnsupportedMessage() ); } + + /** + * {@inheritDoc} + */ + public void afterValue( ID id, V value ) throws Exception + { + throw new UnsupportedOperationException( getUnsupportedMessage() ); + } + + + /** + * {@inheritDoc} + */ + public void beforeValue( ID id, V value ) throws Exception + { + throw new UnsupportedOperationException( getUnsupportedMessage() ); + } + /** * {@inheritDoc} Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java?rev=1158826&r1=1158825&r2=1158826&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java Wed Aug 17 16:54:49 2011 @@ -19,8 +19,6 @@ package org.apache.directory.server.xdbm; -import static org.apache.directory.server.xdbm.AbstractIndexCursor.UNSUPPORTED_MSG; - import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; @@ -106,12 +104,18 @@ public class EmptyIndexCursor } + /** + * {@inheritDoc} + */ public void afterValue( ID id, K indexValue ) throws Exception { checkNotClosed( "after()" ); } + /** + * {@inheritDoc} + */ public void beforeValue( ID id, K indexValue ) throws Exception { checkNotClosed( "after()" ); Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java?rev=1158826&r1=1158825&r2=1158826&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java Wed Aug 17 16:54:49 2011 @@ -58,18 +58,6 @@ public class SingletonIndexCursor } - public void beforeValue( ID id, V value ) throws Exception - { - throw new UnsupportedOperationException(); - } - - - public void afterValue( ID id, V value ) throws Exception - { - throw new UnsupportedOperationException(); - } - - public void beforeFirst() throws Exception { checkNotClosed( "()" ); Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java?rev=1158826&r1=1158825&r2=1158826&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java Wed Aug 17 16:54:49 2011 @@ -65,8 +65,8 @@ public class AllEntriesCursor extends Ab } - public void beforeValue( ID id, V value ) - { - throw new UnsupportedOperationException( UNSUPPORTED_MSG ); - } - - - public void afterValue( ID id, V value ) - { - throw new UnsupportedOperationException( UNSUPPORTED_MSG ); - } - - public void beforeFirst() throws Exception { checkNotClosed( "beforeFirst()" ); Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java?rev=1158826&r1=1158825&r2=1158826&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java Wed Aug 17 16:54:49 2011 @@ -98,6 +98,9 @@ public class ApproximateCursor 0 ) { afterLast(); + return; } else if ( compareValue == 0 ) @@ -124,6 +128,7 @@ public class LessEqCursor= 0 ) { afterLast(); + return; } @@ -216,7 +226,7 @@ public class LessEqCursor extends Abs } - public void beforeValue( ID id, V value ) throws Exception - { - throw new UnsupportedOperationException( UNSUPPORTED_MSG ); - } - - - public void afterValue( ID id, V value ) throws Exception - { - throw new UnsupportedOperationException( UNSUPPORTED_MSG ); - } - - public void beforeFirst() throws Exception { checkNotClosed( "beforeFirst()" ); Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java?rev=1158826&r1=1158825&r2=1158826&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java Wed Aug 17 16:54:49 2011 @@ -84,6 +84,9 @@ public class PresenceCursor