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 2012/01/24 18:44:32 UTC
svn commit: r1235374 [5/27] - in /directory/shared/trunk:
ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/
ldap/model/src/main/java/org/apache/directory/shared/ldap/model/csn/
ldap/model/src/main/java/org/apache/directory/shar...
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java Tue Jan 24 17:44:03 2012
@@ -45,7 +45,8 @@ public class StringValue extends Abstrac
{
/** Used for serialization */
private static final long serialVersionUID = 2L;
-
+
+
// -----------------------------------------------------------------------
// Constructors
// -----------------------------------------------------------------------
@@ -54,7 +55,7 @@ public class StringValue extends Abstrac
*
* @param attributeType the schema attribute type associated with this StringValue
*/
- /* No protection*/ StringValue( AttributeType attributeType )
+ /* No protection*/StringValue( AttributeType attributeType )
{
if ( attributeType != null )
{
@@ -63,13 +64,13 @@ public class StringValue extends Abstrac
{
throw new IllegalArgumentException( I18n.err( I18n.ERR_04445 ) );
}
-
- if ( ! attributeType.getSyntax().isHumanReadable() )
+
+ if ( !attributeType.getSyntax().isHumanReadable() )
{
LOG.warn( "Treating a value of a binary attribute {} as a String: "
+ "\nthis could cause data corruption!", attributeType.getName() );
}
-
+
this.attributeType = attributeType;
}
}
@@ -114,8 +115,8 @@ public class StringValue extends Abstrac
// object without copying it.
return wrappedValue;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -123,8 +124,8 @@ public class StringValue extends Abstrac
{
return normalizedValue;
}
-
-
+
+
// -----------------------------------------------------------------------
// Comparable<String> Methods
// -----------------------------------------------------------------------
@@ -157,9 +158,9 @@ public class StringValue extends Abstrac
LOG.error( message );
throw new NotImplementedException( message );
}
-
+
StringValue stringValue = ( StringValue ) value;
-
+
if ( attributeType != null )
{
if ( stringValue.getAttributeType() == null )
@@ -176,11 +177,11 @@ public class StringValue extends Abstrac
}
}
}
- else
+ else
{
return getNormValue().compareTo( stringValue.getNormValue() );
}
-
+
try
{
return getLdapComparator().compare( getNormValue(), stringValue.getNormValue() );
@@ -202,7 +203,7 @@ public class StringValue extends Abstrac
*/
public StringValue clone()
{
- return (StringValue)super.clone();
+ return ( StringValue ) super.clone();
}
@@ -223,13 +224,13 @@ public class StringValue extends Abstrac
{
return 0;
}
-
+
// If the normalized value is null, will default to wrapped
// which cannot be null at this point.
// If the normalized value is null, will default to wrapped
// which cannot be null at this point.
String normalized = getNormValue();
-
+
if ( normalized != null )
{
h = normalized.hashCode();
@@ -239,7 +240,7 @@ public class StringValue extends Abstrac
h = 17;
}
}
-
+
return h;
}
@@ -256,18 +257,18 @@ public class StringValue extends Abstrac
return true;
}
- if ( ! ( obj instanceof StringValue ) )
+ if ( !( obj instanceof StringValue ) )
{
return false;
}
StringValue other = ( StringValue ) obj;
-
+
if ( this.isNull() )
{
return other.isNull();
}
-
+
// First check the upValue. If they are equal, the Values are equal
if ( wrappedValue == other.wrappedValue )
{
@@ -331,7 +332,8 @@ public class StringValue extends Abstrac
else
{
Normalizer normalizer = attributeType.getEquality().getNormalizer();
- return comparator.compare( normalizer.normalize( getValue() ), normalizer.normalize( other.getValue() ) ) == 0;
+ return comparator.compare( normalizer.normalize( getValue() ),
+ normalizer.normalize( other.getValue() ) ) == 0;
}
}
}
@@ -345,8 +347,8 @@ public class StringValue extends Abstrac
return this.getNormValue().equals( other.getNormValue() );
}
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -355,7 +357,7 @@ public class StringValue extends Abstrac
return true;
}
-
+
/**
* @return The length of the interned value
*/
@@ -363,8 +365,8 @@ public class StringValue extends Abstrac
{
return wrappedValue != null ? wrappedValue.length() : 0;
}
-
-
+
+
/**
* Get the wrapped value as a byte[].
* @return the wrapped value as a byte[]
@@ -373,8 +375,8 @@ public class StringValue extends Abstrac
{
return Strings.getBytesUtf8( wrappedValue );
}
-
-
+
+
/**
* Get the wrapped value as a String.
*
@@ -384,8 +386,8 @@ public class StringValue extends Abstrac
{
return wrappedValue != null ? wrappedValue : "";
}
-
-
+
+
/**
* Deserialize a StringValue. It will return a new StringValue instance.
*
@@ -396,13 +398,13 @@ public class StringValue extends Abstrac
*/
public static StringValue deserialize( ObjectInput in ) throws IOException, ClassNotFoundException
{
- StringValue value = new StringValue( (AttributeType)null );
+ StringValue value = new StringValue( ( AttributeType ) null );
value.readExternal( in );
return value;
}
-
-
+
+
/**
* Deserialize a schemaAware StringValue. It will return a new StringValue instance.
*
@@ -412,15 +414,16 @@ public class StringValue extends Abstrac
* @throws IOException If the stream can't be read
* @throws ClassNotFoundException If we can't instanciate a StringValue
*/
- public static StringValue deserialize( AttributeType attributeType, ObjectInput in ) throws IOException, ClassNotFoundException
+ public static StringValue deserialize( AttributeType attributeType, ObjectInput in ) throws IOException,
+ ClassNotFoundException
{
StringValue value = new StringValue( attributeType );
value.readExternal( in );
return value;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -428,22 +431,22 @@ public class StringValue extends Abstrac
{
// Read the STRING flag
boolean isHR = in.readBoolean();
-
- if ( ! isHR )
+
+ if ( !isHR )
{
throw new IOException( "The serialized value is not a String value" );
}
-
+
// Read the wrapped value, if it's not null
if ( in.readBoolean() )
{
wrappedValue = in.readUTF();
}
-
+
// Read the isNormalized flag
boolean normalized = in.readBoolean();
-
- if ( normalized )
+
+ if ( normalized )
{
// Read the normalized value, if not null
if ( in.readBoolean() )
@@ -455,12 +458,12 @@ public class StringValue extends Abstrac
{
normalizedValue = wrappedValue;
}
-
+
// The hashCoe
h = in.readInt();
}
-
+
/**
* {@inheritDoc}
*/
@@ -468,7 +471,7 @@ public class StringValue extends Abstrac
{
// Write a boolean for the HR flag
out.writeBoolean( STRING );
-
+
// Write the wrapped value, if it's not null
if ( wrappedValue != null )
{
@@ -479,14 +482,14 @@ public class StringValue extends Abstrac
{
out.writeBoolean( false );
}
-
+
// Write the isNormalized flag
if ( attributeType != null )
{
// This flag is present to tell that we have a normalized value different
// from the upValue
out.writeBoolean( true );
-
+
// Write the normalized value, if not null
if ( normalizedValue != null )
{
@@ -503,20 +506,20 @@ public class StringValue extends Abstrac
// No normalized value
out.writeBoolean( false );
}
-
+
// Write the hashCode
out.writeInt( h );
-
+
// and flush the data
out.flush();
}
-
+
/**
* @see Object#toString()
*/
public String toString()
{
- return wrappedValue == null ? "null": wrappedValue;
+ return wrappedValue == null ? "null" : wrappedValue;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Value.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Value.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Value.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Value.java Tue Jan 24 17:44:03 2012
@@ -39,6 +39,7 @@ public interface Value<T> extends Clonea
public static final boolean STRING = true;
public static final boolean BINARY = false;
+
/**
* Apply an AttributeType to the current Value, normalizing it.
*
@@ -47,7 +48,7 @@ public interface Value<T> extends Clonea
* to the schema
*/
void apply( AttributeType attributeType ) throws LdapInvalidAttributeValueException;
-
+
/**
* Clone a Value
@@ -55,16 +56,16 @@ public interface Value<T> extends Clonea
* @return A cloned value
*/
Value<T> clone();
-
-
+
+
/**
* Check if the contained value is null or not
*
* @return <code>true</code> if the inner value is null.
*/
boolean isNull();
-
-
+
+
/**
* Get the associated AttributeType
*
@@ -72,7 +73,7 @@ public interface Value<T> extends Clonea
*/
AttributeType getAttributeType();
-
+
/**
* Check if the value is stored into an instance of the given
* AttributeType, or one of its ascendant.
@@ -86,15 +87,15 @@ public interface Value<T> extends Clonea
*/
boolean isInstanceOf( AttributeType attributeType );
-
+
/**
* Get the wrapped value. It will return a copy, not a reference.
*
* @return a copy of the wrapped value
*/
T getValue();
-
-
+
+
/**
* Get the wrapped value as a byte[]. If the original value
* is binary, this method will return a copy of the wrapped byte[]
@@ -102,8 +103,8 @@ public interface Value<T> extends Clonea
* @return the wrapped value as a byte[]
*/
byte[] getBytes();
-
-
+
+
/**
* Get the wrapped value as a String. If the original value
* is binary, this method will return the value as if it was
@@ -112,8 +113,8 @@ public interface Value<T> extends Clonea
* @return the wrapped value as a String
*/
String getString();
-
-
+
+
/**
* Gets a reference to the wrapped value.
*
@@ -122,16 +123,16 @@ public interface Value<T> extends Clonea
* @return a direct handle on the value that is wrapped
*/
T getReference();
-
-
+
+
/**
* Tells if the value is schema aware or not.
*
* @return <code>true</code> if the value is sxhema aware
*/
boolean isSchemaAware();
-
-
+
+
/**
* Uses the syntaxChecker associated with the attributeType to check if the
* value is valid.
@@ -142,7 +143,7 @@ public interface Value<T> extends Clonea
*/
boolean isValid( SyntaxChecker checker ) throws LdapInvalidAttributeValueException;
-
+
/**
* Gets the normalized (canonical) representation for the wrapped string.
* If the wrapped String is null, null is returned, otherwise the normalized
@@ -152,8 +153,8 @@ public interface Value<T> extends Clonea
* @return gets the normalized value
*/
T getNormValue();
-
-
+
+
/**
* Gets a reference to the the normalized (canonical) representation
* for the wrapped value.
@@ -162,15 +163,15 @@ public interface Value<T> extends Clonea
*/
T getNormReference();
-
+
/**
* Tells if the current value is Human Readable
*
* @return <code>true</code> if the value is a String, <code>false</code> otherwise
*/
boolean isHumanReadable();
-
-
+
+
/**
* @return The length of the interned value
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAffectMultipleDsaException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAffectMultipleDsaException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAffectMultipleDsaException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAffectMultipleDsaException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapAffectMultipleDsaExcept
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapAffectMultipleDsaException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAliasDereferencingException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAliasDereferencingException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAliasDereferencingException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAliasDereferencingException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapAliasDereferencingExcep
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapAliasDereferencingException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAliasException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAliasException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAliasException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAliasException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapAliasException extends
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapAliasException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAttributeInUseException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAttributeInUseException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAttributeInUseException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAttributeInUseException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapAttributeInUseException
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapAttributeInUseException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAuthenticationException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAuthenticationException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAuthenticationException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAuthenticationException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapAuthenticationException
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapAuthenticationException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAuthenticationNotSupportedException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAuthenticationNotSupportedException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAuthenticationNotSupportedException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapAuthenticationNotSupportedException.java Tue Jan 24 17:44:03 2012
@@ -35,6 +35,7 @@ public class LdapAuthenticationNotSuppor
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapAuthenticationNotSupportedException.
*
@@ -76,11 +77,11 @@ public class LdapAuthenticationNotSuppor
{
switch ( resultCode )
{
- case INAPPROPRIATE_AUTHENTICATION :
- case CONFIDENTIALITY_REQUIRED :
- case AUTH_METHOD_NOT_SUPPORTED :
+ case INAPPROPRIATE_AUTHENTICATION:
+ case CONFIDENTIALITY_REQUIRED:
+ case AUTH_METHOD_NOT_SUPPORTED:
return;
-
+
default:
throw new IllegalArgumentException( I18n.err( I18n.ERR_04140_UNACCEPTABLE_RESUT_CODE, resultCode ) );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapContextNotEmptyException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapContextNotEmptyException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapContextNotEmptyException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapContextNotEmptyException.java Tue Jan 24 17:44:03 2012
@@ -33,6 +33,7 @@ public class LdapContextNotEmptyExceptio
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapContextNotEmptyException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapEntryAlreadyExistsException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapEntryAlreadyExistsException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapEntryAlreadyExistsException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapEntryAlreadyExistsException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapEntryAlreadyExistsExcep
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapEntryAlreadyExistsException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapException.java Tue Jan 24 17:44:03 2012
@@ -30,7 +30,8 @@ public class LdapException extends Excep
{
/** The serial version UUID */
private static final long serialVersionUID = 1L;
-
+
+
/**
* Creates a new instance of LdapException.
*/
@@ -38,7 +39,7 @@ public class LdapException extends Excep
{
}
-
+
/**
* Creates a new instance of LdapException.
*
@@ -49,7 +50,7 @@ public class LdapException extends Excep
super( explanation );
}
-
+
/**
* Creates a new instance of LdapException.
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidAttributeTypeException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidAttributeTypeException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidAttributeTypeException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidAttributeTypeException.java Tue Jan 24 17:44:03 2012
@@ -30,11 +30,12 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class LdapInvalidAttributeTypeException extends LdapOperationException
+public class LdapInvalidAttributeTypeException extends LdapOperationException
{
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapInvalidAttributeTypeException.
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidAttributeValueException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidAttributeValueException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidAttributeValueException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidAttributeValueException.java Tue Jan 24 17:44:03 2012
@@ -35,6 +35,7 @@ public class LdapInvalidAttributeValueEx
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapInvalidAttributeValueException.
*
@@ -90,10 +91,10 @@ public class LdapInvalidAttributeValueEx
{
switch ( resultCode )
{
- case CONSTRAINT_VIOLATION :
- case INVALID_ATTRIBUTE_SYNTAX :
+ case CONSTRAINT_VIOLATION:
+ case INVALID_ATTRIBUTE_SYNTAX:
return;
-
+
default:
throw new IllegalArgumentException( I18n.err( I18n.ERR_04140_UNACCEPTABLE_RESUT_CODE, resultCode ) );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidDnException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidDnException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidDnException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidDnException.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.exception;
+
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
@@ -34,7 +35,7 @@ public class LdapInvalidDnException exte
/** The serial version UUID */
static final long serialVersionUID = 1L;
-
+
/**
* to be used by some special exceptions like LdapInvalidDnException
*/
@@ -43,7 +44,7 @@ public class LdapInvalidDnException exte
super( message );
}
-
+
/**
* to be used by some special exceptions like LdapInvalidDnException
*
@@ -54,15 +55,15 @@ public class LdapInvalidDnException exte
{
super( message, cause );
}
-
-
+
+
/**
* Creates a new instance of LdapInvalidDnException.
*
* @param resultCode the ResultCodeEnum for this exception
* @param message The exception message
*/
- public LdapInvalidDnException( ResultCodeEnum resultCode, String message )
+ public LdapInvalidDnException( ResultCodeEnum resultCode, String message )
{
super( message );
checkResultCode( resultCode );
@@ -77,7 +78,7 @@ public class LdapInvalidDnException exte
* @param message The exception message
* @param cause The root cause for this exception
*/
- public LdapInvalidDnException( ResultCodeEnum resultCode, String message, Throwable cause )
+ public LdapInvalidDnException( ResultCodeEnum resultCode, String message, Throwable cause )
{
super( message, cause );
checkResultCode( resultCode );
@@ -111,10 +112,10 @@ public class LdapInvalidDnException exte
{
switch ( resultCode )
{
- case INVALID_DN_SYNTAX :
- case NAMING_VIOLATION :
+ case INVALID_DN_SYNTAX:
+ case NAMING_VIOLATION:
return;
-
+
default:
throw new IllegalArgumentException( I18n.err( I18n.ERR_04140_UNACCEPTABLE_RESUT_CODE, resultCode ) );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidSearchFilterException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidSearchFilterException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidSearchFilterException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapInvalidSearchFilterException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapInvalidSearchFilterExce
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapInvalidSearchFilterException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapLoopDetectedException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapLoopDetectedException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapLoopDetectedException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapLoopDetectedException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapLoopDetectedException e
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapLoopDetectedException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapNoPermissionException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapNoPermissionException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapNoPermissionException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapNoPermissionException.java Tue Jan 24 17:44:03 2012
@@ -35,6 +35,7 @@ public class LdapNoPermissionException e
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapNoPermissionException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapNoSuchAttributeException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapNoSuchAttributeException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapNoSuchAttributeException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapNoSuchAttributeException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapNoSuchAttributeExceptio
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapNoSuchAttributeException.
*
@@ -56,7 +57,7 @@ public class LdapNoSuchAttributeExceptio
super( ResultCodeEnum.NO_SUCH_ATTRIBUTE, message, cause );
}
-
+
/**
* Creates a new instance of LdapNoSuchAttributeException.
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapNoSuchObjectException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapNoSuchObjectException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapNoSuchObjectException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapNoSuchObjectException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapNoSuchObjectException e
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapNoSuchObjectException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapOperationErrorException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapOperationErrorException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapOperationErrorException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapOperationErrorException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapOperationErrorException
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapOperationErrorException.
*
@@ -55,8 +56,8 @@ public class LdapOperationErrorException
{
super( ResultCodeEnum.OPERATIONS_ERROR, message, cause );
}
-
-
+
+
/**
* Creates a new instance of LdapOperationErrorException.
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapOtherException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapOtherException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapOtherException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapOtherException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapOtherException extends
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapOtherException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapProtocolErrorException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapProtocolErrorException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapProtocolErrorException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapProtocolErrorException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapProtocolErrorException
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapProtocolErrorException.
*
@@ -44,6 +45,7 @@ public class LdapProtocolErrorException
super( ResultCodeEnum.PROTOCOL_ERROR, message );
}
+
/**
* Creates a new instance of LdapProtocolErrorException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapSchemaException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapSchemaException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapSchemaException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapSchemaException.java Tue Jan 24 17:44:03 2012
@@ -102,11 +102,11 @@ public class LdapSchemaException extends
*/
public LdapSchemaException( LdapSchemaExceptionCodes code, Throwable cause )
{
- super(cause);
+ super( cause );
this.code = code;
}
-
+
/**
* Creates a new instance of LdapSchemaException.
*
@@ -120,7 +120,7 @@ public class LdapSchemaException extends
this.code = code;
}
-
+
/**
* Gets the code of the exception.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapSchemaExceptionCodes.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapSchemaExceptionCodes.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapSchemaExceptionCodes.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapSchemaExceptionCodes.java Tue Jan 24 17:44:03 2012
@@ -35,13 +35,13 @@ public enum LdapSchemaExceptionCodes
/** Characterizing a SO with an OID being already registered */
OID_ALREADY_REGISTERED,
-
+
/** Characterizing a SO with a name being already registered */
NAME_ALREADY_REGISTERED,
/** Characterizing an SO with a nonexistent schema */
NONEXISTENT_SCHEMA,
-
+
// Codes for Attribute Type
/** Characterizing an AT with a nonexistent superior */
@@ -117,7 +117,7 @@ public enum LdapSchemaExceptionCodes
/** Characterizing an OC with a duplicated AT in its may and must ATs list */
OC_DUPLICATE_AT_IN_MAY_AND_MUST,
-
+
// Codes for Matching Rule
/** Characterizing a MR with a nonexistent syntax */
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapSchemaViolationException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapSchemaViolationException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapSchemaViolationException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapSchemaViolationException.java Tue Jan 24 17:44:03 2012
@@ -35,6 +35,7 @@ public class LdapSchemaViolationExceptio
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapSchemaViolationException.
*
@@ -61,8 +62,8 @@ public class LdapSchemaViolationExceptio
checkResultCode( resultCode );
this.resultCode = resultCode;
}
-
-
+
+
/**
* Creates a new instance of LdapSchemaViolationException.
*
@@ -90,11 +91,11 @@ public class LdapSchemaViolationExceptio
{
switch ( resultCode )
{
- case OBJECT_CLASS_VIOLATION :
- case NOT_ALLOWED_ON_RDN :
- case OBJECT_CLASS_MODS_PROHIBITED :
+ case OBJECT_CLASS_VIOLATION:
+ case NOT_ALLOWED_ON_RDN:
+ case OBJECT_CLASS_MODS_PROHIBITED:
return;
-
+
default:
throw new IllegalArgumentException( I18n.err( I18n.ERR_04140_UNACCEPTABLE_RESUT_CODE, resultCode ) );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapServiceUnavailableException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapServiceUnavailableException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapServiceUnavailableException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapServiceUnavailableException.java Tue Jan 24 17:44:03 2012
@@ -76,10 +76,10 @@ public class LdapServiceUnavailableExcep
{
switch ( resultCode )
{
- case BUSY :
- case UNAVAILABLE :
+ case BUSY:
+ case UNAVAILABLE:
return;
-
+
default:
throw new IllegalArgumentException( I18n.err( I18n.ERR_04140_UNACCEPTABLE_RESUT_CODE, resultCode ) );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapStrongAuthenticationRequiredException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapStrongAuthenticationRequiredException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapStrongAuthenticationRequiredException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapStrongAuthenticationRequiredException.java Tue Jan 24 17:44:03 2012
@@ -34,6 +34,7 @@ public class LdapStrongAuthenticationReq
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapStrongAuthenticationRequiredException.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapURLEncodingException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapURLEncodingException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapURLEncodingException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapURLEncodingException.java Tue Jan 24 17:44:03 2012
@@ -41,7 +41,7 @@ public class LdapURLEncodingException ex
super( message );
}
-
+
/**
* Creates a LdapStringEncodingException
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapUnwillingToPerformException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapUnwillingToPerformException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapUnwillingToPerformException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapUnwillingToPerformException.java Tue Jan 24 17:44:03 2012
@@ -35,6 +35,7 @@ public class LdapUnwillingToPerformExcep
/** The serial version UUID */
static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of LdapUnwillingToPerformException, with
* a default ResultCode to UNWILING_TO_PERFORM.
@@ -57,8 +58,8 @@ public class LdapUnwillingToPerformExcep
checkResultCode( resultCode );
this.resultCode = resultCode;
}
-
-
+
+
/**
*
* @param resultCode the ResultCodeEnum for this exception
@@ -110,8 +111,8 @@ public class LdapUnwillingToPerformExcep
{
switch ( resultCode )
{
- case UNWILLING_TO_PERFORM :
- case UNAVAILABLE_CRITICAL_EXTENSION :
+ case UNWILLING_TO_PERFORM:
+ case UNAVAILABLE_CRITICAL_EXTENSION:
return;
default:
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapUriException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapUriException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapUriException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/LdapUriException.java Tue Jan 24 17:44:03 2012
@@ -29,6 +29,7 @@ public class LdapUriException extends Ld
{
private static final long serialVersionUID = 1L;
+
/**
* The constructor with a reason string argument.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/OperationAbandonedException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/OperationAbandonedException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/OperationAbandonedException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/OperationAbandonedException.java Tue Jan 24 17:44:03 2012
@@ -20,8 +20,6 @@
package org.apache.directory.shared.ldap.model.exception;
-
-
/**
* Marker exception thrown when an operation is cancelled.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/ResponseCarryingMessageException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/ResponseCarryingMessageException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/ResponseCarryingMessageException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/ResponseCarryingMessageException.java Tue Jan 24 17:44:03 2012
@@ -43,7 +43,8 @@ public class ResponseCarryingMessageExce
/** The response with the error cause */
private Message response;
-
+
+
/**
* Constructs an Exception without a message.
*/
@@ -59,20 +60,22 @@ public class ResponseCarryingMessageExce
* @param message
* The message associated with the exception.
*/
- public ResponseCarryingMessageException(String message)
+ public ResponseCarryingMessageException( String message )
{
super( message );
}
-
+
+
/**
* Set a response if we get an exception while parsing the message
* @param response the constructed response
*/
- public void setResponse( Message response )
+ public void setResponse( Message response )
{
this.response = response;
}
-
+
+
/**
* Get the constructed response
* @return The constructed response
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/UrlDecoderException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/UrlDecoderException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/UrlDecoderException.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/exception/UrlDecoderException.java Tue Jan 24 17:44:03 2012
@@ -30,6 +30,7 @@ public class UrlDecoderException extends
{
private static final long serialVersionUID = 1L;
+
/**
* Creates a DecoderException
*
@@ -49,6 +50,6 @@ public class UrlDecoderException extends
*/
public UrlDecoderException( String message, Throwable cause )
{
- super( message, cause );
+ super( message, cause );
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AbstractExprNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AbstractExprNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AbstractExprNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AbstractExprNode.java Tue Jan 24 17:44:03 2012
@@ -41,11 +41,11 @@ public abstract class AbstractExprNode i
/** The node type */
protected final AssertionType assertionType;
-
+
/** A flag set to true if the Node is Schema aware */
protected boolean isSchemaAware;
-
-
+
+
/**
* Creates a node by setting abstract node type.
*
@@ -79,20 +79,20 @@ public abstract class AbstractExprNode i
{
return true;
}
-
+
if ( !( o instanceof AbstractExprNode ) )
{
return false;
}
-
- AbstractExprNode that = (AbstractExprNode)o;
-
+
+ AbstractExprNode that = ( AbstractExprNode ) o;
+
// Check the node type
if ( this.assertionType != that.assertionType )
{
return false;
}
-
+
if ( annotations == null )
{
return that.annotations == null;
@@ -101,18 +101,18 @@ public abstract class AbstractExprNode i
{
return false;
}
-
+
// Check all the annotation
- for ( String key:annotations.keySet() )
+ for ( String key : annotations.keySet() )
{
if ( !that.annotations.containsKey( key ) )
{
return false;
}
-
- Object thisAnnotation = annotations.get( key );
+
+ Object thisAnnotation = annotations.get( key );
Object thatAnnotation = that.annotations.get( key );
-
+
if ( thisAnnotation == null )
{
if ( thatAnnotation != null )
@@ -128,7 +128,7 @@ public abstract class AbstractExprNode i
}
}
}
-
+
return true;
}
@@ -155,43 +155,43 @@ public abstract class AbstractExprNode i
if ( !value.isHumanReadable() )
{
- sb = new StringBuilder( ((BinaryValue)value).getReference().length * 3 );
-
- for ( byte b:((BinaryValue)value).getReference() )
+ sb = new StringBuilder( ( ( BinaryValue ) value ).getReference().length * 3 );
+
+ for ( byte b : ( ( BinaryValue ) value ).getReference() )
{
if ( ( b < 0x7F ) && ( b >= 0 ) )
{
switch ( b )
{
- case '*' :
+ case '*':
sb.append( "\\2A" );
break;
-
- case '(' :
+
+ case '(':
sb.append( "\\28" );
break;
-
- case ')' :
+
+ case ')':
sb.append( "\\29" );
break;
-
- case '\\' :
+
+ case '\\':
sb.append( "\\5C" );
break;
-
- case '\0' :
+
+ case '\0':
sb.append( "\\00" );
break;
-
- default :
- sb.append( (char)b );
+
+ default:
+ sb.append( ( char ) b );
}
}
else
{
sb.append( '\\' );
- String digit = Integer.toHexString( ((byte)b) & 0x00FF );
-
+ String digit = Integer.toHexString( ( ( byte ) b ) & 0x00FF );
+
if ( digit.length() == 1 )
{
sb.append( '0' );
@@ -204,8 +204,8 @@ public abstract class AbstractExprNode i
return new StringValue( sb.toString() );
}
- val = ( (StringValue) value ).getString();
-
+ val = ( ( StringValue ) value ).getString();
+
for ( int i = 0; i < val.length(); i++ )
{
char ch = val.charAt( i );
@@ -216,24 +216,24 @@ public abstract class AbstractExprNode i
case '*':
replace = "\\2A";
break;
-
+
case '(':
replace = "\\28";
break;
-
+
case ')':
replace = "\\29";
break;
-
+
case '\\':
replace = "\\5C";
break;
-
+
case '\0':
replace = "\\00";
break;
}
-
+
if ( replace != null )
{
if ( sb == null )
@@ -260,21 +260,21 @@ public abstract class AbstractExprNode i
public int hashCode()
{
int h = 37;
-
+
if ( annotations != null )
{
- for ( String key:annotations.keySet() )
+ for ( String key : annotations.keySet() )
{
Object value = annotations.get( key );
-
- h = h*17 + key.hashCode();
- h = h*17 + ( value == null ? 0 : value.hashCode() );
+
+ h = h * 17 + key.hashCode();
+ h = h * 17 + ( value == null ? 0 : value.hashCode() );
}
}
-
+
return h;
}
-
+
/**
* @see ExprNode#get(java.lang.Object)
@@ -317,7 +317,7 @@ public abstract class AbstractExprNode i
return annotations;
}
-
+
/**
* Tells if this Node is Schema aware.
*
@@ -328,7 +328,7 @@ public abstract class AbstractExprNode i
return isSchemaAware;
}
-
+
/**
* Default implementation for this method : just throw an exception.
*
@@ -340,28 +340,29 @@ public abstract class AbstractExprNode i
{
throw new UnsupportedOperationException( I18n.err( I18n.ERR_04144 ) );
}
-
-
+
+
/**
* Clone the object
*/
- @Override public ExprNode clone()
+ @Override
+ public ExprNode clone()
{
try
{
- ExprNode clone = (ExprNode)super.clone();
-
+ ExprNode clone = ( ExprNode ) super.clone();
+
if ( annotations != null )
{
- for ( String key:annotations.keySet() )
+ for ( String key : annotations.keySet() )
{
Object value = annotations.get( key );
-
+
// Note : the value aren't cloned !
- ((AbstractExprNode)clone).annotations.put( key, value );
+ ( ( AbstractExprNode ) clone ).annotations.put( key, value );
}
}
-
+
return clone;
}
catch ( CloneNotSupportedException cnse )
@@ -380,9 +381,9 @@ public abstract class AbstractExprNode i
{
return ":[" + annotations.get( "count" ) + "]";
}
- else
+ else
{
return "";
}
- }
+ }
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AndNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AndNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AndNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AndNode.java Tue Jan 24 17:44:03 2012
@@ -23,6 +23,7 @@ package org.apache.directory.shared.ldap
import java.util.List;
+
/**
* Node representing an AND connector in a filter operation
*
@@ -40,6 +41,7 @@ public class AndNode extends BranchNode
super( AssertionType.AND, childList );
}
+
/**
* Creates a AndNode using a logical operator and a list of children.
*
@@ -50,7 +52,7 @@ public class AndNode extends BranchNode
super( AssertionType.AND, childList );
}
-
+
/**
* Creates an empty AndNode
*/
@@ -103,7 +105,7 @@ public class AndNode extends BranchNode
return false;
}
-
+
/**
* @see ExprNode#printRefinementToBuffer(StringBuffer)
*
@@ -115,8 +117,8 @@ public class AndNode extends BranchNode
{
buf.append( "and: {" );
boolean isFirst = true;
-
- for ( ExprNode node:children )
+
+ for ( ExprNode node : children )
{
if ( isFirst )
{
@@ -127,15 +129,16 @@ public class AndNode extends BranchNode
{
buf.append( ", " );
}
-
+
node.printRefinementToBuffer( buf );
}
-
+
buf.append( " }" );
-
+
return buf;
}
+
/**
* Gets the recursive prefix string represent of the filter from this node
* down.
@@ -150,11 +153,11 @@ public class AndNode extends BranchNode
buf.append( super.toString() );
- for ( ExprNode child:getChildren() )
+ for ( ExprNode child : getChildren() )
{
buf.append( child );
}
-
+
buf.append( ')' );
return buf.toString();
@@ -168,8 +171,8 @@ public class AndNode extends BranchNode
public int hashCode()
{
int hash = 37;
- hash = hash*17 + AssertionType.AND.hashCode();
- hash = hash*17 + ( annotations == null ? 0 : annotations.hashCode() );
+ hash = hash * 17 + AssertionType.AND.hashCode();
+ hash = hash * 17 + ( annotations == null ? 0 : annotations.hashCode() );
return hash;
}
@@ -202,18 +205,18 @@ public class AndNode extends BranchNode
{
return false;
}
-
+
for ( int i = 0; i < children.size(); i++ )
{
ExprNode child = children.get( i );
ExprNode otherChild = otherChildren.get( i );
-
+
if ( !child.equals( otherChild ) )
{
return false;
}
}
-
+
return true;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ApproximateNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ApproximateNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ApproximateNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ApproximateNode.java Tue Jan 24 17:44:03 2012
@@ -19,9 +19,11 @@
*/
package org.apache.directory.shared.ldap.model.filter;
+
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+
/**
* A simple assertion value node.
*
@@ -40,7 +42,7 @@ public class ApproximateNode<T> extends
super( attributeType, value, AssertionType.APPROXIMATE );
}
-
+
/**
* Creates a new ApproximateNode object.
*
@@ -52,7 +54,7 @@ public class ApproximateNode<T> extends
super( attribute, value, AssertionType.APPROXIMATE );
}
-
+
/**
* @see Object#toString()
* @return A string representing the AndNode
@@ -60,9 +62,9 @@ public class ApproximateNode<T> extends
public String toString()
{
StringBuilder buf = new StringBuilder();
-
+
buf.append( '(' );
-
+
if ( attributeType != null )
{
buf.append( attributeType.getName() );
@@ -71,19 +73,19 @@ public class ApproximateNode<T> extends
{
buf.append( attribute );
}
-
+
buf.append( "~=" );
Value<?> escapedValue = getEscapedValue();
- if ( !escapedValue.isNull())
+ if ( !escapedValue.isNull() )
{
buf.append( escapedValue );
}
buf.append( super.toString() );
-
+
buf.append( ')' );
-
+
return buf.toString();
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionNode.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.filter;
+
import org.apache.directory.shared.i18n.I18n;
@@ -44,7 +45,6 @@ public abstract class AssertionNode exte
// C O N S T R U C T O R S
// ------------------------------------------------------------------------
-
/**
* Creates an AssertionNode using an arbitrary candidate assertion.
*
@@ -53,7 +53,7 @@ public abstract class AssertionNode exte
public AssertionNode( Assertion assertion )
{
this( assertion, "ASSERTION" );
-
+
isSchemaAware = true;
}
@@ -79,16 +79,17 @@ public abstract class AssertionNode exte
set( "count", Long.MAX_VALUE );
}
+
/**
* Makes a full clone in new memory space of the current node and children
*
* @return the clone
*/
- @Override public ExprNode clone()
+ @Override
+ public ExprNode clone()
{
- return (ExprNode)super.clone();
+ return ( ExprNode ) super.clone();
}
-
/**
@@ -106,7 +107,6 @@ public abstract class AssertionNode exte
// 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.
*
@@ -144,8 +144,9 @@ public abstract class AssertionNode exte
return false;
}
AssertionNode that = ( AssertionNode ) obj;
- if ( assertion == null ) {
- if ( that.assertion != null)
+ if ( assertion == null )
+ {
+ if ( that.assertion != null )
{
return false;
}
@@ -157,8 +158,9 @@ public abstract class AssertionNode exte
return false;
}
}
- if ( desc == null ) {
- if ( that.desc != null)
+ if ( desc == null )
+ {
+ if ( that.desc != null )
{
return false;
}
@@ -182,11 +184,11 @@ public abstract class AssertionNode exte
public int hashCode()
{
int h = 37;
-
- h = h*17 + super.hashCode();
- h = h*17 + ( assertion != null ? assertion.hashCode() : 0 );
- h = h*17 + ( desc != null ? desc.hashCode() : 0 );
-
+
+ h = h * 17 + super.hashCode();
+ h = h * 17 + ( assertion != null ? assertion.hashCode() : 0 );
+ h = h * 17 + ( desc != null ? desc.hashCode() : 0 );
+
return h;
}
@@ -208,12 +210,12 @@ public abstract class AssertionNode exte
public String toString()
{
StringBuilder buf = new StringBuilder();
-
+
buf.append( "(@" );
buf.append( desc );
buf.append( super.toString() );
buf.append( ')' );
-
+
return buf.toString();
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionType.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionType.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionType.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.filter;
+
/**
* All the different kind of assertions.
*
@@ -61,7 +62,7 @@ public enum AssertionType
/** NOT operator constant */
NOT,
-
+
/** Undefined operation */
UNDEFINED;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNode.java Tue Jan 24 17:44:03 2012
@@ -55,7 +55,7 @@ public class BranchNode extends Abstract
{
this.children = childList;
}
-
+
isSchemaAware = true;
}
@@ -74,7 +74,7 @@ public class BranchNode extends Abstract
{
this.children = new ArrayList<ExprNode>( childList.length );
}
-
+
CollectionUtils.addAll( children, childList );
}
@@ -87,12 +87,12 @@ public class BranchNode extends Abstract
protected BranchNode( AssertionType assertionType )
{
super( assertionType );
-
+
this.children = new ArrayList<ExprNode>( 2 );
isSchemaAware = true;
}
-
+
/**
* @see ExprNode#isLeaf()
* @return false all the time.
@@ -102,26 +102,28 @@ public class BranchNode extends Abstract
return false;
}
+
/**
* Makes a full clone in new memory space of the current node and children
*
* @return the clone
*/
- @Override public ExprNode clone()
+ @Override
+ public ExprNode clone()
{
- ExprNode clone = (ExprNode)super.clone();
-
+ ExprNode clone = ( ExprNode ) super.clone();
+
// Clone the children
if ( children != null )
{
- ((BranchNode)clone).children = new ArrayList<ExprNode>();
-
+ ( ( BranchNode ) clone ).children = new ArrayList<ExprNode>();
+
for ( ExprNode child : children )
{
- ((BranchNode)clone).children.add( (ExprNode)child.clone() );
+ ( ( BranchNode ) clone ).children.add( ( ExprNode ) child.clone() );
}
}
-
+
return clone;
}
@@ -147,7 +149,7 @@ public class BranchNode extends Abstract
children.add( 0, node );
}
-
+
/**
* Gets the children below this BranchNode. We purposefully do not clone the
* array list so that backends can sort the order of children using their
@@ -171,7 +173,8 @@ public class BranchNode extends Abstract
{
children = list;
}
-
+
+
/**
* Convenience method that gets the first child in the children array. Its
* very useful for NOT nodes since they only have one child by avoiding code
@@ -205,10 +208,10 @@ public class BranchNode extends Abstract
if ( visitor.canVisit( this ) )
{
- result = (ExprNode)visitor.visit( this );
+ result = ( ExprNode ) visitor.visit( this );
}
- for ( ExprNode node:childrenList )
+ for ( ExprNode node : childrenList )
{
node.accept( visitor );
}
@@ -227,8 +230,8 @@ public class BranchNode extends Abstract
}
}
}
-
-
+
+
/**
* @see Object#hashCode()
* @return the instance's hash code
@@ -236,20 +239,21 @@ public class BranchNode extends Abstract
public int hashCode()
{
int h = 37;
-
- h = h*17 + super.hashCode();
-
+
+ h = h * 17 + super.hashCode();
+
if ( children != null )
{
- for ( ExprNode child:children )
+ for ( ExprNode child : children )
{
- h = h*17 + child.hashCode();
+ h = h * 17 + child.hashCode();
}
}
-
+
return h;
}
-
+
+
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
@@ -264,7 +268,7 @@ public class BranchNode extends Abstract
{
return false;
}
-
+
if ( other.getClass() != this.getClass() )
{
return false;
@@ -283,18 +287,18 @@ public class BranchNode extends Abstract
{
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;
}
}
-
+
return true;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitor.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitor.java Tue Jan 24 17:44:03 2012
@@ -59,12 +59,12 @@ public class BranchNormalizedVisitor imp
List<ExprNode> children = branch.getChildren();
- for ( ExprNode child:branch.getChildren() )
+ for ( ExprNode child : branch.getChildren() )
{
if ( !child.isLeaf() )
{
- ExprNode newChild = (ExprNode)visit( child );
-
+ ExprNode newChild = ( ExprNode ) visit( child );
+
if ( newChild != null )
{
set.add( newChild );
@@ -79,7 +79,7 @@ public class BranchNormalizedVisitor imp
children.clear();
children.addAll( set );
-
+
return branch;
}
@@ -131,7 +131,7 @@ public class BranchNormalizedVisitor imp
{
BranchNormalizedVisitor visitor = new BranchNormalizedVisitor();
- ExprNode result = (ExprNode)visitor.visit( filter );
+ ExprNode result = ( ExprNode ) visitor.visit( filter );
return result.toString().trim();
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/EqualityNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/EqualityNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/EqualityNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/EqualityNode.java Tue Jan 24 17:44:03 2012
@@ -42,7 +42,7 @@ public class EqualityNode<T> extends Sim
super( attributeType, value, AssertionType.EQUALITY );
}
-
+
/**
* Creates a new Equality object.
*
@@ -62,9 +62,9 @@ public class EqualityNode<T> extends Sim
public String toString()
{
StringBuilder buf = new StringBuilder();
-
+
buf.append( '(' );
-
+
if ( attributeType != null )
{
buf.append( attributeType.getName() );
@@ -73,19 +73,19 @@ public class EqualityNode<T> extends Sim
{
buf.append( attribute );
}
-
+
buf.append( "=" );
-
+
Value<?> escapedValue = getEscapedValue();
- if ( !escapedValue.isNull())
+ if ( !escapedValue.isNull() )
{
buf.append( escapedValue );
}
buf.append( super.toString() );
-
+
buf.append( ')' );
-
+
return buf.toString();
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ExtensibleNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ExtensibleNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ExtensibleNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ExtensibleNode.java Tue Jan 24 17:44:03 2012
@@ -49,11 +49,11 @@ public class ExtensibleNode extends Leaf
public ExtensibleNode( AttributeType attributeType )
{
super( attributeType, AssertionType.EXTENSIBLE );
-
+
dnAttributes = false;
}
-
+
/**
* Creates a new emptyExtensibleNode object.
*
@@ -62,11 +62,11 @@ public class ExtensibleNode extends Leaf
public ExtensibleNode( String attribute )
{
super( attribute, AssertionType.EXTENSIBLE );
-
+
dnAttributes = false;
}
-
+
/**
* Creates a new ExtensibleNode object.
*
@@ -84,9 +84,7 @@ public class ExtensibleNode extends Leaf
this.dnAttributes = dnAttributes;
}
-
-
/**
* Creates a new ExtensibleNode object.
*
@@ -103,26 +101,28 @@ public class ExtensibleNode extends Leaf
this.matchingRuleId = matchingRuleId;
this.dnAttributes = dnAttributes;
}
-
-
+
+
/**
* Makes a full clone in new memory space of the current node and children
*
* @return the clone
*/
- @Override public ExprNode clone()
+ @Override
+ public ExprNode clone()
{
- ExprNode clone = (ExprNode)super.clone();
-
+ ExprNode clone = ( ExprNode ) super.clone();
+
// Copy the value
if ( value != null )
{
- ((ExtensibleNode)clone).value = value.clone();
+ ( ( ExtensibleNode ) clone ).value = value.clone();
}
-
+
return clone;
}
+
/**
* Gets the Dn attributes.
*
@@ -132,8 +132,8 @@ public class ExtensibleNode extends Leaf
{
return dnAttributes;
}
-
-
+
+
/**
* Set the dnAttributes flag
*
@@ -187,22 +187,22 @@ public class ExtensibleNode extends Leaf
{
return escapeFilterValue( value );
}
-
+
return value;
}
-
+
/**
* Sets the value.
*
* @param value the value
*/
- public final void setValue( Value<?> value)
+ public final void setValue( Value<?> value )
{
this.value = value;
}
-
+
/**
* {@inheritDoc}
*/
@@ -219,7 +219,7 @@ public class ExtensibleNode extends Leaf
return false;
}
ExtensibleNode that = ( ExtensibleNode ) obj;
-
+
if ( dnAttributes != that.dnAttributes )
{
return false;
@@ -232,7 +232,7 @@ public class ExtensibleNode extends Leaf
{
return false;
}
-
+
return super.equals( obj );
}
@@ -245,12 +245,12 @@ public class ExtensibleNode extends Leaf
public int hashCode()
{
int h = 37;
-
- h = h*17 + super.hashCode();
- h = h*17 + ( dnAttributes ? 1 : 0 );
- h = h*17 + matchingRuleId.hashCode();
- h = h*17 + value.hashCode();
-
+
+ h = h * 17 + super.hashCode();
+ h = h * 17 + ( dnAttributes ? 1 : 0 );
+ h = h * 17 + matchingRuleId.hashCode();
+ h = h * 17 + value.hashCode();
+
return h;
}
@@ -262,9 +262,9 @@ public class ExtensibleNode extends Leaf
public String toString()
{
StringBuilder buf = new StringBuilder();
-
+
buf.append( '(' );
-
+
if ( attributeType != null )
{
buf.append( attributeType.getName() );
@@ -273,7 +273,7 @@ public class ExtensibleNode extends Leaf
{
buf.append( attribute );
}
-
+
buf.append( "-" );
buf.append( dnAttributes );
buf.append( "-EXTENSIBLE-" );
@@ -282,9 +282,9 @@ public class ExtensibleNode extends Leaf
buf.append( value );
buf.append( super.toString() );
-
+
buf.append( ')' );
-
+
return buf.toString();
}
}