directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1086987 - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ apacheds/trunk/core-api/src/main/java/org/apache/directory/serve...
Date Wed, 30 Mar 2011 15:20:37 GMT
Author: elecharny
Date: Wed Mar 30 15:20:36 2011
New Revision: 1086987

URL: http://svn.apache.org/viewvc?rev=1086987&view=rev
Log:
Renamed the isHR and instanceOf methods, following Pierre-Arnaud suggestion for a better readability.

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
    directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Value.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/AbstractExprNode.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ExtensibleNode.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/ValueSerializationTest.java
    directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
Wed Mar 30 15:20:36 2011
@@ -310,7 +310,7 @@ public class LdapCoreSessionConnection i
         compareRequest.setName( dn );
         compareRequest.setAttributeId( attributeName );
 
-        if ( value.isHR() )
+        if ( value.isHumanReadable() )
         {
             compareRequest.setAssertionValue( value.getString() );
         }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
Wed Mar 30 15:20:36 2011
@@ -158,7 +158,7 @@ public class TestServerEntryUtils
         {
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
-                if ( value.isHR() )
+                if ( value.isHumanReadable() )
                 {
                     return new StringValue( value.getString().toLowerCase() );
                 }
@@ -241,7 +241,7 @@ public class TestServerEntryUtils
         {
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
-                if ( !value.isHR() )
+                if ( !value.isHumanReadable() )
                 {
                     byte[] val = value.getBytes();
                     

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
Wed Mar 30 15:20:36 2011
@@ -201,9 +201,9 @@ public class CompareOperationContext ext
         return "CompareContext for Dn '" + getDn().getName() + "'" +
             ( ( oid != null ) ? ", oid : <" + oid + ">" : "" ) +
             ( ( value != null ) ? ", value :'" +
-                    ( ( value.isHR() ) ?
+                    ( ( value.isHumanReadable() ) ?
                             value.getString() :
-                            ( ( !value.isHR() ) ?
+                            ( ( !value.isHumanReadable() ) ?
                                     Strings.dumpBytes(((BinaryValue) value).getReference())
:
                                         "unknown value type" ) )
                         + "'"

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
Wed Mar 30 15:20:36 2011
@@ -263,7 +263,7 @@ public class LeafEvaluator implements Ev
         
         if ( attributeType.getSyntax().isHumanReadable() )
         {
-            if ( node.getValue().isHR() )
+            if ( node.getValue().isHumanReadable() )
             {
                 value = node.getValue();
             }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
Wed Mar 30 15:20:36 2011
@@ -365,7 +365,7 @@ public class NormalizationInterceptor ex
             AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( compareContext.getOid()
);
 
             // Translate the value from binary to String if the AT is HR
-            if ( attributeType.getSyntax().isHumanReadable() && ( !compareContext.getValue().isHR()
) )
+            if ( attributeType.getSyntax().isHumanReadable() && ( !compareContext.getValue().isHumanReadable()
) )
             {
                 String value = compareContext.getValue().getString();
                 compareContext.setValue( new StringValue( value ) );

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
(original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
Wed Mar 30 15:20:36 2011
@@ -167,12 +167,12 @@ public class LdapConnectionTest extends 
     public void testRetrieveBinaryAttibute() throws Exception
     {
         Entry entry = connection.lookup( "uid=admin,ou=system" );
-        assertTrue( entry.get( SchemaConstants.USER_PASSWORD_AT ).get().isHR() );
+        assertTrue( entry.get( SchemaConstants.USER_PASSWORD_AT ).get().isHumanReadable()
);
 
         connection.loadSchema();
 
         entry = connection.lookup( "uid=admin,ou=system" );
-        assertFalse( entry.get( SchemaConstants.USER_PASSWORD_AT ).get().isHR() );
+        assertFalse( entry.get( SchemaConstants.USER_PASSWORD_AT ).get().isHumanReadable()
);
     }
 
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
Wed Mar 30 15:20:36 2011
@@ -175,13 +175,13 @@ public class EqualityEvaluator<T, ID ext
         for ( Value<?> value : attribute )
         {
             //noinspection unchecked
-            if ( value.isHR() )
+            if ( value.isHumanReadable() )
             {
                 // Deal with a String value
                 String serverValue = ( ( Value<String> ) value ).getNormValue();
                 String nodeValue = null;
 
-                if ( node.getValue().isHR() )
+                if ( node.getValue().isHumanReadable() )
                 {
                     nodeValue = ( ( Value<String> ) node.getValue() ).getNormValue();
                 }

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
(original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
Wed Mar 30 15:20:36 2011
@@ -450,7 +450,7 @@ public class AddRequestTest extends Abst
         Iterator<Value<?>> valueIterator = attribute.iterator();
         assertTrue( valueIterator.hasNext() );
         Value<?> value = valueIterator.next();
-        assertFalse( value.isHR() );
+        assertFalse( value.isHumanReadable() );
         assertEquals( "DSMLv2.0 rocks!!", value.getString() );
     }
 

Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
(original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Wed Mar 30 15:20:36 2011
@@ -2767,7 +2767,7 @@ public class LdapNetworkConnection exten
         compareRequest.setName( dn );
         compareRequest.setAttributeId( attributeName );
 
-        if ( value.isHR() )
+        if ( value.isHumanReadable() )
         {
             compareRequest.setAssertionValue( value.getString() );
         }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
(original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
Wed Mar 30 15:20:36 2011
@@ -427,7 +427,7 @@ public final class AddRequestDecorator e
                     {
                         for ( org.apache.directory.shared.ldap.model.entry.Value<?>
value : attribute )
                         {
-                            if ( value.isHR() )
+                            if ( value.isHumanReadable() )
                             {
                                 org.apache.directory.shared.asn1.ber.tlv.Value.encode( buffer,
value.getString() );
                             }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
(original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
Wed Mar 30 15:20:36 2011
@@ -575,7 +575,7 @@ public class ModifyRequestDecorator exte
                     {
                         for ( org.apache.directory.shared.ldap.model.entry.Value<?>
value : modification.getAttribute() )
                         {
-                            if ( value.isHR() )
+                            if ( value.isHumanReadable() )
                             {
                                 Value.encode( buffer, value.getString() );
                             }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
(original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
Wed Mar 30 15:20:36 2011
@@ -455,7 +455,7 @@ public class SearchResultEntryDecorator 
                     {
                         for ( org.apache.directory.shared.ldap.model.entry.Value<?>
value : attribute )
                         {
-                            if ( value.isHR() )
+                            if ( value.isHumanReadable() )
                             {
                                 Value.encode( buffer, value.getString() );
                             }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java
(original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java
Wed Mar 30 15:20:36 2011
@@ -221,7 +221,7 @@ public class AttributeValueAssertionFilt
         Value.encode( buffer, assertion.getAttributeDesc() );
 
         // The assertion desc
-        if ( assertion.getAssertionValue().isHR() )
+        if ( assertion.getAssertionValue().isHumanReadable() )
         {
             Value.encode( buffer, assertion.getAssertionValue().getBytes() );
         }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java
Wed Mar 30 15:20:36 2011
@@ -142,7 +142,7 @@ public abstract class AbstractValue<T> i
                 {
                     try
                     {
-                        if ( isHR() )
+                        if ( isHumanReadable() )
                         {     
                             normalizedValue = (T)normalizer.normalize( (String)wrappedValue
);
                         }
@@ -229,7 +229,7 @@ public abstract class AbstractValue<T> i
     /**
      * {@inheritDoc}
      */
-    public boolean instanceOf( AttributeType attributeType )
+    public boolean isInstanceOf( AttributeType attributeType )
     {
         return ( attributeType != null ) && 
                ( this.attributeType.equals( attributeType ) || 

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
Wed Mar 30 15:20:36 2011
@@ -299,7 +299,7 @@ public final class AttributeUtils
         {
             byte[] comparedBytes = null;
 
-            if ( compared.isHR() )
+            if ( compared.isHumanReadable() )
             {
                 if ( compared.getString().length() < 3 )
                 {

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java
Wed Mar 30 15:20:36 2011
@@ -347,7 +347,7 @@ public class BinaryValue extends Abstrac
      * 
      * @return <code>true</code> if the value is HR, <code>false</code>
otherwise
      */
-    public boolean isHR()
+    public boolean isHumanReadable()
     {
         return false;
     }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
Wed Mar 30 15:20:36 2011
@@ -229,7 +229,7 @@ public class DefaultEntryAttribute imple
         {
             for ( Value<?> val:vals )
             {
-                if ( ( val instanceof StringValue) || ( !val.isHR() ) )
+                if ( ( val instanceof StringValue) || ( !val.isHumanReadable() ) )
                 {
                     add( val );
                 }
@@ -478,7 +478,7 @@ public class DefaultEntryAttribute imple
     {
         Value<?> value = get();
         
-        if ( value.isHR() )
+        if ( value.isHumanReadable() )
         {
             String message = I18n.err( I18n.ERR_04130 );
             LOG.error( message );
@@ -1340,7 +1340,7 @@ public class DefaultEntryAttribute imple
                 // contained in the object
                 for ( Value<?> val:vals )
                 {
-                    if ( val.isHR() )
+                    if ( val.isHumanReadable() )
                     {
                         String stringVal = val.getString();
                         

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java
Wed Mar 30 15:20:36 2011
@@ -30,8 +30,7 @@ import org.apache.directory.shared.ldap.
 
 
 /**
- * A generic interface mocking the Attribute JNDI interface. This interface
- * will be the base interface for the ServerAttribute and ClientAttribute.
+ * A generic interface used to store the LDAP Attributes.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
Wed Mar 30 15:20:36 2011
@@ -139,7 +139,7 @@ public class EntryUtils
         {
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
-                if ( value.isHR() )
+                if ( value.isHumanReadable() )
                 {
                     return new StringValue( value.getString().toLowerCase() );
                 }
@@ -222,7 +222,7 @@ public class EntryUtils
         {
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
-                if ( !value.isHR() )
+                if ( !value.isHumanReadable() )
                 {
                     byte[] val = value.getBytes();
                     

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=1086987&r1=1086986&r2=1086987&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
Wed Mar 30 15:20:36 2011
@@ -350,7 +350,7 @@ public class StringValue extends Abstrac
     /**
      * {@inheritDoc}
      */
-    public boolean isHR()
+    public boolean isHumanReadable()
     {
         return true;
     }

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=1086987&r1=1086986&r2=1086987&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
Wed Mar 30 15:20:36 2011
@@ -85,7 +85,7 @@ public interface Value<T> extends Clonea
      * @return <code>true</code> if the value is associated with the given
      * attributeType or one of its ascendant
      */
-    boolean instanceOf( AttributeType attributeType );
+    boolean isInstanceOf( AttributeType attributeType );
 
     
     /**
@@ -169,7 +169,7 @@ public interface Value<T> extends Clonea
      * 
      * @return <code>true</code> if the value is a String, <code>false</code>
otherwise
      */
-    boolean isHR();
+    boolean isHumanReadable();
     
     
     /**

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=1086987&r1=1086986&r2=1086987&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
Wed Mar 30 15:20:36 2011
@@ -153,7 +153,7 @@ public abstract class AbstractExprNode i
         StringBuilder sb = null;
         String val;
 
-        if ( !value.isHR() )
+        if ( !value.isHumanReadable() )
         {
             sb = new StringBuilder( ((BinaryValue)value).getReference().length * 3 );
             

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=1086987&r1=1086986&r2=1086987&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
Wed Mar 30 15:20:36 2011
@@ -183,7 +183,7 @@ public class ExtensibleNode extends Leaf
      */
     public Value<?> getEscapedValue()
     {
-        if ( value.isHR() )
+        if ( value.isHumanReadable() )
         {
             return escapeFilterValue( value );
         }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java
Wed Mar 30 15:20:36 2011
@@ -559,7 +559,7 @@ public final class LdifUtils
             {
                 lineBuffer.append( ':' );
             }
-            else if ( value.isHR() )
+            else if ( value.isHumanReadable() )
             {
                 // It's a String but, we have to check if encoding isn't required
                 String str = value.getString();

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
Wed Mar 30 15:20:36 2011
@@ -314,7 +314,7 @@ public class CompareRequestImpl extends 
         sb.append( "        Attribute description : '" ).append( attrId ).append( "'\n" );
         sb.append( "        Attribute value : '" );
 
-        if ( attrVal.isHR() )
+        if ( attrVal.isHumanReadable() )
         {
             sb.append( attrVal.getValue() );
         }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
Wed Mar 30 15:20:36 2011
@@ -683,7 +683,7 @@ public class Ava implements Externalizab
      */
     public String normalize()
     {
-        if ( normValue.isHR() )
+        if ( normValue.isHumanReadable() )
         {
             // The result will be gathered in a stringBuilder
             StringBuilder sb = new StringBuilder();
@@ -907,7 +907,7 @@ public class Ava implements Externalizab
             out.writeBoolean( false);
         }
         
-        boolean isHR = normValue.isHR();
+        boolean isHR = normValue.isHumanReadable();
         
         out.writeBoolean( isHR );
         

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
Wed Mar 30 15:20:36 2011
@@ -391,7 +391,7 @@ public class Rdn implements Cloneable, E
             case 1:
                 // We have a single Ava
                 // We will trim and lowercase type and value.
-                if ( ava.getNormValue().isHR() )
+                if ( ava.getNormValue().isHumanReadable() )
                 {
                     normName = ava.getNormName();
                 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java
Wed Mar 30 15:20:36 2011
@@ -82,7 +82,7 @@ public class RegexNormalizer extends Nor
             return null;
         }
 
-        if ( value.isHR() )
+        if ( value.isHumanReadable() )
         {
             String str = value.getString();
 

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
(original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
Wed Mar 30 15:20:36 2011
@@ -91,7 +91,7 @@ public class BinaryValueAttributeTypeTes
         {
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
-                if ( !value.isHR() )
+                if ( !value.isHumanReadable() )
                 {
                     byte[] val = value.getBytes();
                     // each byte will be changed to be > 0, and spaces will be trimmed
@@ -462,11 +462,11 @@ public class BinaryValueAttributeTypeTes
         AttributeType attribute = EntryUtils.getBytesAttributeType();
         BinaryValue sbv = new BinaryValue( attribute );
         
-        assertTrue( sbv.instanceOf( attribute ) );
+        assertTrue( sbv.isInstanceOf( attribute ) );
         
         attribute = EntryUtils.getIA5StringAttributeType();
         
-        assertFalse( sbv.instanceOf( attribute ) );
+        assertFalse( sbv.isInstanceOf( attribute ) );
     }    
     
 

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
(original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
Wed Mar 30 15:20:36 2011
@@ -85,7 +85,7 @@ public class BinaryValueTest
         {
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
-                if ( !value.isHR() )
+                if ( !value.isHumanReadable() )
                 {
                     byte[] val = value.getBytes();
                     // each byte will be changed to be > 0, and spaces will be trimmed
@@ -125,7 +125,7 @@ public class BinaryValueTest
     {
         public Value<?> normalize( Value<?> value ) throws LdapException
         {
-            if ( !value.isHR() )
+            if ( !value.isHumanReadable() )
             {
                 return new BinaryValue( StringConstants.EMPTY_BYTES );
             }

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
(original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
Wed Mar 30 15:20:36 2011
@@ -269,11 +269,11 @@ public class StringValueAttributeTypeTes
         AttributeType attribute = EntryUtils.getIA5StringAttributeType();
         StringValue ssv = new StringValue( attribute );
         
-        assertTrue( ssv.instanceOf( attribute ) );
+        assertTrue( ssv.isInstanceOf( attribute ) );
         
         attribute = EntryUtils.getBytesAttributeType();
         
-        assertFalse( ssv.instanceOf( attribute ) );
+        assertFalse( ssv.isInstanceOf( attribute ) );
     }    
     
 

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/ValueSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/ValueSerializationTest.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/ValueSerializationTest.java
(original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/ValueSerializationTest.java
Wed Mar 30 15:20:36 2011
@@ -91,7 +91,7 @@ public class ValueSerializationTest
         {
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
-                if ( !value.isHR() )
+                if ( !value.isHumanReadable() )
                 {
                     byte[] val = value.getBytes();
                     // each byte will be changed to be > 0, and spaces will be trimmed

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java?rev=1086987&r1=1086986&r2=1086987&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java
(original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java
Wed Mar 30 15:20:36 2011
@@ -76,7 +76,7 @@ public class AttributeClassLoader extend
 
         Value<?> value = attribute.get();
 
-        if ( value.isHR() )
+        if ( value.isHumanReadable() )
         {
             throw new ClassNotFoundException( I18n.err( I18n.ERR_10002 ) );
         }



Mime
View raw message