directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1235374 [11/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/sha...
Date Tue, 24 Jan 2012 17:44:32 GMT
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java Tue Jan 24 17:44:03 2012
@@ -803,8 +803,8 @@ public interface SchemaManager
      * @return true if the schema is laoded
      */
     boolean isSchemaLoaded( String schemaName );
-    
-    
+
+
     /**
      * Get the list of Schema names which has the given schema name as a dependence
      *

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java Tue Jan 24 17:44:03 2012
@@ -346,8 +346,8 @@ public interface SchemaObject
      * @param registries The Registries
      */
     void setRegistries( Registries registries );
-    
-    
+
+
     /**
      * Transform the SchemaObject to an immutable object
      * TODO locked.

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObjectType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObjectType.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObjectType.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObjectType.java Tue Jan 24 17:44:03 2012
@@ -19,8 +19,10 @@
  */
 package org.apache.directory.shared.ldap.model.schema;
 
+
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 
+
 /**
  * The SchemaObject types
  *
@@ -39,10 +41,11 @@ public enum SchemaObjectType
     NORMALIZER(8),
     OBJECT_CLASS(9),
     SYNTAX_CHECKER(10);
-    
+
     /** The inner value*/
     private int value;
-    
+
+
     /**
      * A private constructor to associated a number to the type
      */
@@ -51,6 +54,7 @@ public enum SchemaObjectType
         this.value = value;
     }
 
+
     /**
      * @return The numeric value for this type
      */
@@ -58,8 +62,8 @@ public enum SchemaObjectType
     {
         return value;
     }
-    
-    
+
+
     /**
      * Get the Rdn associated with a schemaObjectType
      *
@@ -68,54 +72,54 @@ public enum SchemaObjectType
     public String getRdn()
     {
         String schemaObjectPath = null;
-        
+
         switch ( this )
         {
-            case ATTRIBUTE_TYPE :
+            case ATTRIBUTE_TYPE:
                 schemaObjectPath = SchemaConstants.ATTRIBUTE_TYPES_PATH;
                 break;
-                
-            case COMPARATOR :
+
+            case COMPARATOR:
                 schemaObjectPath = SchemaConstants.COMPARATORS_PATH;
                 break;
-                
-            case DIT_CONTENT_RULE :
+
+            case DIT_CONTENT_RULE:
                 schemaObjectPath = SchemaConstants.DIT_CONTENT_RULES_PATH;
                 break;
-                
-            case DIT_STRUCTURE_RULE :
+
+            case DIT_STRUCTURE_RULE:
                 schemaObjectPath = SchemaConstants.DIT_STRUCTURE_RULES_PATH;
                 break;
-                
-            case LDAP_SYNTAX :
+
+            case LDAP_SYNTAX:
                 schemaObjectPath = SchemaConstants.SYNTAXES_PATH;
                 break;
-                
-            case MATCHING_RULE :
+
+            case MATCHING_RULE:
                 schemaObjectPath = SchemaConstants.MATCHING_RULES_PATH;
                 break;
-                
-            case MATCHING_RULE_USE :
+
+            case MATCHING_RULE_USE:
                 schemaObjectPath = SchemaConstants.MATCHING_RULE_USE_PATH;
                 break;
-                
-            case NAME_FORM :
+
+            case NAME_FORM:
                 schemaObjectPath = SchemaConstants.NAME_FORMS_PATH;
                 break;
-                
-            case NORMALIZER :
+
+            case NORMALIZER:
                 schemaObjectPath = SchemaConstants.NORMALIZERS_PATH;
                 break;
-                
-            case OBJECT_CLASS :
+
+            case OBJECT_CLASS:
                 schemaObjectPath = SchemaConstants.OBJECT_CLASSES_PATH;
                 break;
-                
-            case SYNTAX_CHECKER :
+
+            case SYNTAX_CHECKER:
                 schemaObjectPath = SchemaConstants.SYNTAX_CHECKERS_PATH;
                 break;
         }
-        
+
         return schemaObjectPath;
     }
 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java Tue Jan 24 17:44:03 2012
@@ -71,24 +71,24 @@ public final class SchemaUtils
 
             switch ( mod.getOperation() )
             {
-                case REPLACE_ATTRIBUTE :
+                case REPLACE_ATTRIBUTE:
                     targetEntry.put( mod.getAttribute() );
                     break;
 
-                case ADD_ATTRIBUTE :
+                case ADD_ATTRIBUTE:
                     Attribute combined = mod.getAttribute().clone();
                     Attribute toBeAdded = mod.getAttribute();
                     Attribute existing = entry.get( id );
 
                     if ( existing != null )
                     {
-                        for ( Value<?> value:existing )
+                        for ( Value<?> value : existing )
                         {
                             combined.add( value );
                         }
                     }
 
-                    for ( Value<?> value:toBeAdded )
+                    for ( Value<?> value : toBeAdded )
                     {
                         combined.add( value );
                     }
@@ -96,7 +96,7 @@ public final class SchemaUtils
                     targetEntry.put( combined );
                     break;
 
-                case REMOVE_ATTRIBUTE :
+                case REMOVE_ATTRIBUTE:
                     Attribute toBeRemoved = mod.getAttribute();
 
                     if ( toBeRemoved.size() == 0 )
@@ -109,7 +109,7 @@ public final class SchemaUtils
 
                         if ( existing != null )
                         {
-                            for ( Value<?> value:toBeRemoved )
+                            for ( Value<?> value : toBeRemoved )
                             {
                                 existing.remove( value );
                             }
@@ -153,12 +153,12 @@ public final class SchemaUtils
         else
         {
             buf.append( "( " );
-            
+
             for ( String qdescr : qdescrs )
             {
                 buf.append( "'" ).append( qdescr ).append( "' " );
             }
-            
+
             buf.append( ")" );
         }
 
@@ -176,13 +176,13 @@ public final class SchemaUtils
      * @param qdescrs the quoted description strings to render
      * @return the string buffer the qdescrs are rendered into
      */
-    /* No qualifier */ static StringBuffer renderQDescrs( StringBuffer buf, List<String> qdescrs )
+    /* No qualifier */static StringBuffer renderQDescrs( StringBuffer buf, List<String> qdescrs )
     {
         if ( ( qdescrs == null ) || ( qdescrs.size() == 0 ) )
         {
             return buf;
         }
-        
+
         if ( qdescrs.size() == 1 )
         {
             buf.append( '\'' ).append( qdescrs.get( 0 ) ).append( '\'' );
@@ -190,12 +190,12 @@ public final class SchemaUtils
         else
         {
             buf.append( "( " );
-            
+
             for ( String qdescr : qdescrs )
             {
                 buf.append( '\'' ).append( qdescr ).append( "' " );
             }
-            
+
             buf.append( ")" );
         }
 
@@ -222,9 +222,9 @@ public final class SchemaUtils
         else
         {
             buf.append( "( " );
-            
+
             boolean isFirst = true;
-            
+
             for ( String oid : oids )
             {
                 if ( isFirst )
@@ -235,10 +235,10 @@ public final class SchemaUtils
                 {
                     buf.append( " $ " );
                 }
-                
+
                 buf.append( oid );
             }
-            
+
             buf.append( " )" );
         }
 
@@ -254,31 +254,32 @@ public final class SchemaUtils
      */
     private static StringBuffer renderQDString( StringBuffer buf, String qdString )
     {
-        buf.append(  '\'' );
-        
+        buf.append( '\'' );
+
         for ( char c : qdString.toCharArray() )
         {
             switch ( c )
             {
-                case 0x27 :
+                case 0x27:
                     buf.append( "\\27" );
                     break;
-                    
-                case 0x5C :
+
+                case 0x5C:
                     buf.append( "\\5C" );
                     break;
-                    
-                default :
+
+                default:
                     buf.append( c );
                     break;
             }
         }
-        
-        buf.append(  '\'' );
-     
+
+        buf.append( '\'' );
+
         return buf;
     }
 
+
     // ------------------------------------------------------------------------
     // objectClass list rendering operations
     // ------------------------------------------------------------------------
@@ -294,7 +295,7 @@ public final class SchemaUtils
     public static StringBuffer render( ObjectClass[] ocs )
     {
         StringBuffer buf = new StringBuffer();
-        
+
         return render( buf, ocs );
     }
 
@@ -322,7 +323,7 @@ public final class SchemaUtils
         else
         {
             buf.append( "( " );
-            
+
             for ( int ii = 0; ii < ocs.length; ii++ )
             {
                 if ( ii + 1 < ocs.length )
@@ -334,7 +335,7 @@ public final class SchemaUtils
                     buf.append( ocs[ii].getName() );
                 }
             }
-            
+
             buf.append( " )" );
         }
 
@@ -453,7 +454,7 @@ public final class SchemaUtils
     {
         StringBuffer buf = new StringBuffer();
         buf.append( "( " ).append( oc.getOid() );
-        
+
         List<String> names = oc.getNames();
 
         if ( ( names != null ) && ( names.size() > 0 ) )
@@ -474,7 +475,7 @@ public final class SchemaUtils
         }
 
         List<String> superiorOids = oc.getSuperiorOids();
-        
+
         if ( ( superiorOids != null ) && ( superiorOids.size() > 0 ) )
         {
             buf.append( " SUP " );
@@ -487,7 +488,7 @@ public final class SchemaUtils
         }
 
         List<String> must = oc.getMustAttributeTypeOids();
-        
+
         if ( ( must != null ) && ( must.size() > 0 ) )
         {
             buf.append( " MUST " );
@@ -674,7 +675,7 @@ public final class SchemaUtils
             return buf;
         }
 
-        for ( Map.Entry<String, List<String>>entry : extensions.entrySet() )
+        for ( Map.Entry<String, List<String>> entry : extensions.entrySet() )
         {
             buf.append( " " ).append( entry.getKey() ).append( " " );
 
@@ -760,7 +761,7 @@ public final class SchemaUtils
     {
         StringBuffer buf = new StringBuffer();
         buf.append( "( " ).append( mr.getOid() );
-        
+
         List<String> names = mr.getNames();
 
         if ( ( names != null ) && ( names.size() > 0 ) )
@@ -857,7 +858,7 @@ public final class SchemaUtils
     {
         StringBuffer buf = new StringBuffer();
         buf.append( "( " ).append( mru.getOid() );
-        
+
         List<String> names = mru.getNames();
 
         if ( ( names != null ) && ( names.size() > 0 ) )
@@ -871,20 +872,20 @@ public final class SchemaUtils
             buf.append( " DESC " );
             renderQDString( buf, mru.getDescription() );
         }
-        
+
         if ( mru.isObsolete )
         {
-            buf.append(  " OBSOLETE" );
+            buf.append( " OBSOLETE" );
         }
-        
+
         List<String> applies = mru.getApplicableAttributeOids();
-        
+
         if ( ( applies != null ) && ( applies.size() > 0 ) )
         {
             buf.append( " APPLIES " );
             renderOids( buf, applies );
         }
-        
+
         buf.append( " X-SCHEMA '" );
         buf.append( mru.getSchemaName() );
         buf.append( "'" );
@@ -905,15 +906,15 @@ public final class SchemaUtils
     {
         StringBuffer buf = new StringBuffer();
         buf.append( "( " ).append( dcr.getOid() );
-        
+
         List<String> names = dcr.getNames();
-        
+
         if ( ( names != null ) && ( names.size() > 0 ) )
         {
             buf.append( " NAME " );
             renderQDescrs( buf, names );
         }
-        
+
         if ( dcr.getDescription() != null )
         {
             buf.append( " DESC " );
@@ -926,7 +927,7 @@ public final class SchemaUtils
         }
 
         List<String> aux = dcr.getAuxObjectClassOids();
-        
+
         if ( ( aux != null ) && ( aux.size() > 0 ) )
         {
             buf.append( " AUX " );
@@ -934,7 +935,7 @@ public final class SchemaUtils
         }
 
         List<String> must = dcr.getMustAttributeTypeOids();
-        
+
         if ( ( must != null ) && ( must.size() > 0 ) )
         {
             buf.append( " MUST " );
@@ -942,7 +943,7 @@ public final class SchemaUtils
         }
 
         List<String> may = dcr.getMayAttributeTypeOids();
-        
+
         if ( ( may != null ) && ( may.size() > 0 ) )
         {
             buf.append( " MAY " );
@@ -950,7 +951,7 @@ public final class SchemaUtils
         }
 
         List<String> not = dcr.getNotAttributeTypeOids();
-        
+
         if ( ( not != null ) && ( not.size() > 0 ) )
         {
             buf.append( " AUX " );
@@ -973,20 +974,21 @@ public final class SchemaUtils
     /**
      * NOT FULLY IMPLEMENTED!
      */
-    @SuppressWarnings("PMD.UnusedLocalVariable") // Remove me when the TODO is fixed 
+    @SuppressWarnings("PMD.UnusedLocalVariable")
+    // Remove me when the TODO is fixed 
     public static StringBuffer render( DITStructureRule dsr )
     {
         StringBuffer buf = new StringBuffer();
         buf.append( "( " ).append( dsr.getOid() );
-        
+
         List<String> names = dsr.getNames();
-        
+
         if ( ( names != null ) && ( names.size() > 0 ) )
         {
             buf.append( " NAME " );
             renderQDescrs( buf, names );
         }
-        
+
         if ( dsr.getDescription() != null )
         {
             buf.append( " DESC " );
@@ -1019,7 +1021,7 @@ public final class SchemaUtils
     {
         StringBuffer buf = new StringBuffer();
         buf.append( "( " ).append( nf.getOid() );
-        
+
         List<String> names = nf.getNames();
 
         if ( ( names != null ) && ( names.size() > 0 ) )
@@ -1041,12 +1043,12 @@ public final class SchemaUtils
 
         buf.append( " OC " );
         buf.append( nf.getStructuralObjectClass().getName() );
-        
+
         buf.append( " MUST " );
         renderOids( buf, nf.getMustAttributeTypeOids() );
-        
+
         List<String> may = nf.getMayAttributeTypeOids();
-        
+
         if ( ( may != null ) && ( may.size() > 0 ) )
         {
             buf.append( " MAY " );
@@ -1082,7 +1084,7 @@ public final class SchemaUtils
 
         buf.append( " FQCN " ).append( description.getFqcn() );
 
-        if ( !Strings.isEmpty(description.getBytecode()) )
+        if ( !Strings.isEmpty( description.getBytecode() ) )
         {
             buf.append( " BYTECODE " ).append( description.getBytecode() );
         }
@@ -1119,8 +1121,8 @@ public final class SchemaUtils
      */
     public static String stripOptions( String attributeId )
     {
-        int optionsPos = attributeId.indexOf( ";" ); 
-        
+        int optionsPos = attributeId.indexOf( ";" );
+
         if ( optionsPos != -1 )
         {
             return attributeId.substring( 0, optionsPos );
@@ -1130,7 +1132,8 @@ public final class SchemaUtils
             return attributeId;
         }
     }
-    
+
+
     /**
      * Get the options from the attributeType.
      * 
@@ -1141,22 +1144,22 @@ public final class SchemaUtils
      */
     public static Set<String> getOptions( String attributeId )
     {
-        int optionsPos = attributeId.indexOf( ";" ); 
+        int optionsPos = attributeId.indexOf( ";" );
 
         if ( optionsPos != -1 )
         {
             Set<String> options = new HashSet<String>();
-            
+
             String[] res = attributeId.substring( optionsPos + 1 ).split( ";" );
-            
-            for ( String option:res )
+
+            for ( String option : res )
             {
-                if ( !Strings.isEmpty(option) )
+                if ( !Strings.isEmpty( option ) )
                 {
                     options.add( option );
                 }
             }
-            
+
             return options;
         }
         else
@@ -1164,8 +1167,8 @@ public final class SchemaUtils
             return null;
         }
     }
-    
-    
+
+
     /**
      * Transform an UUID in a byte array
      * @param uuid The UUID to transform
@@ -1175,25 +1178,25 @@ public final class SchemaUtils
     {
         Long low = uuid.getLeastSignificantBits();
         Long high = uuid.getMostSignificantBits();
-        byte[] bytes=new byte[16];
-        
-        bytes[0]  = (byte) ((high & 0xff00000000000000L)>>56);
-        bytes[1]  = (byte) ((high & 0x00ff000000000000L)>>48);
-        bytes[2]  = (byte) ((high & 0x0000ff0000000000L)>>40);
-        bytes[3]  = (byte) ((high & 0x000000ff00000000L)>>32);
-        bytes[4]  = (byte) ((high & 0x00000000ff000000L)>>24);
-        bytes[5]  = (byte) ((high & 0x0000000000ff0000L)>>16);
-        bytes[6]  = (byte) ((high & 0x000000000000ff00L)>>8);
-        bytes[7]  = (byte) (high & 0x00000000000000ffL);
-        bytes[8]  = (byte) ((low & 0xff00000000000000L)>>56);
-        bytes[9]  = (byte) ((low & 0x00ff000000000000L)>>48);
-        bytes[10] = (byte) ((low & 0x0000ff0000000000L)>>40);
-        bytes[11] = (byte) ((low & 0x000000ff00000000L)>>32);
-        bytes[12] = (byte) ((low & 0x00000000ff000000L)>>24);
-        bytes[13] = (byte) ((low & 0x0000000000ff0000L)>>16);
-        bytes[14] = (byte) ((low & 0x000000000000ff00L)>>8);
-        bytes[15] = (byte) (low & 0x00000000000000ffL);
-        
+        byte[] bytes = new byte[16];
+
+        bytes[0] = ( byte ) ( ( high & 0xff00000000000000L ) >> 56 );
+        bytes[1] = ( byte ) ( ( high & 0x00ff000000000000L ) >> 48 );
+        bytes[2] = ( byte ) ( ( high & 0x0000ff0000000000L ) >> 40 );
+        bytes[3] = ( byte ) ( ( high & 0x000000ff00000000L ) >> 32 );
+        bytes[4] = ( byte ) ( ( high & 0x00000000ff000000L ) >> 24 );
+        bytes[5] = ( byte ) ( ( high & 0x0000000000ff0000L ) >> 16 );
+        bytes[6] = ( byte ) ( ( high & 0x000000000000ff00L ) >> 8 );
+        bytes[7] = ( byte ) ( high & 0x00000000000000ffL );
+        bytes[8] = ( byte ) ( ( low & 0xff00000000000000L ) >> 56 );
+        bytes[9] = ( byte ) ( ( low & 0x00ff000000000000L ) >> 48 );
+        bytes[10] = ( byte ) ( ( low & 0x0000ff0000000000L ) >> 40 );
+        bytes[11] = ( byte ) ( ( low & 0x000000ff00000000L ) >> 32 );
+        bytes[12] = ( byte ) ( ( low & 0x00000000ff000000L ) >> 24 );
+        bytes[13] = ( byte ) ( ( low & 0x0000000000ff0000L ) >> 16 );
+        bytes[14] = ( byte ) ( ( low & 0x000000000000ff00L ) >> 8 );
+        bytes[15] = ( byte ) ( low & 0x00000000000000ffL );
+
         return bytes;
     }
 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -33,7 +33,8 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 // super.hashCode is final
-@SuppressWarnings({ "PMD.OverrideBothEqualsAndHashcode", "serial" })
+@SuppressWarnings(
+    { "PMD.OverrideBothEqualsAndHashcode", "serial" })
 public abstract class SyntaxChecker extends LoadableSchemaObject
 {
     /**

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/UsageEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/UsageEnum.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/UsageEnum.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/UsageEnum.java Tue Jan 24 17:44:03 2012
@@ -35,20 +35,21 @@ package org.apache.directory.shared.ldap
 public enum UsageEnum
 {
     /** value for attributes with userApplications usage */
-    USER_APPLICATIONS( 0 ),
+    USER_APPLICATIONS(0),
 
     /** value for attributes with directoryOperation usage */
-    DIRECTORY_OPERATION( 1 ),
+    DIRECTORY_OPERATION(1),
 
     /** value for attributes with distributedOperation usage */
-    DISTRIBUTED_OPERATION( 2 ),
+    DISTRIBUTED_OPERATION(2),
 
     /** value for attributes with dSAOperation usage */
-    DSA_OPERATION( 3 );
+    DSA_OPERATION(3);
 
     /** Stores the integer value of each element of the enumeration */
     private int value;
 
+
     /**
      * Private construct so no other instances can be created other than the
      * public static constants in this class.
@@ -59,7 +60,8 @@ public enum UsageEnum
     {
         this.value = value;
     }
-    
+
+
     /**
      * @return The value associated with the current element.
      */
@@ -68,6 +70,7 @@ public enum UsageEnum
         return value;
     }
 
+
     /**
      * Gets the enumeration type for the attributeType usage string regardless
      * of case.
@@ -80,10 +83,10 @@ public enum UsageEnum
         try
         {
             UsageEnum result = valueOf( usage );
-            
+
             return result;
         }
-        catch( IllegalArgumentException iae )
+        catch ( IllegalArgumentException iae )
         {
             if ( "directoryOperation".equals( usage ) )
             {
@@ -95,19 +98,20 @@ public enum UsageEnum
             }
             else if ( "dSAOperation".equals( usage ) )
             {
-                return DSA_OPERATION;    
+                return DSA_OPERATION;
             }
-            else if ( "userApplications".equals( usage ) ) 
+            else if ( "userApplications".equals( usage ) )
             {
                 return USER_APPLICATIONS;
             }
-            else 
+            else
             {
                 return null;
             }
         }
     }
-    
+
+
     /**
      * Get the string representation for UsageEnum, which will be
      * used by the AttributeType rendering 
@@ -116,21 +120,27 @@ public enum UsageEnum
      */
     public static String render( UsageEnum usage )
     {
-        if ( usage == null)
+        if ( usage == null )
         {
             return "userApplications";
         }
-        
+
         switch ( usage )
         {
-            case DIRECTORY_OPERATION    : return "directoryOperation";
-            case DISTRIBUTED_OPERATION  : return "distributedOperation";
-            case DSA_OPERATION          : return "dSAOperation";
-            case USER_APPLICATIONS      : return "userApplications";
-            default : return "";
+            case DIRECTORY_OPERATION:
+                return "directoryOperation";
+            case DISTRIBUTED_OPERATION:
+                return "distributedOperation";
+            case DSA_OPERATION:
+                return "dSAOperation";
+            case USER_APPLICATIONS:
+                return "userApplications";
+            default:
+                return "";
         }
     }
 
+
     /**
      * Get the string representation for UsageEnum, which will be
      * used by the AttributeType rendering 

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java Tue Jan 24 17:44:03 2012
@@ -38,6 +38,7 @@ public class BitStringComparator extends
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( BitStringComparator.class );
 
+
     /**
      * The BitStringComparator constructor. Its OID is the IntegerOrderingMatch matching
      * rule OID.
@@ -52,7 +53,7 @@ public class BitStringComparator extends
      * Implementation of the Compare method
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
-            justification ="false positive")
+        justification = "false positive")
     public int compare( String bs1, String bs2 )
     {
         LOG.debug( "comparing BitString objects '{}' with '{}'", bs1, bs2 );

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java Tue Jan 24 17:44:03 2012
@@ -38,6 +38,7 @@ public class BooleanComparator extends L
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( BooleanComparator.class );
 
+
     /**
      * The BooleanComparator constructor. Its OID is the BooleanMatch matching
      * rule OID.

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java Tue Jan 24 17:44:03 2012
@@ -39,6 +39,7 @@ public class ByteArrayComparator extends
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( ByteArrayComparator.class );
 
+
     /**
      * The ByteArrayComparator constructor. Its OID is the OctetStringMatch matching
      * rule OID.
@@ -48,13 +49,14 @@ public class ByteArrayComparator extends
         super( oid );
     }
 
+
     /**
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
     public int compare( byte[] b1, byte[] b2 )
     {
-        LOG.debug( "comparing OctetString objects '{}' with '{}'", 
-            Strings.dumpBytes(b1), Strings.dumpBytes(b2) );
+        LOG.debug( "comparing OctetString objects '{}' with '{}'",
+            Strings.dumpBytes( b1 ), Strings.dumpBytes( b2 ) );
 
         // -------------------------------------------------------------------
         // Handle some basis cases
@@ -64,12 +66,12 @@ public class ByteArrayComparator extends
         {
             return ( b2 == null ) ? 0 : -1;
         }
-        
+
         if ( b2 == null )
         {
             return 1;
         }
-        
+
         if ( b1.length == b2.length )
         {
             for ( int i = 0; i < b1.length; i++ )
@@ -83,12 +85,12 @@ public class ByteArrayComparator extends
                     return -1;
                 }
             }
-            
+
             return 0;
         }
-        
+
         int minLength = Math.min( b1.length, b2.length );
-        
+
         for ( int i = 0; i < minLength; i++ )
         {
             if ( b1[i] > b2[i] )
@@ -100,19 +102,19 @@ public class ByteArrayComparator extends
                 return -1;
             }
         }
-        
+
         // b2 is longer w/ b1 as prefix 
         if ( b1.length == minLength )
         {
             return -1;
         }
-        
+
         // b1 is longer w/ b2 as prefix
         if ( b2.length == minLength )
         {
             return 1;
         }
-        
+
         return 0;
     }
 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java Tue Jan 24 17:44:03 2012
@@ -40,6 +40,7 @@ public class ComparableComparator<T> ext
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( ComparableComparator.class );
 
+
     /**
      * The ComparableComparator constructor.
      *

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java Tue Jan 24 17:44:03 2012
@@ -45,6 +45,7 @@ public class CsnComparator extends LdapC
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( CsnComparator.class );
 
+
     /**
      * The CsnComparator constructor. Its OID is the CsnMatch matching
      * rule OID.
@@ -61,7 +62,7 @@ public class CsnComparator extends LdapC
     public int compare( Object csnObj1, Object csnObj2 )
     {
         LOG.debug( "comparing CSN objects '{}' with '{}'", csnObj1, csnObj2 );
-        
+
         if ( csnObj1 == csnObj2 )
         {
             return 0;
@@ -74,15 +75,15 @@ public class CsnComparator extends LdapC
         {
             return ( csnObj2 == null ) ? 0 : -1;
         }
-        
+
         if ( csnObj2 == null )
         {
             return 1;
         }
-        
+
         String csnStr1 = null;
         String csnStr2 = null;
-        
+
         if ( csnObj1 instanceof StringValue )
         {
             csnStr1 = ( ( StringValue ) csnObj1 ).getValue();
@@ -94,13 +95,13 @@ public class CsnComparator extends LdapC
 
         if ( csnObj2 instanceof StringValue )
         {
-            csnStr2 = ( (StringValue) csnObj2 ).getValue();
+            csnStr2 = ( ( StringValue ) csnObj2 ).getValue();
         }
         else
         {
             csnStr2 = csnObj2.toString();
         }
-        
+
         return csnStr1.compareTo( csnStr2 );
     }
 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java Tue Jan 24 17:44:03 2012
@@ -40,6 +40,7 @@ public class CsnSidComparator extends Ld
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( CsnSidComparator.class );
 
+
     /**
      * The CsnSidComparator constructor. Its OID is the CsnSidMatch matching
      * rule OID.
@@ -48,8 +49,8 @@ public class CsnSidComparator extends Ld
     {
         super( oid );
     }
-    
-    
+
+
     /**
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
@@ -64,15 +65,15 @@ public class CsnSidComparator extends Ld
         {
             return ( sidStr2 == null ) ? 0 : -1;
         }
-        
+
         if ( sidStr2 == null )
         {
             return 1;
         }
-        
+
         int sid1 = 0;
         int sid2 = 0;
-        
+
         try
         {
             sid1 = Integer.parseInt( sidStr1, 16 );
@@ -81,7 +82,7 @@ public class CsnSidComparator extends Ld
         {
             return -1;
         }
-        
+
         try
         {
             sid2 = Integer.parseInt( sidStr2, 16 );
@@ -90,7 +91,7 @@ public class CsnSidComparator extends Ld
         {
             return 1;
         }
-        
+
         if ( sid1 > sid2 )
         {
             return 1;
@@ -99,7 +100,7 @@ public class CsnSidComparator extends Ld
         {
             return -1;
         }
-        
+
         return 0;
     }
 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java Tue Jan 24 17:44:03 2012
@@ -34,7 +34,9 @@ public class DeepTrimCachingNormalizingC
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
+
+    @SuppressWarnings(
+        { "rawtypes", "unchecked" })
     public DeepTrimCachingNormalizingComparator( String oid )
     {
         super( oid, new CachingNormalizer( new DeepTrimNormalizer( oid ), 10 ),

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java Tue Jan 24 17:44:03 2012
@@ -34,7 +34,9 @@ public class DeepTrimToLowerCachingNorma
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
+
+    @SuppressWarnings(
+        { "rawtypes", "unchecked" })
     public DeepTrimToLowerCachingNormalizingComparator( String oid )
     {
         super( oid, new CachingNormalizer( new DeepTrimToLowerNormalizer( oid ), 10 ),

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java Tue Jan 24 17:44:03 2012
@@ -38,24 +38,25 @@ public class DnComparator extends LdapCo
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 
-    /** A reference to the schema manager */ 
+    /** A reference to the schema manager */
     private SchemaManager schemaManager;
-    
+
+
     public DnComparator( String oid )
     {
         super( oid );
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
-    public int compare( Object obj0, Object obj1 ) 
+    public int compare( Object obj0, Object obj1 )
     {
         Dn dn0 = null;
         Dn dn1 = null;
-        
-        try 
+
+        try
         {
             dn0 = getDn( obj0 );
             dn1 = getDn( obj1 );
@@ -65,7 +66,7 @@ public class DnComparator extends LdapCo
             // -- what do we do here ?
             return -1;
         }
-        
+
         if ( dn0.equals( dn1 ) )
         {
             return 0;
@@ -80,11 +81,11 @@ public class DnComparator extends LdapCo
     private Dn getDn( Object obj ) throws LdapInvalidDnException
     {
         Dn dn = null;
-        
-        if ( obj instanceof Dn)
+
+        if ( obj instanceof Dn )
         {
-            dn = (Dn)obj;
-            
+            dn = ( Dn ) obj;
+
             dn = ( dn.isSchemaAware() ? dn : dn.apply( schemaManager ) );
         }
         else if ( obj instanceof String )
@@ -93,9 +94,9 @@ public class DnComparator extends LdapCo
         }
         else
         {
-            throw new IllegalStateException( I18n.err( I18n.ERR_04218, (obj == null ? null : obj.getClass() ) ) );
+            throw new IllegalStateException( I18n.err( I18n.ERR_04218, ( obj == null ? null : obj.getClass() ) ) );
         }
-        
+
         return dn;
     }
 

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java Tue Jan 24 17:44:03 2012
@@ -44,6 +44,7 @@ public class GeneralizedTimeComparator e
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( GeneralizedTimeComparator.class );
 
+
     /**
      * The GeneralizedTimeComparator constructor. Its OID is the
      * generalizedTimeOrderingMatch matching rule OID.
@@ -58,7 +59,7 @@ public class GeneralizedTimeComparator e
      * Implementation of the Compare method
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
-            justification ="false positive")
+        justification = "false positive")
     public int compare( String backendValue, String assertValue )
     {
         LOG.debug( "comparing generalizedTimeOrdering objects '{}' with '{}'", backendValue, assertValue );

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java Tue Jan 24 17:44:03 2012
@@ -44,6 +44,7 @@ public class IntegerComparator extends L
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( IntegerComparator.class );
 
+
     /**
      * The IntegerComparator constructor. Its OID is the IntegerOrderingMatch matching
      * rule OID.
@@ -74,7 +75,7 @@ public class IntegerComparator extends L
      * Implementation of the Compare method
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "RC_REF_COMPARISON",
-            justification ="false positive")
+        justification = "false positive")
     private int compare( Long backendValue, Long assertValue )
     {
         LOG.debug( "comparing Integer objects '{}' with '{}'", backendValue, assertValue );
@@ -103,7 +104,7 @@ public class IntegerComparator extends L
      * Implementation of the Compare method
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
-            justification ="false positive")
+        justification = "false positive")
     private int compare( String backendValue, String assertValue )
     {
         LOG.debug( "comparing Integer objects '{}' with '{}'", backendValue, assertValue );

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java Tue Jan 24 17:44:03 2012
@@ -36,6 +36,7 @@ public class LongComparator extends Ldap
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 
+
     /**
      * The LongComparator constructor. Its OID is the IntegerOrderingMatch matching
      * rule OID.
@@ -54,7 +55,7 @@ public class LongComparator extends Ldap
      * @return 1 if obj1 > obj2, 0 if obj1 == obj2, -1 if obj1 < obj2
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "RC_REF_COMPARISON",
-            justification ="false positive")
+        justification = "false positive")
     public int compare( Long obj1, Long obj2 )
     {
         if ( obj1 == obj2 )

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java Tue Jan 24 17:44:03 2012
@@ -42,6 +42,7 @@ public class NumericStringComparator ext
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( NumericStringComparator.class );
 
+
     /**
      * The IntegerComparator constructor. Its OID is the numericStringOrderingMatch matching
      * rule OID.
@@ -56,7 +57,7 @@ public class NumericStringComparator ext
      * Implementation of the Compare method
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
-            justification ="false positive")
+        justification = "false positive")
     public int compare( String backendValue, String assertValue )
     {
         LOG.debug( "comparing numericStringOrdering objects '{}' with '{}'", backendValue, assertValue );

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java Tue Jan 24 17:44:03 2012
@@ -30,40 +30,42 @@ import org.apache.directory.shared.util.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ObjectClassTypeComparator<T> extends LdapComparator<T> 
+public class ObjectClassTypeComparator<T> extends LdapComparator<T>
 {
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 
+
     public ObjectClassTypeComparator( String oid )
     {
         super( oid );
     }
-    
+
+
     public int compare( T o1, T o2 )
     {
         String s1 = getString( o1 );
         String s2 = getString( o2 );
-        
+
         if ( s1 == null && s2 == null )
         {
             return 0;
         }
-        
+
         if ( s1 == null )
         {
             return -1;
         }
-        
+
         if ( s2 == null )
         {
             return 1;
         }
-        
+
         return s1.compareTo( s2 );
     }
-    
-    
+
+
     String getString( T obj )
     {
         String strValue;
@@ -72,14 +74,14 @@ public class ObjectClassTypeComparator<T
         {
             return null;
         }
-        
+
         if ( obj instanceof String )
         {
             strValue = ( String ) obj;
         }
         else if ( obj instanceof byte[] )
         {
-            strValue = Strings.utf8ToString((byte[]) obj);
+            strValue = Strings.utf8ToString( ( byte[] ) obj );
         }
         else
         {

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java Tue Jan 24 17:44:03 2012
@@ -38,6 +38,7 @@ public class ObjectIdentifierComparator 
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( ObjectIdentifierComparator.class );
 
+
     /**
      * The ObjectIdentifierComparator constructor. Its OID is the ObjectIdentifierMatch matching
      * rule OID.
@@ -84,6 +85,6 @@ public class ObjectIdentifierComparator 
         }
 
         // Here, we should leverage the SchemaManager to compare the String and teh OID
-        return ((String)o1).compareToIgnoreCase( (String)o2 );
+        return ( ( String ) o1 ).compareToIgnoreCase( ( String ) o2 );
     }
 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java Tue Jan 24 17:44:03 2012
@@ -41,6 +41,7 @@ public class ObjectIdentifierFirstCompon
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( ObjectIdentifierFirstComponentComparator.class );
 
+
     /**
      * The ObjectIdentifierFirstComponentComparator constructor. Its OID is the 
      * ObjectIdentifierFirstComponentMatch matching rule OID.
@@ -50,7 +51,7 @@ public class ObjectIdentifierFirstCompon
         super( oid );
     }
 
-    
+
     /**
      * Get the OID from the SchemaObject description
      */
@@ -58,27 +59,27 @@ public class ObjectIdentifierFirstCompon
     {
         // Get the OID from the strings now
         int pos = 0;
-        
+
         if ( !Strings.isCharASCII( s, pos++, '(' ) )
         {
             return null;
         }
-        
+
         while ( Strings.isCharASCII( s, pos, ' ' ) )
         {
             pos++;
         }
-        
+
         int start = pos;
-        
-        while ( Chars.isDigit(s, pos) || Strings.isCharASCII( s, pos, '.' ) )
+
+        while ( Chars.isDigit( s, pos ) || Strings.isCharASCII( s, pos, '.' ) )
         {
             pos++;
         }
-        
+
         String numericOid = s.substring( start, pos );
-        
-        if ( Oid.isOid(numericOid) )
+
+        if ( Oid.isOid( numericOid ) )
         {
             return numericOid;
         }
@@ -87,7 +88,8 @@ public class ObjectIdentifierFirstCompon
             return null;
         }
     }
-    
+
+
     /**
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
@@ -102,7 +104,7 @@ public class ObjectIdentifierFirstCompon
         {
             return ( s2 == null ) ? 0 : -1;
         }
-        
+
         if ( s2 == null )
         {
             return -1;
@@ -113,22 +115,22 @@ public class ObjectIdentifierFirstCompon
         {
             return 0;
         }
-        
+
         // Get the OID from the strings now
         String oid1 = getNumericOid( s1 );
-        
+
         if ( oid1 == null )
         {
             return -1;
         }
-        
+
         String oid2 = getNumericOid( s2 );
 
         if ( oid2 == null )
         {
             return -1;
         }
-        
+
         if ( oid1.equals( oid2 ) )
         {
             return 0;

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java Tue Jan 24 17:44:03 2012
@@ -43,13 +43,14 @@ public class SerializableComparator<E> e
 
     /** the OID of the matchingRule for this comparator */
     private String matchingRuleOid;
-    
+
     /** the transient wrapped comparator */
     private transient Comparator<E> wrapped;
 
-    /** A reference to the schema manager */ 
+    /** A reference to the schema manager */
     private transient SchemaManager schemaManager;
-    
+
+
     // ------------------------------------------------------------------------
     // C O N T R U C T O R S
     // ------------------------------------------------------------------------
@@ -74,7 +75,7 @@ public class SerializableComparator<E> e
         {
             try
             {
-                wrapped = (Comparator<E>)schemaManager.lookupComparatorRegistry( matchingRuleOid );
+                wrapped = ( Comparator<E> ) schemaManager.lookupComparatorRegistry( matchingRuleOid );
             }
             catch ( LdapException e )
             {
@@ -96,18 +97,18 @@ public class SerializableComparator<E> e
         {
             try
             {
-                wrapped = ( Comparator<E> ) 
+                wrapped = ( Comparator<E> )
                     schemaManager.lookupComparatorRegistry( matchingRuleOid );
             }
             catch ( LdapException ne )
             {
                 // Not found : get the default comparator
-                wrapped = ( Comparator<E> ) 
+                wrapped = ( Comparator<E> )
                     new ComparableComparator<Comparable<E>>( matchingRuleOid );
             }
         }
 
-        ((LdapComparator<E>)wrapped).setSchemaManager( schemaManager );
+        ( ( LdapComparator<E> ) wrapped ).setSchemaManager( schemaManager );
         super.setSchemaManager( schemaManager );
         this.schemaManager = schemaManager;
     }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java Tue Jan 24 17:44:03 2012
@@ -37,7 +37,6 @@ public class StringComparator extends Ld
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 
-
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( StringComparator.class );
 
@@ -56,7 +55,7 @@ public class StringComparator extends Ld
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
-            justification ="false positive")
+        justification = "false positive")
     public int compare( String s1, String s2 )
     {
         LOG.debug( "comparing String objects '{}' with '{}'", s1, s2 );

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java Tue Jan 24 17:44:03 2012
@@ -41,6 +41,7 @@ public class TelephoneNumberComparator e
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( TelephoneNumberComparator.class );
 
+
     /**
      * The TelephoneNumberComparator constructor. Its OID is the TelephoneNumberMatch matching
      * rule OID.
@@ -50,7 +51,7 @@ public class TelephoneNumberComparator e
         super( oid );
     }
 
-    
+
     /**
      * Remove all spaces and '-' from the telephone number
      */
@@ -58,21 +59,21 @@ public class TelephoneNumberComparator e
     {
         char[] telephoneNumberArray = telephoneNumber.toCharArray();
         int pos = 0;
-        
-        for ( char c:telephoneNumberArray )
+
+        for ( char c : telephoneNumberArray )
         {
             if ( ( c == ' ' ) || ( c == '-' ) )
-            { 
+            {
                 continue;
             }
-            
+
             telephoneNumberArray[pos++] = c;
         }
-        
+
         return new String( telephoneNumberArray, 0, pos );
     }
 
-    
+
     /**
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
@@ -87,18 +88,18 @@ public class TelephoneNumberComparator e
         {
             return ( telephoneNumber2 == null ) ? 0 : -1;
         }
-        
+
         if ( telephoneNumber2 == null )
         {
             return 1;
         }
-        
+
         // -------------------------------------------------------------------
         // Remove all spaces and '-'
         // -------------------------------------------------------------------
         String strippedTelephoneNumber1 = strip( telephoneNumber1 );
         String strippedTelephoneNumber2 = strip( telephoneNumber2 );
-        
+
         return ( strippedTelephoneNumber1.compareToIgnoreCase( strippedTelephoneNumber2 ) );
     }
 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java Tue Jan 24 17:44:03 2012
@@ -38,6 +38,7 @@ public class UUIDComparator extends Ldap
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( UUIDComparator.class );
 
+
     /**
      * The UUIDComparator constructor. Its OID is the UUIDMatch matching
      * rule OID.
@@ -47,7 +48,7 @@ public class UUIDComparator extends Ldap
         super( oid );
     }
 
-    
+
     /**
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
@@ -62,12 +63,12 @@ public class UUIDComparator extends Ldap
         {
             return ( uuid2 == null ) ? 0 : -1;
         }
-        
+
         if ( uuid2 == null )
         {
             return 1;
         }
-        
+
         return uuid1.compareTo( uuid2 );
     }
 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java Tue Jan 24 17:44:03 2012
@@ -43,6 +43,7 @@ public class UniqueMemberComparator exte
     /** A reference to the schema manager */
     private SchemaManager schemaManager;
 
+
     /**
      * The IntegerComparator constructor. Its OID is the IntegerOrderingMatch matching
      * rule OID.
@@ -68,7 +69,7 @@ public class UniqueMemberComparator exte
             {
                 Dn dn1 = getDn( dnstr1 );
                 Dn dn2 = getDn( dnstr2 );
-                
+
                 if ( dn1.equals( dn2 ) )
                 {
                     return 0;
@@ -168,9 +169,9 @@ public class UniqueMemberComparator exte
     {
         Dn dn = null;
 
-        if ( obj instanceof Dn)
+        if ( obj instanceof Dn )
         {
-            dn = (Dn) obj;
+            dn = ( Dn ) obj;
 
             dn = ( dn.isSchemaAware() ? dn : dn.apply( schemaManager ) );
         }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java Tue Jan 24 17:44:03 2012
@@ -52,6 +52,7 @@ public class WordComparator extends Ldap
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( WordComparator.class );
 
+
     /**
      * The StringComparator constructor. Its OID is the StringMatch matching
      * rule OID.
@@ -66,7 +67,7 @@ public class WordComparator extends Ldap
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
-            justification ="false positive")
+        justification = "false positive")
     public int compare( String value, String assertion )
     {
         LOG.debug( "comparing String objects '{}' with '{}'", value, assertion );
@@ -85,7 +86,7 @@ public class WordComparator extends Ldap
         }
 
         // Now, trim the assertion and find it in the value
-        String trimmedAssertion = Strings.trim(assertion);
+        String trimmedAssertion = Strings.trim( assertion );
         int pos = value.indexOf( trimmedAssertion );
 
         if ( pos != -1 )

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java Tue Jan 24 17:44:03 2012
@@ -56,11 +56,11 @@ public class BooleanNormalizer extends N
         }
 
         String strValue = value.getString();
-        
+
         return new StringValue( strValue.trim().toUpperCase() );
     }
 
-    
+
     /**
      * {@inheritDoc}
      */

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimNormalizer.java Tue Jan 24 17:44:03 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.shared.ldap.model.schema.normalizers;
 
 
-
-
 /**
  * A deep trimming normalizer that caches normalizations to prevent repeat
  * normalizations from occurring needlessly.  Try to use this sparing for only

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimToLowerNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimToLowerNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimToLowerNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimToLowerNormalizer.java Tue Jan 24 17:44:03 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.shared.ldap.model.schema.normalizers;
 
 
-
-
 /**
  * A deep trimming normalizer that caches normalizations to prevent repeat
  * normalizations from occurring needlessly.  Try to use this sparing for only

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingNormalizer.java Tue Jan 24 17:44:03 2012
@@ -107,7 +107,7 @@ public class CachingNormalizer extends N
         }
 
         Value<?> normalized = normalizer.normalize( value );
-        
+
         return normalized;
     }
 

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java Tue Jan 24 17:44:03 2012
@@ -48,7 +48,7 @@ public class ConcreteNameComponentNormal
 
     /** the schemaManager used to dynamically resolve Normalizers */
     private final SchemaManager schemaManager;
-    
+
 
     /**
      * Creates a Dn Name component Normalizer which uses the bootstrap
@@ -62,7 +62,7 @@ public class ConcreteNameComponentNormal
         this.schemaManager = schemaManager;
     }
 
-    
+
     private String unescape( String value )
     {
         char[] newVal = new char[value.length()];
@@ -70,12 +70,12 @@ public class ConcreteNameComponentNormal
         char high = 0;
         char low = 0;
         int pos = 0;
-        
-        for ( char c:value.toCharArray() )
+
+        for ( char c : value.toCharArray() )
         {
             switch ( escaped )
             {
-                case 0 :
+                case 0:
                     if ( c == '\\' )
                     {
                         escaped = 1;
@@ -84,32 +84,33 @@ public class ConcreteNameComponentNormal
                     {
                         newVal[pos++] = c;
                     }
-                    
+
                     break;
 
-                case 1 :
+                case 1:
                     escaped++;
                     high = c;
                     break;
-                    
-                case 2 :
-                    escaped=0;
+
+                case 2:
+                    escaped = 0;
                     low = c;
-                    newVal[pos++] = (char) Hex.getHexValue(high, low);
-                    
+                    newVal[pos++] = ( char ) Hex.getHexValue( high, low );
+
             }
         }
-        
+
         return new String( newVal, 0, pos );
     }
 
+
     /**
      * {@inheritDoc}
      */
     public Object normalizeByName( String name, String value ) throws LdapException
     {
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( name );
-        
+
         if ( attributeType.getSyntax().isHumanReadable() )
         {
             return lookup( name ).normalize( value );
@@ -120,8 +121,8 @@ public class ConcreteNameComponentNormal
             {
                 String unescaped = unescape( value );
                 byte[] valBytes = unescaped.getBytes( "UTF-8" );
-                
-                return lookup( name ).normalize( new BinaryValue( valBytes ) ); 
+
+                return lookup( name ).normalize( new BinaryValue( valBytes ) );
             }
             catch ( UnsupportedEncodingException uee )
             {
@@ -130,7 +131,7 @@ public class ConcreteNameComponentNormal
                 throw new LdapException( message, uee );
             }
         }
-        
+
     }
 
 
@@ -140,7 +141,7 @@ public class ConcreteNameComponentNormal
     public Object normalizeByName( String name, byte[] value ) throws LdapException
     {
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( name );
-        
+
         if ( !attributeType.getSyntax().isHumanReadable() )
         {
             return lookup( name ).normalize( new BinaryValue( value ) );
@@ -150,7 +151,7 @@ public class ConcreteNameComponentNormal
             try
             {
                 String valStr = new String( value, "UTF-8" );
-                return lookup( name ).normalize( valStr ); 
+                return lookup( name ).normalize( valStr );
             }
             catch ( UnsupportedEncodingException uee )
             {
@@ -195,12 +196,12 @@ public class ConcreteNameComponentNormal
     {
         AttributeType type = schemaManager.lookupAttributeTypeRegistry( id );
         MatchingRule mrule = type.getEquality();
-        
+
         if ( mrule == null )
         {
             return new NoOpNormalizer( id );
         }
-        
+
         return mrule.getNormalizer();
     }
 

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java Tue Jan 24 17:44:03 2012
@@ -62,41 +62,42 @@ public class DeepTrimNormalizer extends 
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    public Value<?> normalize( Value<?> value ) throws LdapException
+    {
+        try
+        {
+            String normalized = PrepareString.normalize( value.getString(),
+                PrepareString.StringType.DIRECTORY_STRING );
 
-   /**
-    * {@inheritDoc}
-    */
-   public Value<?> normalize( Value<?> value ) throws LdapException
-   {
-       try
-       {
-           String normalized = PrepareString.normalize( value.getString(), 
-               PrepareString.StringType.DIRECTORY_STRING ); 
-           
-           return new StringValue( normalized ); 
-       }
-       catch ( IOException ioe )
-       {
-           throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224, value ), ioe );
-       }
-   }
-
-
-   /**
-    * {@inheritDoc}
-    */
-   public String normalize( String value ) throws LdapException
-   {
-       try
-       {
-           String normalized = PrepareString.normalize( value, 
-               PrepareString.StringType.DIRECTORY_STRING ); 
-           
-           return normalized; 
-       }
-       catch ( IOException ioe )
-       {
-           throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224, value ), ioe );
-       }
-   }
+            return new StringValue( normalized );
+        }
+        catch ( IOException ioe )
+        {
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), ioe );
+        }
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public String normalize( String value ) throws LdapException
+    {
+        try
+        {
+            String normalized = PrepareString.normalize( value,
+                PrepareString.StringType.DIRECTORY_STRING );
+
+            return normalized;
+        }
+        catch ( IOException ioe )
+        {
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), ioe );
+        }
+    }
 }
\ No newline at end of file

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java Tue Jan 24 17:44:03 2012
@@ -77,12 +77,13 @@ public class DeepTrimToLowerNormalizer e
         {
             String normalized = PrepareString.normalize( value.getString(),
                 PrepareString.StringType.CASE_IGNORE );
-            
+
             return new StringValue( normalized );
         }
         catch ( IOException ioe )
         {
-            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224, value ), ioe );
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), ioe );
         }
     }
 
@@ -101,12 +102,13 @@ public class DeepTrimToLowerNormalizer e
         {
             String normalized = PrepareString.normalize( value,
                 PrepareString.StringType.CASE_IGNORE );
-            
+
             return normalized;
         }
         catch ( IOException ioe )
         {
-            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224,  value ), ioe );
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), ioe );
         }
     }
 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.model.schema.normalizers;
 
+
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -40,7 +41,8 @@ public class DefaultStringNormalizer ext
 {
     /** A default String normalizer */
     private static final DefaultStringNormalizer NORMALIZER = new DefaultStringNormalizer();
-    
+
+
     protected DefaultStringNormalizer()
     {
         // TODO : This is probably not the correct OID ... 
@@ -54,30 +56,30 @@ public class DefaultStringNormalizer ext
     public Value<?> normalize( Value<?> value ) throws LdapException
     {
         String str = value.getString();
-        
-        if ( Strings.isEmpty(str) )
+
+        if ( Strings.isEmpty( str ) )
         {
             return new StringValue( str );
         }
-        
+
         return new StringValue( str );
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
     public String normalize( String value ) throws LdapException
     {
-        if ( Strings.isEmpty(value) )
+        if ( Strings.isEmpty( value ) )
         {
             return value;
         }
-        
+
         return value;
     }
 
-    
+
     /**
      * Normalize the given String
      *

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java Tue Jan 24 17:44:03 2012
@@ -39,7 +39,8 @@ public class DnNormalizer extends Normal
 {
     /** A reference to the schema manager used to normalize the Dn */
     private SchemaManager schemaManager;
-    
+
+
     /**
      * Empty constructor
      */
@@ -55,11 +56,11 @@ public class DnNormalizer extends Normal
     public Value<?> normalize( Value<?> value ) throws LdapException
     {
         Dn dn = null;
-        
+
         String dnStr = value.getString();
-        
+
         dn = new Dn( schemaManager, dnStr );
-        
+
         return new StringValue( dn.getNormName() );
     }
 
@@ -70,9 +71,9 @@ public class DnNormalizer extends Normal
     public String normalize( String value ) throws LdapException
     {
         Dn dn = null;
-        
+
         dn = new Dn( schemaManager, value );
-        
+
         return dn.getNormName();
     }
 
@@ -86,9 +87,9 @@ public class DnNormalizer extends Normal
     public String normalize( Dn value ) throws LdapException
     {
         Dn dn = null;
-        
+
         dn = value.apply( schemaManager );
-        
+
         return dn.getNormName();
     }
 

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java Tue Jan 24 17:44:03 2012
@@ -75,7 +75,8 @@ public class GeneralizedTimeNormalizer e
         }
         catch ( IOException ioe )
         {
-            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224, value ), ioe );
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), ioe );
         }
     }
 
@@ -97,11 +98,13 @@ public class GeneralizedTimeNormalizer e
         }
         catch ( IOException ioe )
         {
-            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224, value ), ioe );
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), ioe );
         }
         catch ( ParseException pe )
         {
-            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224, value ), pe );
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), pe );
         }
     }
 }
\ No newline at end of file

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameComponentNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameComponentNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameComponentNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameComponentNormalizer.java Tue Jan 24 17:44:03 2012
@@ -40,6 +40,7 @@ public interface NameComponentNormalizer
      */
     boolean isDefined( String id );
 
+
     /**
      * Normalizes the attribute name/alias to use the OID for it instead.
      * 
@@ -49,6 +50,7 @@ public interface NameComponentNormalizer
      */
     String normalizeName( String attributeName ) throws LdapException;
 
+
     /**
      * Normalizes an attribute's value given the name of the attribute - short
      * names like 'cn' as well as 'commonName' should work here.

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java Tue Jan 24 17:44:03 2012
@@ -42,7 +42,7 @@ public class NoOpNormalizer extends Norm
         super( oid );
     }
 
-    
+
     /**
      * Default constructor for NoOpNormalizer used when we must set the OID
      * after instantiating the Normalizer.
@@ -51,7 +51,7 @@ public class NoOpNormalizer extends Norm
     {
     }
 
-    
+
     /**
      * Returns the value argument as-is without alterations all the time.
      * 
@@ -63,8 +63,8 @@ public class NoOpNormalizer extends Norm
     {
         return value;
     }
-    
-    
+
+
     /**
      * Returns the value argument as-is without alterations all the time.
      * 



Mime
View raw message