directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r656489 - in /directory: apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/xdbm/ apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/xdbm/search/ apacheds/branches/bigbang/xdbm-search/...
Date Thu, 15 May 2008 02:15:36 GMT
Author: akarasulu
Date: Wed May 14 19:15:36 2008
New Revision: 656489

URL: http://svn.apache.org/viewvc?rev=656489&view=rev
Log:
fixing issues with generics ...

 o there was a problem using generic methods which I reverted and corrected 
   by using a generic type on the value in ExprNodes
 o cleaned up some javadocs - asked some questions about stuff with TODOs 
 o added generics to filter expressions where appropriate based on the Value
   type which makes sense


Modified:
    directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/xdbm/Index.java
    directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java
    directory/apacheds/branches/bigbang/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Value.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java

Modified: directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/xdbm/Index.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/xdbm/Index.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/xdbm/Index.java
(original)
+++ directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/xdbm/Index.java
Wed May 14 19:15:36 2008
@@ -130,7 +130,7 @@
      * @return the normalized value.
      * @throws Exception if something goes wrong.
      */
-    <K> K getNormalized( K attrVal ) throws Exception;
+    K getNormalized( K attrVal ) throws Exception;
 
 
     /**
@@ -150,28 +150,28 @@
      * @return the number of key/value pairs in this index with the value value
      * @throws Exception on failure to access index db files
      */
-    <K> int count( K attrVal ) throws Exception;
+    int count( K attrVal ) throws Exception;
 
 
-    <K> int greaterThanCount( K attrVal ) throws Exception;
+    int greaterThanCount( K attrVal ) throws Exception;
 
 
-    <K> int lessThanCount( K attrVal ) throws Exception;
+    int lessThanCount( K attrVal ) throws Exception;
 
 
-    <K> Long forwardLookup( K attrVal ) throws Exception;
+    Long forwardLookup( K attrVal ) throws Exception;
 
 
     K reverseLookup( Long id ) throws Exception;
 
 
-    <K> void add( K attrVal, Long id ) throws Exception;
+    void add( K attrVal, Long id ) throws Exception;
 
 
     void drop( Long id ) throws Exception;
 
 
-    <K> void drop( K attrVal, Long id ) throws Exception;
+    void drop( K attrVal, Long id ) throws Exception;
 
 
     IndexCursor<K, O> reverseCursor() throws Exception;
@@ -183,49 +183,49 @@
     IndexCursor<K, O> reverseCursor( Long id ) throws Exception;
 
 
-    <K> IndexCursor<K, O> forwardCursor( K key ) throws Exception;
+    IndexCursor<K, O> forwardCursor( K key ) throws Exception;
 
 
     Cursor<K> reverseValueCursor( Long id ) throws Exception;
 
 
-    <K> Cursor<Long> forwardValueCursor( K key ) throws Exception;
+    Cursor<Long> forwardValueCursor( K key ) throws Exception;
 
 
-    <K> boolean forward( K attrVal ) throws Exception;
+    boolean forward( K attrVal ) throws Exception;
 
 
-    <K> boolean forward( K attrVal, Long id ) throws Exception;
+    boolean forward( K attrVal, Long id ) throws Exception;
 
 
     boolean reverse( Long id ) throws Exception;
 
 
-    <K> boolean reverse( Long id, K attrVal ) throws Exception;
+    boolean reverse( Long id, K attrVal ) throws Exception;
 
 
-    <K> boolean forwardGreaterOrEq( K attrVal ) throws Exception;
+    boolean forwardGreaterOrEq( K attrVal ) throws Exception;
 
 
-    <K> boolean forwardGreaterOrEq( K attrVal, Long id ) throws Exception;
+    boolean forwardGreaterOrEq( K attrVal, Long id ) throws Exception;
 
 
     boolean reverseGreaterOrEq( Long id ) throws Exception;
 
 
-    <K> boolean reverseGreaterOrEq( Long id, K attrVal ) throws Exception;
+    boolean reverseGreaterOrEq( Long id, K attrVal ) throws Exception;
 
 
-    <K> boolean forwardLessOrEq( K attrVal ) throws Exception;
+    boolean forwardLessOrEq( K attrVal ) throws Exception;
 
 
-    <K> boolean forwardLessOrEq( K attrVal, Long id ) throws Exception;
+    boolean forwardLessOrEq( K attrVal, Long id ) throws Exception;
 
 
     boolean reverseLessOrEq( Long id ) throws Exception;
 
 
-    <K> boolean reverseLessOrEq( Long id, K attrVal ) throws Exception;
+    boolean reverseLessOrEq( Long id, K attrVal ) throws Exception;
 
 
     void close() throws Exception;

Modified: directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java
(original)
+++ directory/apacheds/branches/bigbang/btree-base/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java
Wed May 14 19:15:36 2008
@@ -63,7 +63,7 @@
      * @return true if filter selects the candidate false otherwise
      * @throws Exception if there are faults during evaluation
      */
-    boolean evaluate( IndexEntry<?,E> entry ) throws Exception;
+    boolean evaluate( IndexEntry<?, E> entry ) throws Exception;
 
 
     /**

Modified: directory/apacheds/branches/bigbang/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
(original)
+++ directory/apacheds/branches/bigbang/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
Wed May 14 19:15:36 2008
@@ -44,18 +44,18 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class EqualityEvaluator implements Evaluator<EqualityNode, ServerEntry>
+public class EqualityEvaluator<T> implements Evaluator<EqualityNode<T>, ServerEntry>
 {
-    private final EqualityNode node;
+    private final EqualityNode<T> node;
     private final Store<ServerEntry> db;
     private final Registries registries;
     private final AttributeType type;
     private final Normalizer normalizer;
     private final Comparator comparator;
-    private final Index<?,ServerEntry> idx;
+    private final Index<T,ServerEntry> idx;
 
 
-    public EqualityEvaluator( EqualityNode node, Store<ServerEntry> db, Registries
registries )
+    public EqualityEvaluator( EqualityNode<T> node, Store<ServerEntry> db, Registries
registries )
         throws Exception
     {
         this.db = db;
@@ -89,7 +89,7 @@
     }
 
 
-    public EqualityNode getExpression()
+    public EqualityNode<T> getExpression()
     {
         return node;
     }
@@ -99,7 +99,7 @@
     {
         if ( idx != null )
         {
-            return idx.forward( indexEntry.getValue(), indexEntry.getId() );
+            return idx.forward( ( T ) indexEntry.getValue(), indexEntry.getId() );
         }
 
         ServerEntry entry = indexEntry.getObject();

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Value.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Value.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Value.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Value.java
Wed May 14 19:15:36 2008
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.entry;
 
+
 import java.io.Externalizable;
 
 import javax.naming.NamingException;
@@ -51,15 +52,15 @@
     /**
      * Sets the wrapped value.
      *
-     * @param wrapped the value to set. Should be either a String, URI, or a byte[]
+     * @param wrapped the value to set: either a String, URI, or a byte[]
      */
     void set( T wrapped );
     
 
     /**
-     * Get the stored value.
+     * Get the wrapped value.
      *
-     * @return The stored value
+     * @return the wrapped value
      */
     T get();
     
@@ -67,7 +68,7 @@
     /**
      * Get a reference on the stored value.
      *
-     * @return A reference on the stored value.
+     * @return a reference on the wrapped value.
      */
     T getReference();
     
@@ -75,7 +76,7 @@
     /**
      * Get a copy of the stored value.
      *
-     * @return A copy of the stored value.
+     * @return a copy of the stored value.
      */
     T getCopy();
     
@@ -106,7 +107,7 @@
     /**
      * Tells if the value is valid wrt a Syntax checker
      * 
-     * @param SyntaxChecker the Syntax checker to use to validate the value
+     * @param checker the SyntaxChecker to use to validate the value
      * @return <code>true</code> if the value is valid
      * @exception NamingException if the value cannot be validated
      */
@@ -116,7 +117,7 @@
     /**
      * Set the normalized flag.
      * 
-     * @param the value : true or false
+     * @param normalized the value : true or false
      */
     void setNormalized( boolean normalized );
 
@@ -156,7 +157,7 @@
      * Normalize the value. In order to use this method, the Value
      * must be schema aware.
      * 
-     * @exception NamingException If the value cannot be normalized
+     * @exception NamingException if the value cannot be normalized
      */
     void normalize() throws NamingException;
 
@@ -167,8 +168,8 @@
      * It supposes that the client has access to the schema in order to select the
      * appropriate normalizer.
      * 
-     * @param Normalizer The normalizer to apply to the value
-     * @exception NamingException If the value cannot be normalized
+     * @param normalizer the normalizer to apply to the value
+     * @exception NamingException if the value cannot be normalized
      */
     void normalize( Normalizer normalizer ) throws NamingException;
     

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java
Wed May 14 19:15:36 2008
@@ -27,7 +27,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Revision: 519266 $
  */
-public class ApproximateNode extends EqualityNode
+public class ApproximateNode<T> extends SimpleNode<T>
 {
     /**
      * Creates a new ApproximateNode object.
@@ -35,7 +35,7 @@
      * @param attribute the attribute name
      * @param value the value to test for
      */
-    public ApproximateNode( String attribute, Value<?> value )
+    public ApproximateNode( String attribute, Value<T> value )
     {
         super( attribute, value, AssertionType.APPROXIMATE );
     }

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java
Wed May 14 19:15:36 2008
@@ -43,6 +43,7 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
+
     /**
      * Creates an AssertionNode using an arbitrary candidate assertion.
      * 
@@ -88,9 +89,10 @@
 
 
     // ------------------------------------------------------------------------
-    // A B S T R A C T M E T H O D I M P L E M E N T A T I O N S
+    // A B S T R A C T    M E T H O D    I M P L E M E N T A T I O N S
     // ------------------------------------------------------------------------
 
+    
     /**
      * Always returns true since an AssertionNode has no children.
      * 
@@ -103,7 +105,7 @@
 
 
     /**
-     * @see ExprNode#printRefinementToBuffer(StringBuffer)
+     * @see ExprNode#printRefinementToBuffer(StringBuilder) 
      */
     public StringBuilder printRefinementToBuffer( StringBuilder buf ) throws UnsupportedOperationException
     {
@@ -135,6 +137,7 @@
         return visitor.visit( this );
     }
 
+
     /**
      * @see Object#toString
      */

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java
Wed May 14 19:15:36 2008
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.filter;
 
+
 import org.apache.directory.shared.ldap.entry.Value;
 
 
@@ -28,7 +29,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Revision: 519266 $
  */
-public class EqualityNode extends SimpleNode
+public class EqualityNode<T> extends SimpleNode<T>
 {
     /**
      * Creates a new Equality object.
@@ -36,25 +37,13 @@
      * @param attribute the attribute name
      * @param value the value to test for
      */
-    public EqualityNode( String attribute, Value<?> value )
+    public EqualityNode( String attribute, Value<T> value )
     {
         super( attribute, value, AssertionType.EQUALITY );
     }
 
 
     /**
-     * Creates a new Equality object.
-     * 
-     * @param attribute the attribute name
-     * @param value the value to test for
-     */
-    protected EqualityNode( String attribute, Value<?> value, AssertionType assertionType
)
-    {
-        super( attribute, value, assertionType );
-    }
-
-
-    /**
      * @see Object#hashCode()
      */
     public int hashCode()

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java
Wed May 14 19:15:36 2008
@@ -67,9 +67,12 @@
     /**
      * Recursively appends the refinement string representation of this node and its
      * descendants in prefix notation to a buffer.
+     *
+     * TODO - Why is this here? Why not put it in some utility class?
      * 
      * @param buf the buffer to append to.
      * @throws UnsupportedOperationException if this node isn't a part of a refinement.
+     * @return the refinement buffer
      */
     StringBuilder printRefinementToBuffer( StringBuilder buf ) throws UnsupportedOperationException;
     
@@ -78,7 +81,8 @@
      * Element/node accept method for visitor pattern.
      * 
      * @param visitor the filter expression tree structure visitor
-     * @return The modified element
+     * TODO - what is this modified element ?
+     * @return the modified element
      */
     Object accept( FilterVisitor visitor );
 }

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java
Wed May 14 19:15:36 2008
@@ -45,6 +45,8 @@
 
     /**
      * Creates a new emptyExtensibleNode object.
+     * 
+     * @param attribute the attribute associated with this node
      */
     public ExtensibleNode( String attribute )
     {

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java
Wed May 14 19:15:36 2008
@@ -29,7 +29,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Revision: 519266 $
  */
-public class GreaterEqNode extends SimpleNode
+public class GreaterEqNode<T> extends SimpleNode<T>
 {
     /**
      * Creates a new GreaterOrEqual object.
@@ -37,7 +37,7 @@
      * @param attribute the attribute name
      * @param value the value to test for
      */
-    public GreaterEqNode( String attribute, Value<?> value )
+    public GreaterEqNode( String attribute, Value<T> value )
     {
         super( attribute, value, AssertionType.GREATEREQ );
     }

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java
Wed May 14 19:15:36 2008
@@ -29,7 +29,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Revision: 519266 $
  */
-public class LessEqNode extends SimpleNode
+public class LessEqNode<T> extends SimpleNode<T>
 {
     /**
      * Creates a new LessEqNode object.
@@ -37,7 +37,7 @@
      * @param attribute the attribute name
      * @param value the value to test for
      */
-    public LessEqNode( String attribute, Value<?> value )
+    public LessEqNode( String attribute, Value<T> value )
     {
         super( attribute, value, AssertionType.LESSEQ );
     }

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java
Wed May 14 19:15:36 2008
@@ -30,12 +30,16 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Revision$
  */
-public abstract class SimpleNode extends LeafNode
+public abstract class SimpleNode<T> extends LeafNode
 {
     /** the value */
-    protected Value<?> value;
+    protected Value<T> value;
 
-    /** Constants for comparisons */
+    /**
+     * Constants for comparisons
+     *
+     * TODO - why are these here if not used?
+     */
     public final static boolean EVAL_GREATER = true;
     public final static boolean EVAL_LESSER = false;
 
@@ -45,8 +49,9 @@
      * 
      * @param attribute the attribute name
      * @param value the value to test for
+     * @param assertionType the type of assertion represented by this ExprNode
      */
-    protected SimpleNode( String attribute, Value<?> value, AssertionType assertionType
)
+    protected SimpleNode( String attribute, Value<T> value, AssertionType assertionType
)
     {
         super( attribute, assertionType );
         this.value = value;
@@ -58,7 +63,7 @@
      * 
      * @return the value
      */
-    public final Value<?> getValue()
+    public final Value<T> getValue()
     {
         return value;
     }
@@ -69,15 +74,19 @@
      * 
      * @param value the value for this node
      */
-    public void setValue( Value<?> value )
+    public void setValue( Value<T> value )
     {
         this.value = value;
     }
 
 
     /**
-     * @see org.apache.directory.shared.ldap.filter.ExprNode#printToBuffer(
-     *      java.lang.StringBuilder)
+     * Pretty prints this expression node along with annotation information.
+     *
+     * TODO - perhaps this belong in some utility class?
+     *
+     * @param buf the buffer to print into
+     * @return the same buf argument returned for call chaining
      */
     public StringBuilder printToBuffer( StringBuilder buf )
     {

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java?rev=656489&r1=656488&r2=656489&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java
Wed May 14 19:15:36 2008
@@ -70,8 +70,6 @@
      * Creates a new SubstringNode object without any value
      * 
      * @param attribute the name of the attribute to substring assert
-     * @param initialPattern the initial fragment
-     * @param finalPattern the final fragment
      */
     public SubstringNode( String attribute )
     {
@@ -176,8 +174,10 @@
     /**
      * Gets the compiled regular expression for the substring expression.
      * 
+     * @param normalizer the normalizer to use for pattern component normalization
      * @return the equivalent compiled regular expression
-     * @throws RESyntaxException if the regular expression is invalid
+     * @throws PatternSyntaxException if the regular expression is invalid
+     * @throws NamingException if there are problems while normalizing
      */
     public final Pattern getRegex( Normalizer normalizer ) throws PatternSyntaxException,
NamingException
     {



Mime
View raw message