Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 2214 invoked from network); 18 Apr 2004 04:53:52 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 18 Apr 2004 04:53:52 -0000 Received: (qmail 1957 invoked by uid 500); 18 Apr 2004 04:53:31 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 1920 invoked by uid 500); 18 Apr 2004 04:53:31 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk Reply-To: directory-dev@incubator.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list directory-cvs@incubator.apache.org Received: (qmail 1906 invoked from network); 18 Apr 2004 04:53:31 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 18 Apr 2004 04:53:31 -0000 Received: (qmail 2187 invoked by uid 65534); 18 Apr 2004 04:53:51 -0000 Date: 18 Apr 2004 04:53:51 -0000 Message-ID: <20040418045351.2184.qmail@minotaur.apache.org> From: akarasulu@apache.org To: directory-cvs@incubator.apache.org Subject: svn commit: rev 10079 - incubator/directory/snickers/trunk/ber/src/java/org/apache/snickers/ber/digester/rules X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Sat Apr 17 21:53:51 2004 New Revision: 10079 Modified: incubator/directory/snickers/trunk/ber/src/java/org/apache/snickers/ber/digester/rules/PrimitiveIntDecodeRule.java incubator/directory/snickers/trunk/ber/src/java/org/apache/snickers/ber/digester/rules/PrimitiveOctetStringRule.java Log: Commit changes ... o Set up the int decoder rule to follow same mechanism of octet rule where it allows for easy subclassing. Basically this translated to the introduction of a new tag member. o Set constructors that are used by subclasses exclusively to protected. Modified: incubator/directory/snickers/trunk/ber/src/java/org/apache/snickers/ber/digester/rules/PrimitiveIntDecodeRule.java ============================================================================== --- incubator/directory/snickers/trunk/ber/src/java/org/apache/snickers/ber/digester/rules/PrimitiveIntDecodeRule.java (original) +++ incubator/directory/snickers/trunk/ber/src/java/org/apache/snickers/ber/digester/rules/PrimitiveIntDecodeRule.java Sat Apr 17 21:53:51 2004 @@ -18,6 +18,7 @@ import org.apache.snickers.ber.TypeClass ; +import org.apache.snickers.ber.TagEnum; import org.apache.snickers.ber.digester.AbstractRule ; import org.apache.snickers.ber.primitives.UniversalTag ; import org.apache.snickers.ber.primitives.PrimitiveUtils ; @@ -52,26 +53,58 @@ private int pos ; /** the number of bytes we must read */ private int length ; + /** the tag this rule accepts */ + private final TagEnum tag ; + + + // ----------------------------------------------------------------------- + // C O N S T R U C T O R S + // ----------------------------------------------------------------------- + + + /** + * Creates a default primitive integer decoding rule that only accepts + * tags of UniversalTag.INTEGER. + */ + public PrimitiveIntDecodeRule() + { + tag = UniversalTag.INTEGER ; + } + + + /** + * Creates a default primitive integer decoding rule that only accepts + * tags of UniversalTag.INTEGER. + */ + protected PrimitiveIntDecodeRule( TagEnum tag ) + { + this.tag = tag ; + } + + + // ----------------------------------------------------------------------- + // Rule Implementation + // ----------------------------------------------------------------------- /* (non-Javadoc) - * @see org.apache.snickers.ber.Rule#tag(int, boolean, + * @see org.apache.snickers.ber.digester.Rule#tag(int, boolean, * org.apache.snickers.ber.TypeClass) */ public void tag( int id, boolean isPrimitive, TypeClass typeClass ) { - if ( id != UniversalTag.INTEGER.getTagId() ) + if ( id != tag.getTagId() ) { throw new IllegalArgumentException( - "Expecting " + UniversalTag.INTEGER.getName() - + " with an id of " + UniversalTag.INTEGER.getTagId() + "Expecting " + tag.getName() + + " with an id of " + tag.getTagId() + " but instead got a tag id of " + id ) ; } } /* (non-Javadoc) - * @see org.apache.snickers.ber.Rule#length(int) + * @see org.apache.snickers.ber.digester.Rule#length(int) */ public void length( int length ) { @@ -87,7 +120,7 @@ /* (non-Javadoc) - * @see org.apache.snickers.ber.Rule#value(java.nio.ByteBuffer) + * @see org.apache.snickers.ber.digester.Rule#value(java.nio.ByteBuffer) */ public void value( ByteBuffer buf ) { @@ -105,7 +138,7 @@ /* (non-Javadoc) - * @see org.apache.snickers.ber.Rule#finish() + * @see org.apache.snickers.ber.digester.Rule#finish() */ public void finish() { Modified: incubator/directory/snickers/trunk/ber/src/java/org/apache/snickers/ber/digester/rules/PrimitiveOctetStringRule.java ============================================================================== --- incubator/directory/snickers/trunk/ber/src/java/org/apache/snickers/ber/digester/rules/PrimitiveOctetStringRule.java (original) +++ incubator/directory/snickers/trunk/ber/src/java/org/apache/snickers/ber/digester/rules/PrimitiveOctetStringRule.java Sat Apr 17 21:53:51 2004 @@ -67,10 +67,9 @@ * OCTET_STRING fields are tagged with application specific tags. In * this case we match for a different tag. * - * * @param tag the tag to accept */ - public PrimitiveOctetStringRule( TagEnum tag ) + protected PrimitiveOctetStringRule( TagEnum tag ) { this.tag = tag ; }