You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2008/05/12 13:49:46 UTC
svn commit: r655480 [9/11] - in /directory:
apacheds/trunk/apacheds-jdbm/src/examples/
apacheds/trunk/apacheds-jdbm/src/main/java/jdbm/btree/
apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/
apached...
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java Mon May 12 04:49:35 2008
@@ -20,6 +20,17 @@
package org.apache.directory.shared.ldap.codec.modify;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.DirContext;
+
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
import org.apache.directory.shared.asn1.ber.tlv.Value;
@@ -33,18 +44,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.DirContext;
-
/**
* A ModifyRequest Message.
@@ -71,6 +70,7 @@
* AttributeValue ::= OCTET STRING
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class ModifyRequest extends LdapMessage
{
@@ -319,19 +319,16 @@
if ( ( modifications != null ) && ( modifications.size() != 0 ) )
{
- Iterator<ModificationItemImpl> modificationsIterator = modifications.iterator();
modificationSequenceLength = new LinkedList<Integer>();
modificationLength = new LinkedList<Integer>();
valuesLength = new LinkedList<Integer>();
- while ( modificationsIterator.hasNext() )
+ for ( ModificationItemImpl modification:modifications )
{
// Modification sequence length initialized with the operation
int localModificationSequenceLength = 1 + 1 + 1;
int localValuesLength = 0;
- ModificationItemImpl modification = modificationsIterator.next();
-
// Modification length initialized with the type
int typeLength = modification.getAttribute().getID().length();
int localModificationLength = 1 + TLV.getNbBytes( typeLength ) + typeLength;
@@ -442,14 +439,11 @@
// The modifications list
if ( ( modifications != null ) && ( modifications.size() != 0 ) )
{
- Iterator<ModificationItemImpl> modificationIterator = modifications.iterator();
int modificationNumber = 0;
// Compute the modifications length
- while ( modificationIterator.hasNext() )
+ for ( ModificationItemImpl modification:modifications )
{
- ModificationItemImpl modification = modificationIterator.next();
-
// The modification sequence
buffer.put( UniversalTag.SEQUENCE_TAG );
int localModificationSequenceLength = modificationSequenceLength
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponse.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponse.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponse.java Mon May 12 04:49:35 2008
@@ -35,6 +35,7 @@
* ModifyResponse ::= [APPLICATION 7] LDAPResult
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class ModifyResponse extends LdapResponse
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java Mon May 12 04:49:35 2008
@@ -42,6 +42,7 @@
* newSuperior [0] LDAPDN OPTIONAL }
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class ModifyDNRequest extends LdapMessage
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponse.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponse.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponse.java Mon May 12 04:49:35 2008
@@ -35,6 +35,7 @@
* ModifyDNResponse ::= [APPLICATION 13] LDAPResult
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class ModifyDNResponse extends LdapResponse
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AndFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AndFilter.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AndFilter.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AndFilter.java Mon May 12 04:49:35 2008
@@ -33,6 +33,7 @@
* And Filter Object to store the And filter.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class AndFilter extends ConnectorFilter
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java Mon May 12 04:49:35 2008
@@ -37,6 +37,7 @@
* Object to store the filter. A filter is seen as a tree with a root.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class AttributeValueAssertionFilter extends Filter
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ConnectorFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ConnectorFilter.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ConnectorFilter.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ConnectorFilter.java Mon May 12 04:49:35 2008
@@ -20,20 +20,20 @@
package org.apache.directory.shared.ldap.codec.search;
-import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.asn1.codec.EncoderException;
-
import java.nio.ByteBuffer;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
+import org.apache.directory.shared.asn1.codec.DecoderException;
+import org.apache.directory.shared.asn1.codec.EncoderException;
+
/**
* This Filter abstract class is used to store a set of filters used by
* OR/AND/NOT filters.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public abstract class ConnectorFilter extends Filter
{
@@ -109,12 +109,8 @@
if ( ( filterSet != null ) && ( filterSet.size() != 0 ) )
{
- Iterator<Filter> filterIterator = filterSet.iterator();
-
- while ( filterIterator.hasNext() )
+ for ( Filter filter:filterSet )
{
- Filter filter = filterIterator.next();
-
connectorFilterLength += filter.computeLength();
}
}
@@ -142,12 +138,8 @@
// encode each filter
if ( ( filterSet != null ) && ( filterSet.size() != 0 ) )
{
- Iterator<Filter> filterIterator = filterSet.iterator();
-
- while ( filterIterator.hasNext() )
+ for ( Filter filter:filterSet )
{
- Filter filter = filterIterator.next();
-
filter.encode( buffer );
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java Mon May 12 04:49:35 2008
@@ -34,6 +34,7 @@
* The search request filter Matching Rule assertion
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class ExtensibleMatchFilter extends Filter
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/Filter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/Filter.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/Filter.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/Filter.java Mon May 12 04:49:35 2008
@@ -29,6 +29,7 @@
* filters.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public abstract class Filter extends AbstractAsn1Object
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/NotFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/NotFilter.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/NotFilter.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/NotFilter.java Mon May 12 04:49:35 2008
@@ -33,6 +33,7 @@
* Not Filter Object to store the Not filter.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class NotFilter extends ConnectorFilter
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/OrFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/OrFilter.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/OrFilter.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/OrFilter.java Mon May 12 04:49:35 2008
@@ -33,6 +33,7 @@
* Or Filter Object to store the Or filter.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class OrFilter extends ConnectorFilter
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/PresentFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/PresentFilter.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/PresentFilter.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/PresentFilter.java Mon May 12 04:49:35 2008
@@ -33,6 +33,7 @@
* Object to store the filter. A filter is seen as a tree with a root.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class PresentFilter extends Filter
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java Mon May 12 04:49:35 2008
@@ -20,6 +20,14 @@
package org.apache.directory.shared.ldap.codec.search;
+import java.io.UnsupportedEncodingException;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+
import org.apache.directory.shared.asn1.Asn1Object;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
@@ -35,20 +43,13 @@
import org.apache.directory.shared.ldap.message.ScopeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import java.io.UnsupportedEncodingException;
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-
/**
* A SearchRequest ldapObject. It's a sub-class of Asn1Object, and it implements
* the ldapObject class to be seen as a member of the LdapMessage CHOICE.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class SearchRequest extends LdapMessage
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultDone.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultDone.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultDone.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultDone.java Mon May 12 04:49:35 2008
@@ -37,6 +37,7 @@
* LDAPResult It's a Response, so it inherites from LdapResponse.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class SearchResultDone extends LdapResponse
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java Mon May 12 04:49:35 2008
@@ -20,6 +20,16 @@
package org.apache.directory.shared.ldap.codec.search;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
import org.apache.directory.shared.asn1.ber.tlv.Value;
@@ -33,16 +43,6 @@
import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.apache.directory.shared.ldap.util.StringTools;
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-
/**
* A SearchResultEntry Message. Its syntax is :
@@ -63,6 +63,7 @@
* by one, followed by a searchResultDone message.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class SearchResultEntry extends LdapMessage
{
@@ -228,8 +229,8 @@
*/
public int computeLength()
{
- objectNameBytes = StringTools.getBytesUtf8( objectName.getUpName() );
-
+ objectNameBytes = StringTools.getBytesUtf8( objectName.getUpName() );
+
// The entry
searchResultEntryLength = 1 + TLV.getNbBytes( objectNameBytes.length ) + objectNameBytes.length;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultReference.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultReference.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultReference.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultReference.java Mon May 12 04:49:35 2008
@@ -20,6 +20,11 @@
package org.apache.directory.shared.ldap.codec.search;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.asn1.codec.EncoderException;
@@ -27,12 +32,6 @@
import org.apache.directory.shared.ldap.codec.LdapMessage;
import org.apache.directory.shared.ldap.codec.util.LdapURL;
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* A SearchResultReference Message. Its syntax is :
@@ -40,6 +39,7 @@
* SearchResultReference ::= [APPLICATION 19] SEQUENCE OF LDAPURL
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class SearchResultReference extends LdapMessage
{
@@ -123,12 +123,10 @@
{
searchResultReferenceLength = 0;
- Iterator<LdapURL> referencesIterator = searchResultReferences.iterator();
-
// We may have more than one reference.
- while ( referencesIterator.hasNext() )
+ for ( LdapURL url:searchResultReferences )
{
- int ldapUrlLength = referencesIterator.next().getNbBytes();
+ int ldapUrlLength = url.getNbBytes();
searchResultReferenceLength += 1 + TLV.getNbBytes( ldapUrlLength ) + ldapUrlLength;
}
@@ -162,13 +160,8 @@
buffer.put( TLV.getBytes( searchResultReferenceLength ) );
// The references. We must at least have one reference
- Iterator<LdapURL> referencesIterator = searchResultReferences.iterator();
-
- // We may have more than one reference.
- while ( referencesIterator.hasNext() )
+ for ( LdapURL reference:searchResultReferences )
{
- LdapURL reference = referencesIterator.next();
-
// Encode the reference
Value.encode( buffer, reference.getString() );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilter.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilter.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilter.java Mon May 12 04:49:35 2008
@@ -23,7 +23,6 @@
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
@@ -49,6 +48,7 @@
* final = value
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class SubstringFilter extends Filter
{
@@ -247,11 +247,8 @@
if ( anySubstrings != null )
{
- Iterator<String> anyIterator = anySubstrings.iterator();
-
- while ( anyIterator.hasNext() )
+ for ( String any:anySubstrings )
{
- String any = anyIterator.next();
int anyLength = StringTools.getBytesUtf8( any ).length;
substringsFilterSequenceLength += 1 + TLV.getNbBytes( anyLength ) + anyLength;
}
@@ -329,11 +326,8 @@
// The any substrings
if ( anySubstrings != null )
{
- Iterator<String> anyIterator = anySubstrings.iterator();
-
- while ( anyIterator.hasNext() )
+ for ( String any:anySubstrings )
{
- String any = anyIterator.next();
byte[] anyBytes = StringTools.getBytesUtf8( any );
buffer.put( ( byte ) LdapConstants.SUBSTRINGS_FILTER_ANY_TAG );
buffer.put( TLV.getBytes( anyBytes.length ) );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlCodec.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlCodec.java Mon May 12 04:49:35 2008
@@ -77,6 +77,7 @@
* </pre>
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class EntryChangeControlCodec extends AbstractAsn1Object
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlContainer.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlContainer.java Mon May 12 04:49:35 2008
@@ -25,6 +25,7 @@
/**
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class EntryChangeControlContainer extends AbstractContainer
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlDecoder.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlDecoder.java Mon May 12 04:49:35 2008
@@ -32,6 +32,7 @@
* A decoder for EntryChangeControls.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class EntryChangeControlDecoder extends Asn1Decoder implements ControlDecoder
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlGrammar.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlGrammar.java Mon May 12 04:49:35 2008
@@ -43,6 +43,7 @@
* this class. As it is a singleton, these declaration are only done once.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class EntryChangeControlGrammar extends AbstractGrammar
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlStatesEnum.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlStatesEnum.java Mon May 12 04:49:35 2008
@@ -29,6 +29,7 @@
* for debugging purposes.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class EntryChangeControlStatesEnum implements IStates
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlCodec.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlCodec.java Mon May 12 04:49:35 2008
@@ -33,6 +33,7 @@
* A persistence search object
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class PSearchControlCodec extends AbstractAsn1Object
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlContainer.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlContainer.java Mon May 12 04:49:35 2008
@@ -25,6 +25,7 @@
/**
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class PSearchControlContainer extends AbstractContainer
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlDecoder.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlDecoder.java Mon May 12 04:49:35 2008
@@ -32,6 +32,7 @@
* A decoder for PSearchControls.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class PSearchControlDecoder extends Asn1Decoder implements ControlDecoder
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlGrammar.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlGrammar.java Mon May 12 04:49:35 2008
@@ -56,6 +56,7 @@
* modDN (8).
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class PSearchControlGrammar extends AbstractGrammar
{
@@ -111,7 +112,9 @@
* Stores the change types value
*/
super.transitions[PSearchControlStatesEnum.PSEARCH_SEQUENCE_STATE][UniversalTag.INTEGER_TAG] =
- new GrammarTransition( PSearchControlStatesEnum.PSEARCH_SEQUENCE_STATE, PSearchControlStatesEnum.CHANGE_TYPES_STATE, UniversalTag.INTEGER_TAG,
+ new GrammarTransition( PSearchControlStatesEnum.PSEARCH_SEQUENCE_STATE,
+ PSearchControlStatesEnum.CHANGE_TYPES_STATE,
+ UniversalTag.INTEGER_TAG,
new GrammarAction( "Set PSearchControl changeTypes" )
{
public void action( IAsn1Container container ) throws DecoderException
@@ -122,7 +125,9 @@
try
{
// Check that the value is into the allowed interval
- int changeTypes = IntegerDecoder.parse( value, PSearchControlCodec.CHANGE_TYPES_MIN, PSearchControlCodec.CHANGE_TYPES_MAX );
+ int changeTypes = IntegerDecoder.parse( value,
+ PSearchControlCodec.CHANGE_TYPES_MIN,
+ PSearchControlCodec.CHANGE_TYPES_MAX );
if ( IS_DEBUG )
{
@@ -150,7 +155,8 @@
* Stores the change only flag
*/
super.transitions[PSearchControlStatesEnum.CHANGE_TYPES_STATE][UniversalTag.BOOLEAN_TAG] =
- new GrammarTransition( PSearchControlStatesEnum.CHANGE_TYPES_STATE, PSearchControlStatesEnum.CHANGES_ONLY_STATE, UniversalTag.BOOLEAN_TAG,
+ new GrammarTransition( PSearchControlStatesEnum.CHANGE_TYPES_STATE,
+ PSearchControlStatesEnum.CHANGES_ONLY_STATE, UniversalTag.BOOLEAN_TAG,
new GrammarAction( "Set PSearchControl changesOnly" )
{
public void action( IAsn1Container container ) throws DecoderException
@@ -188,7 +194,8 @@
* Stores the return ECs flag
*/
super.transitions[PSearchControlStatesEnum.CHANGES_ONLY_STATE][UniversalTag.BOOLEAN_TAG] =
- new GrammarTransition( PSearchControlStatesEnum.CHANGES_ONLY_STATE, PSearchControlStatesEnum.RETURN_ECS_STATE, UniversalTag.BOOLEAN_TAG,
+ new GrammarTransition( PSearchControlStatesEnum.CHANGES_ONLY_STATE,
+ PSearchControlStatesEnum.RETURN_ECS_STATE, UniversalTag.BOOLEAN_TAG,
new GrammarAction( "Set PSearchControl returnECs" )
{
public void action( IAsn1Container container ) throws DecoderException
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlStatesEnum.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlStatesEnum.java Mon May 12 04:49:35 2008
@@ -29,6 +29,7 @@
* debugging purposes.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class PSearchControlStatesEnum implements IStates
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlContainer.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlContainer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlContainer.java Mon May 12 04:49:35 2008
@@ -25,6 +25,7 @@
/**
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class SubEntryControlContainer extends AbstractContainer
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlDecoder.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlDecoder.java Mon May 12 04:49:35 2008
@@ -32,6 +32,7 @@
* A decoder for SubEntryControls.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class SubEntryControlDecoder extends Asn1Decoder implements ControlDecoder
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlGrammar.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlGrammar.java Mon May 12 04:49:35 2008
@@ -41,6 +41,7 @@
* this class. As it is a singleton, these declaration are only done once.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class SubEntryControlGrammar extends AbstractGrammar
{
@@ -63,7 +64,8 @@
super.transitions = new GrammarTransition[SubEntryControlStatesEnum.LAST_SUB_ENTRY_STATE][256];
super.transitions[SubEntryControlStatesEnum.START_STATE][UniversalTag.BOOLEAN_TAG] =
- new GrammarTransition( SubEntryControlStatesEnum.START_STATE, SubEntryControlStatesEnum.SUB_ENTRY_VISIBILITY_STATE, UniversalTag.BOOLEAN_TAG,
+ new GrammarTransition( SubEntryControlStatesEnum.START_STATE,
+ SubEntryControlStatesEnum.SUB_ENTRY_VISIBILITY_STATE, UniversalTag.BOOLEAN_TAG,
new GrammarAction( "SubEntryControl visibility" )
{
public void action( IAsn1Container container ) throws DecoderException
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlStatesEnum.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlStatesEnum.java Mon May 12 04:49:35 2008
@@ -29,6 +29,7 @@
* debugging purposes.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class SubEntryControlStatesEnum implements IStates
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequest.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequest.java Mon May 12 04:49:35 2008
@@ -37,6 +37,7 @@
* This ldapObject is empty.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class UnBindRequest extends LdapMessage
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/HttpClientError.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/HttpClientError.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/HttpClientError.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/HttpClientError.java Mon May 12 04:49:35 2008
@@ -31,7 +31,7 @@
*/
public class HttpClientError extends Error
{
- final static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapResultEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapResultEnum.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapResultEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapResultEnum.java Mon May 12 04:49:35 2008
@@ -24,6 +24,7 @@
* This typesafe-enum represent the different resultCode of a LdapResult.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class LdapResultEnum
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java Mon May 12 04:49:35 2008
@@ -20,11 +20,6 @@
package org.apache.directory.shared.ldap.codec.util;
-import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.filter.FilterParser;
-import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.util.StringTools;
-
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
@@ -40,6 +35,11 @@
import javax.naming.InvalidNameException;
import javax.naming.directory.SearchControls;
+import org.apache.directory.shared.asn1.codec.DecoderException;
+import org.apache.directory.shared.ldap.filter.FilterParser;
+import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.util.StringTools;
+
/**
* Decodes a LdapUrl, and checks that it complies with
@@ -62,6 +62,7 @@
* xtoken = ("X-" / "x-") token
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class LdapURL
{
@@ -178,7 +179,7 @@
}
// An optional '/'
- if ( StringTools.isCharASCII( chars, pos, '/' ) == false )
+ if ( !StringTools.isCharASCII( chars, pos, '/' ) )
{
throw new LdapURLEncodingException( "Bad character, position " + pos + ", '" + chars[pos]
+ "', '/' expected" );
@@ -203,7 +204,7 @@
}
// Optionals attributes
- if ( StringTools.isCharASCII( chars, pos, '?' ) == false )
+ if ( !StringTools.isCharASCII( chars, pos, '?' ) )
{
throw new LdapURLEncodingException( "Bad character, position " + pos + ", '" + chars[pos]
+ "', '?' expected" );
@@ -222,7 +223,7 @@
}
// Optional scope
- if ( StringTools.isCharASCII( chars, pos, '?' ) == false )
+ if ( !StringTools.isCharASCII( chars, pos, '?' ) )
{
throw new LdapURLEncodingException( "Bad character, position " + pos + ", '" + chars[pos]
+ "', '?' expected" );
@@ -241,7 +242,7 @@
}
// Optional filter
- if ( StringTools.isCharASCII( chars, pos, '?' ) == false )
+ if ( !StringTools.isCharASCII( chars, pos, '?' ) )
{
throw new LdapURLEncodingException( "Bad character, position " + pos + ", '" + chars[pos]
+ "', '?' expected" );
@@ -265,7 +266,7 @@
}
// Optional extensions
- if ( StringTools.isCharASCII( chars, pos, '?' ) == false )
+ if ( !StringTools.isCharASCII( chars, pos, '?' ) )
{
throw new LdapURLEncodingException( "Bad character, position " + pos + ", '" + chars[pos]
+ "', '?' expected" );
@@ -517,7 +518,7 @@
private int parsePort( char[] chars, int pos )
{
- if ( StringTools.isDigit( chars, pos ) == false )
+ if ( !StringTools.isDigit( chars, pos ) )
{
return -1;
}
@@ -816,7 +817,7 @@
String decodedAttr = decode( attribute );
- if ( hAttributes.contains( decodedAttr ) == false )
+ if ( !hAttributes.contains( decodedAttr ) )
{
attributes.add( decodedAttr );
hAttributes.add( decodedAttr );
@@ -863,7 +864,7 @@
String decodedAttr = decode( attribute );
- if ( hAttributes.contains( decodedAttr ) == false )
+ if ( !hAttributes.contains( decodedAttr ) )
{
attributes.add( decodedAttr );
hAttributes.add( decodedAttr );
@@ -1093,7 +1094,7 @@
else if ( StringTools.isCharASCII( chars, i, '!' ) )
{
- if ( isNewExtension == false )
+ if ( !isNewExtension )
{
// '!' must appears first
@@ -1180,6 +1181,7 @@
default:
sb.append( c );
+ break;
}
}
@@ -1209,8 +1211,8 @@
sb.append( '/' ).append( urlEncode( dn.toString(), false ) );
if ( ( attributes.size() != 0 )
- || ( ( scope != SearchControls.OBJECT_SCOPE ) || ( filter != null ) || ( extensions.size() != 0 ) || ( criticalExtensions
- .size() != 0 ) ) )
+ || ( ( scope != SearchControls.OBJECT_SCOPE ) || ( filter != null ) ||
+ ( extensions.size() != 0 ) || ( criticalExtensions.size() != 0 ) ) )
{
sb.append( '?' );
@@ -1273,7 +1275,7 @@
for ( String key:extensions.keySet() )
{
- if ( isFirst == false )
+ if ( !isFirst )
{
sb.append( ',' );
}
@@ -1294,7 +1296,7 @@
for ( String key:criticalExtensions.keySet() )
{
- if ( isFirst == false )
+ if ( !isFirst )
{
sb.append( ",!" );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURLEncodingException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURLEncodingException.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURLEncodingException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURLEncodingException.java Mon May 12 04:49:35 2008
@@ -26,6 +26,7 @@
* during the String creation.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class LdapURLEncodingException extends Exception
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/URIException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/URIException.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/URIException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/URIException.java Mon May 12 04:49:35 2008
@@ -29,7 +29,7 @@
*/
public class URIException extends Exception
{
- final static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
// ----------------------------------------------------------- constructors
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/UrlDecoderException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/UrlDecoderException.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/UrlDecoderException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/UrlDecoderException.java Mon May 12 04:49:35 2008
@@ -29,7 +29,7 @@
*/
public class UrlDecoderException extends Exception
{
- final static long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java Mon May 12 04:49:35 2008
@@ -19,12 +19,12 @@
package org.apache.directory.shared.ldap.entry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import java.util.Iterator;
+import java.util.List;
import javax.naming.NamingException;
-import java.util.Iterator;
-import java.util.List;
+import org.apache.directory.shared.ldap.name.LdapDN;
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientAttribute.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientAttribute.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientAttribute.java Mon May 12 04:49:35 2008
@@ -19,11 +19,11 @@
package org.apache.directory.shared.ldap.entry.client;
+import javax.naming.NamingException;
+
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
-import javax.naming.NamingException;
-
/**
* The server specific interface extending the EntryAttribute interface. It adds
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java Mon May 12 04:49:35 2008
@@ -19,6 +19,14 @@
package org.apache.directory.shared.ldap.entry.client;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+
+import javax.naming.NamingException;
+
import org.apache.directory.shared.ldap.NotImplementedException;
import org.apache.directory.shared.ldap.entry.AbstractValue;
import org.apache.directory.shared.ldap.entry.Value;
@@ -28,14 +36,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.naming.NamingException;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Arrays;
-
/**
* A server side schema aware wrapper around a binary attribute value.
@@ -49,7 +49,7 @@
public class ClientBinaryValue extends AbstractValue<byte[]>
{
/** Used for serialization */
- public static final long serialVersionUID = 2L;
+ private static final long serialVersionUID = 2L;
/** logger for reporting errors that might not be handled properly upstream */
private static final Logger LOG = LoggerFactory.getLogger( ClientBinaryValue.class );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientStringValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientStringValue.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientStringValue.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientStringValue.java Mon May 12 04:49:35 2008
@@ -24,6 +24,8 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import javax.naming.NamingException;
+
import org.apache.directory.shared.ldap.NotImplementedException;
import org.apache.directory.shared.ldap.entry.AbstractValue;
import org.apache.directory.shared.ldap.entry.Value;
@@ -31,8 +33,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.naming.NamingException;
-
/**
* A server side schema aware wrapper around a String attribute value.
@@ -46,7 +46,7 @@
public class ClientStringValue extends AbstractValue<String>
{
/** Used for serialization */
- public static final long serialVersionUID = 2L;
+ private static final long serialVersionUID = 2L;
/** logger for reporting errors that might not be handled properly upstream */
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java Mon May 12 04:49:35 2008
@@ -19,6 +19,14 @@
package org.apache.directory.shared.ldap.entry.client;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.naming.NamingException;
+import javax.naming.directory.InvalidAttributeValueException;
+
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
@@ -26,14 +34,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.naming.NamingException;
-import javax.naming.directory.InvalidAttributeValueException;
-
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
/**
* A client side entry attribute. The client is not aware of the schema,
@@ -46,9 +46,6 @@
*/
public class DefaultClientAttribute implements ClientAttribute
{
- /** Used for serialization */
- public static final long serialVersionUID = 2L;
-
/** logger for reporting errors that might not be handled properly upstream */
private static final Logger LOG = LoggerFactory.getLogger( DefaultClientAttribute.class );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java Mon May 12 04:49:35 2008
@@ -32,6 +32,8 @@
import java.util.SortedMap;
import java.util.TreeMap;
+import javax.naming.NamingException;
+
import org.apache.directory.shared.ldap.entry.AbstractEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -41,8 +43,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.naming.NamingException;
-
/**
* A default implementation of a ServerEntry which should suite most
@@ -56,7 +56,7 @@
public final class DefaultClientEntry extends AbstractEntry<String> implements ClientEntry, Externalizable
{
/** Used for serialization */
- public static final long serialVersionUID = 2L;
+ private static final long serialVersionUID = 2L;
/** The logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( DefaultClientEntry.class );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java Mon May 12 04:49:35 2008
@@ -20,8 +20,8 @@
package org.apache.directory.shared.ldap.filter;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
@@ -124,7 +124,7 @@
}
else
{
- return "";
+ return "";
}
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java Mon May 12 04:49:35 2008
@@ -105,15 +105,15 @@
for ( ExprNode node:children )
{
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- buf.append( ", " );
- }
-
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ buf.append( ", " );
+ }
+
node.printRefinementToBuffer( buf );
}
@@ -137,7 +137,7 @@
for ( ExprNode child:getChildren() )
{
- buf.append( child );
+ buf.append( child );
}
buf.append( ')' );
@@ -186,18 +186,18 @@
if ( children.size() != otherChildren.size() )
{
- return false;
+ return false;
}
for ( int i = 0; i < children.size(); i++ )
{
- ExprNode child = children.get( i );
- ExprNode otherChild = children.get( i );
-
- if ( !child.equals( otherChild ) )
- {
- return false;
- }
+ ExprNode child = children.get( i );
+ ExprNode otherChild = children.get( i );
+
+ if ( !child.equals( otherChild ) )
+ {
+ return false;
+ }
}
return true;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java Mon May 12 04:49:35 2008
@@ -140,13 +140,13 @@
*/
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
- buf.append( "(@" );
- buf.append( desc );
- buf.append( super.toString() );
- buf.append( ')' );
-
+ StringBuilder buf = new StringBuilder();
+
+ buf.append( "(@" );
+ buf.append( desc );
+ buf.append( super.toString() );
+ buf.append( ')' );
+
return buf.toString();
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java Mon May 12 04:49:35 2008
@@ -170,7 +170,7 @@
}
else
{
- return null;
+ return null;
}
}
}
@@ -217,7 +217,7 @@
if ( other.getClass() != this.getClass() )
{
- return false;
+ return false;
}
BranchNode otherExprNode = ( BranchNode ) other;
@@ -231,18 +231,18 @@
if ( children.size() != otherChildren.size() )
{
- return false;
+ return false;
}
for ( int i = 0; i < children.size(); i++ )
{
- ExprNode child = children.get( i );
- ExprNode otherChild = children.get( i );
-
- if ( !child.equals( otherChild ) )
- {
- return false;
- }
+ ExprNode child = children.get( i );
+ ExprNode otherChild = children.get( i );
+
+ if ( !child.equals( otherChild ) )
+ {
+ return false;
+ }
}
return true;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNormalizedVisitor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNormalizedVisitor.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNormalizedVisitor.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNormalizedVisitor.java Mon May 12 04:49:35 2008
@@ -20,12 +20,12 @@
package org.apache.directory.shared.ldap.filter;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import java.util.Comparator;
-import java.io.IOException;
-import java.text.ParseException;
/**
@@ -68,16 +68,16 @@
{
if ( !child.isLeaf() )
{
- ExprNode newChild = (ExprNode)visit( child );
-
- if ( newChild != null )
- {
- set.add( newChild );
- }
+ ExprNode newChild = (ExprNode)visit( child );
+
+ if ( newChild != null )
+ {
+ set.add( newChild );
+ }
}
else
{
- set.add( child );
+ set.add( child );
}
}
@@ -153,7 +153,7 @@
{
public int compare( ExprNode o1, ExprNode o2 )
{
- StringBuilder buf = new StringBuilder();
+ StringBuilder buf = new StringBuilder();
buf.setLength( 0 );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java Mon May 12 04:49:35 2008
@@ -191,8 +191,8 @@
*/
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
+ StringBuilder buf = new StringBuilder();
+
buf.append( '(' ).append( getAttribute() );
buf.append( "-" );
buf.append( dnAttributes );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java Mon May 12 04:49:35 2008
@@ -604,7 +604,7 @@
// StringTools.trimLeft( filter, pos );
// Check for the left '('
- if ( StringTools.isCharASCII( filter, pos.start, '(' ) == false )
+ if ( !StringTools.isCharASCII( filter, pos.start, '(' ) )
{
// No more node, get out
if ( ( pos.start == 0 ) && ( pos.length != 0 ) )
@@ -634,7 +634,7 @@
// StringTools.trimLeft( filter, pos );
// Check that we have a right ')'
- if ( StringTools.isCharASCII( filter, pos.start, ')' ) == false )
+ if ( !StringTools.isCharASCII( filter, pos.start, ')' ) )
{
throw new ParseException( "The filter has no right parenthese", pos.start );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java Mon May 12 04:49:35 2008
@@ -111,7 +111,7 @@
if ( other.getClass() != this.getClass() )
{
- return false;
+ return false;
}
return attribute.equals( ( ( LeafNode ) other ).getAttribute() );
@@ -130,7 +130,7 @@
}
else
{
- return null;
+ return null;
}
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java Mon May 12 04:49:35 2008
@@ -42,10 +42,10 @@
{
super( AssertionType.NOT );
- if ( this.children.size() > 1 )
- {
- throw new IllegalStateException( "Cannot add more than one element to a negation node." );
- }
+ if ( this.children.size() > 1 )
+ {
+ throw new IllegalStateException( "Cannot add more than one element to a negation node." );
+ }
}
@@ -64,11 +64,11 @@
*/
public void addNode( ExprNode node )
{
- if ( children.size() >= 1 )
- {
- throw new IllegalStateException( "Cannot add more than one element to a negation node." );
- }
-
+ if ( children.size() >= 1 )
+ {
+ throw new IllegalStateException( "Cannot add more than one element to a negation node." );
+ }
+
children.add( node );
}
@@ -80,11 +80,11 @@
*/
public void addNodeToHead( ExprNode node )
{
- if ( children.size() >= 1 )
- {
- throw new IllegalStateException( "Cannot add more than one element to a negation node." );
- }
-
+ if ( children.size() >= 1 )
+ {
+ throw new IllegalStateException( "Cannot add more than one element to a negation node." );
+ }
+
children.add( node );
}
@@ -96,12 +96,12 @@
*/
public void setChildren( List<ExprNode> list )
{
- if ( ( list != null ) && ( list.size() > 1 ) )
- {
- throw new IllegalStateException( "Cannot add more than one element to a negation node." );
- }
+ if ( ( list != null ) && ( list.size() > 1 ) )
+ {
+ throw new IllegalStateException( "Cannot add more than one element to a negation node." );
+ }
- children = list;
+ children = list;
}
@@ -159,15 +159,15 @@
for ( ExprNode node:children )
{
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- buf.append( ", " );
- }
-
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ buf.append( ", " );
+ }
+
node.printRefinementToBuffer( buf );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java Mon May 12 04:49:35 2008
@@ -107,15 +107,15 @@
for ( ExprNode node:children )
{
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- buf.append( ", " );
- }
-
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ buf.append( ", " );
+ }
+
node.printRefinementToBuffer( buf );
}
@@ -139,11 +139,11 @@
for ( ExprNode child:getChildren() )
{
- buf.append( child );
+ buf.append( child );
}
buf.append( ')' );
-
+
return buf.toString();
}
@@ -188,18 +188,18 @@
if ( children.size() != otherChildren.size() )
{
- return false;
+ return false;
}
for ( int i = 0; i < children.size(); i++ )
{
- ExprNode child = children.get( i );
- ExprNode otherChild = children.get( i );
-
- if ( !child.equals( otherChild ) )
- {
- return false;
- }
+ ExprNode child = children.get( i );
+ ExprNode otherChild = children.get( i );
+
+ if ( !child.equals( otherChild ) )
+ {
+ return false;
+ }
}
return true;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java Mon May 12 04:49:35 2008
@@ -45,8 +45,8 @@
*/
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
+ StringBuilder buf = new StringBuilder();
+
buf.append( '(' ).append( getAttribute() ).append( "=*" );
buf.append( super.toString() );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java Mon May 12 04:49:35 2008
@@ -128,7 +128,7 @@
}
else
{
- return null;
+ return null;
}
}
@@ -154,9 +154,9 @@
*/
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
- buf.append( "(#{" );
+ StringBuilder buf = new StringBuilder();
+
+ buf.append( "(#{" );
switch ( scope )
{
@@ -178,15 +178,15 @@
default:
buf.append( "UNKNOWN" );
}
-
- buf.append( ", '" );
- buf.append( baseDn );
- buf.append( "', " );
- buf.append( aliasDerefAliases );
- buf.append( "}" );
- buf.append( super.toString() );
- buf.append( ')' );
-
- return buf.toString();
+
+ buf.append( ", '" );
+ buf.append( baseDn );
+ buf.append( "', " );
+ buf.append( aliasDerefAliases );
+ buf.append( "}" );
+ buf.append( super.toString() );
+ buf.append( ')' );
+
+ return buf.toString();
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java Mon May 12 04:49:35 2008
@@ -116,10 +116,10 @@
* Set the initial pattern
* @param initialPattern The initial pattern
*/
- public void setInitial( String initialPattern )
- {
- this.initialPattern = initialPattern;
- }
+ public void setInitial( String initialPattern )
+ {
+ this.initialPattern = initialPattern;
+ }
/**
* Gets the final fragment or suffix.
@@ -136,10 +136,10 @@
* Set the final pattern
* @param finalPattern The final pattern
*/
- public void setFinal( String finalPattern )
- {
- this.finalPattern = finalPattern;
- }
+ public void setFinal( String finalPattern )
+ {
+ this.finalPattern = finalPattern;
+ }
/**
@@ -157,10 +157,10 @@
* Set the any patterns
* @param anyPattern The any patterns
*/
- public void setAny( List<String> anyPattern )
- {
- this.anyPattern = anyPattern;
- }
+ public void setAny( List<String> anyPattern )
+ {
+ this.anyPattern = anyPattern;
+ }
/**
@@ -259,8 +259,8 @@
*/
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
+ StringBuilder buf = new StringBuilder();
+
buf.append( '(' ).append( getAttribute() ).append( '=' );
if ( null != initialPattern )
@@ -274,11 +274,11 @@
if ( null != anyPattern )
{
- for ( String any:anyPattern )
- {
- buf.append( any );
- buf.append( '*' );
- }
+ for ( String any:anyPattern )
+ {
+ buf.append( any );
+ buf.append( '*' );
+ }
}
if ( null != finalPattern )