directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1066817 - in /directory/shared/branches/m1/ldap: ./ src/main/java/org/apache/directory/shared/ldap/model/constants/ src/main/java/org/apache/directory/shared/ldap/model/schema/ src/main/java/org/apache/directory/shared/ldap/model/schema/re...
Date Thu, 03 Feb 2011 14:34:06 GMT
Author: elecharny
Date: Thu Feb  3 14:34:05 2011
New Revision: 1066817

URL: http://svn.apache.org/viewvc?rev=1066817&view=rev
Log:
Injected trunks changes

Modified:
    directory/shared/branches/m1/ldap/   (props changed)
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java   (props changed)
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultComparatorRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITStructureRuleRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultLdapSyntaxRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleUseRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultNameFormRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultNormalizerRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultObjectClassRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSyntaxCheckerRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableComparatorRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITContentRuleRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITStructureRuleRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableLdapSyntaxRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleUseRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableNameFormRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableNormalizerRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableObjectClassRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableSyntaxCheckerRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaObjectRegistry.java

Propchange: directory/shared/branches/m1/ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  3 14:34:05 2011
@@ -2,4 +2,4 @@
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
-/directory/shared/trunk/ldap:1066124-1066511
+/directory/shared/trunk/ldap:1066124-1066814

Propchange: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  3 14:34:05 2011
@@ -5,5 +5,5 @@
 /directory/shared/branches/shared-subtree/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351
-/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1066124-1066511
+/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1066124-1066814
 /directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java Thu Feb  3 14:34:05 2011
@@ -196,6 +196,7 @@ public class ObjectClass extends Abstrac
                     LdapSchemaException ldapSchemaException = new LdapSchemaException(
                         LdapSchemaExceptionCodes.OC_NONEXISTENT_SUPERIOR, msg );
                     ldapSchemaException.setSourceObject( this );
+                    ldapSchemaException.setRelatedId( superiorName );
                     errors.add( ldapSchemaException );
                     return;
                 }
@@ -226,6 +227,7 @@ public class ObjectClass extends Abstrac
                         LdapSchemaException ldapSchemaException = new LdapSchemaException(
                             LdapSchemaExceptionCodes.OC_COLLECTIVE_NOT_ALLOWED_IN_MAY, msg );
                         ldapSchemaException.setSourceObject( this );
+                        ldapSchemaException.setRelatedId( mayAttributeTypeName );
                         errors.add( ldapSchemaException );
                         break;
                     }
@@ -238,6 +240,7 @@ public class ObjectClass extends Abstrac
                         LdapSchemaException ldapSchemaException = new LdapSchemaException(
                             LdapSchemaExceptionCodes.OC_DUPLICATE_AT_IN_MAY, msg );
                         ldapSchemaException.setSourceObject( this );
+                        ldapSchemaException.setRelatedId( mayAttributeTypeName );
                         errors.add( ldapSchemaException );
                         break;
                     }
@@ -252,6 +255,7 @@ public class ObjectClass extends Abstrac
                     LdapSchemaException ldapSchemaException = new LdapSchemaException(
                         LdapSchemaExceptionCodes.OC_NONEXISTENT_MAY_AT, msg );
                     ldapSchemaException.setSourceObject( this );
+                    ldapSchemaException.setRelatedId( mayAttributeTypeName );
                     errors.add( ldapSchemaException );
                     break;
                 }
@@ -283,6 +287,7 @@ public class ObjectClass extends Abstrac
                         LdapSchemaException ldapSchemaException = new LdapSchemaException(
                             LdapSchemaExceptionCodes.OC_COLLECTIVE_NOT_ALLOWED_IN_MUST, msg );
                         ldapSchemaException.setSourceObject( this );
+                        ldapSchemaException.setRelatedId( mustAttributeTypeName );
                         errors.add( ldapSchemaException );
                         break;
                     }
@@ -295,6 +300,7 @@ public class ObjectClass extends Abstrac
                         LdapSchemaException ldapSchemaException = new LdapSchemaException(
                             LdapSchemaExceptionCodes.OC_DUPLICATE_AT_IN_MUST, msg );
                         ldapSchemaException.setSourceObject( this );
+                        ldapSchemaException.setRelatedId( mustAttributeTypeName );
                         errors.add( ldapSchemaException );
                         break;
                     }
@@ -309,6 +315,7 @@ public class ObjectClass extends Abstrac
                             LdapSchemaExceptionCodes.OC_DUPLICATE_AT_IN_MAY_AND_MUST,
                             msg );
                         ldapSchemaException.setSourceObject( this );
+                        ldapSchemaException.setRelatedId( mustAttributeTypeName );
                         errors.add( ldapSchemaException );
                         break;
                     }
@@ -323,6 +330,7 @@ public class ObjectClass extends Abstrac
                     LdapSchemaException ldapSchemaException = new LdapSchemaException(
                         LdapSchemaExceptionCodes.OC_NONEXISTENT_MUST_AT, msg );
                     ldapSchemaException.setSourceObject( this );
+                    ldapSchemaException.setRelatedId( mustAttributeTypeName );
                     errors.add( ldapSchemaException );
                     break;
                 }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java Thu Feb  3 14:34:05 2011
@@ -61,7 +61,7 @@ public class DefaultAttributeTypeRegistr
      */
     public DefaultAttributeTypeRegistry()
     {
-        super( SchemaObjectType.ATTRIBUTE_TYPE, new OidRegistry() );
+        super( SchemaObjectType.ATTRIBUTE_TYPE, new OidRegistry<AttributeType>() );
         oidNormalizerMap = new HashMap<String, OidNormalizer>();
         oidToDescendantSet = new HashMap<String, Set<AttributeType>>();
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultComparatorRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultComparatorRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultComparatorRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultComparatorRegistry.java Thu Feb  3 14:34:05 2011
@@ -41,16 +41,17 @@ public class DefaultComparatorRegistry e
 
     /** A speedup for debug */
     private static final boolean DEBUG = LOG.isDebugEnabled();
-    
+
+
     /**
      * Creates a new default ComparatorRegistry instance.
      */
     public DefaultComparatorRegistry()
     {
-        super( SchemaObjectType.COMPARATOR, new OidRegistry() );
+        super( SchemaObjectType.COMPARATOR, new OidRegistry<LdapComparator<?>>() );
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -60,7 +61,7 @@ public class DefaultComparatorRegistry e
         {
             return;
         }
-        
+
         // Loop on all the SchemaObjects stored and remove those associated
         // with the give schemaName
         for ( LdapComparator<?> comparator : this )
@@ -69,7 +70,7 @@ public class DefaultComparatorRegistry e
             {
                 String oid = comparator.getOid();
                 SchemaObject removed = unregister( oid );
-                
+
                 if ( DEBUG )
                 {
                     LOG.debug( "Removed {} with oid {} from the registry", removed, oid );
@@ -77,32 +78,32 @@ public class DefaultComparatorRegistry e
             }
         }
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
     public DefaultComparatorRegistry copy()
     {
         DefaultComparatorRegistry copy = new DefaultComparatorRegistry();
-        
+
         // Copy the base data
         copy.copy( this );
-        
+
         return copy;
     }
-    
-    
+
+
     /**
      * @see Object#toString()
      */
     public String toString()
     {
         StringBuilder sb = new StringBuilder();
-        
+
         sb.append( schemaObjectType ).append( ": " );
         boolean isFirst = true;
-        
+
         for ( String name : byName.keySet() )
         {
             if ( isFirst )
@@ -113,15 +114,14 @@ public class DefaultComparatorRegistry e
             {
                 sb.append( ", " );
             }
-            
+
             LdapComparator<?> comparator = byName.get( name );
-            
+
             String fqcn = comparator.getFqcn();
             int lastDotPos = fqcn.lastIndexOf( '.' );
-            
+
             sb.append( '<' ).append( comparator.getOid() ).append( ", " );
-            
-            
+
             if ( lastDotPos > 0 )
             {
                 sb.append( fqcn.substring( lastDotPos + 1 ) );
@@ -130,10 +130,10 @@ public class DefaultComparatorRegistry e
             {
                 sb.append( fqcn );
             }
-            
+
             sb.append( '>' );
         }
-        
+
         return sb.toString();
     }
 }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java Thu Feb  3 14:34:05 2011
@@ -37,7 +37,7 @@ public class DefaultDITContentRuleRegist
      */
     public DefaultDITContentRuleRegistry()
     {
-        super( SchemaObjectType.DIT_CONTENT_RULE, new OidRegistry() );
+        super( SchemaObjectType.DIT_CONTENT_RULE, new OidRegistry<DITContentRule>() );
     }
     
     

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITStructureRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITStructureRuleRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITStructureRuleRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITStructureRuleRegistry.java Thu Feb  3 14:34:05 2011
@@ -46,16 +46,17 @@ public class DefaultDITStructureRuleRegi
 
     /** A speedup for debug */
     private static final boolean DEBUG = LOG.isDebugEnabled();
-    
+
     /** a map of DITStructureRule looked up by RuleId */
     protected Map<Integer, DITStructureRule> byRuleId;
-    
+
+
     /**
      * Creates a new default NormalizerRegistry instance.
      */
     public DefaultDITStructureRuleRegistry()
     {
-        super( SchemaObjectType.DIT_STRUCTURE_RULE, new OidRegistry() );
+        super( SchemaObjectType.DIT_STRUCTURE_RULE, new OidRegistry<DITStructureRule>() );
         byRuleId = new HashMap<Integer, DITStructureRule>();
     }
 
@@ -68,7 +69,7 @@ public class DefaultDITStructureRuleRegi
         return byRuleId.containsKey( ruleId );
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -76,8 +77,8 @@ public class DefaultDITStructureRuleRegi
     {
         return byRuleId.values().iterator();
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -85,8 +86,8 @@ public class DefaultDITStructureRuleRegi
     {
         return byRuleId.keySet().iterator();
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -98,20 +99,20 @@ public class DefaultDITStructureRuleRegi
         {
             return ditStructureRule.getSchemaName();
         }
-        
+
         String msg = I18n.err( I18n.ERR_04263, ruleId );
         LOG.warn( msg );
         throw new LdapException( msg );
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
     public void register( DITStructureRule ditStructureRule ) throws LdapException
     {
         int ruleId = ditStructureRule.getRuleId();
-        
+
         if ( byRuleId.containsKey( ruleId ) )
         {
             String msg = I18n.err( I18n.ERR_04264, ruleId );
@@ -120,14 +121,14 @@ public class DefaultDITStructureRuleRegi
         }
 
         byRuleId.put( ruleId, ditStructureRule );
-        
+
         if ( LOG.isDebugEnabled() )
         {
             LOG.debug( "registered {} for OID {}", ditStructureRule, ruleId );
         }
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -146,7 +147,7 @@ public class DefaultDITStructureRuleRegi
         {
             LOG.debug( "Found {} with ruleId: {}", ditStructureRule, ruleId );
         }
-        
+
         return ditStructureRule;
     }
 
@@ -157,14 +158,14 @@ public class DefaultDITStructureRuleRegi
     public void unregister( int ruleId ) throws LdapException
     {
         DITStructureRule ditStructureRule = byRuleId.remove( ruleId );
-        
+
         if ( DEBUG )
         {
             LOG.debug( "Removed {} with ruleId {} from the registry", ditStructureRule, ruleId );
         }
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -174,7 +175,7 @@ public class DefaultDITStructureRuleRegi
         {
             return;
         }
-        
+
         // Loop on all the SchemaObjects stored and remove those associated
         // with the give schemaName
         for ( DITStructureRule ditStructureRule : this )
@@ -183,7 +184,7 @@ public class DefaultDITStructureRuleRegi
             {
                 int ruleId = ditStructureRule.getRuleId();
                 SchemaObject removed = byRuleId.remove( ruleId );
-                
+
                 if ( DEBUG )
                 {
                     LOG.debug( "Removed {} with ruleId {} from the registry", removed, ruleId );
@@ -192,7 +193,7 @@ public class DefaultDITStructureRuleRegi
         }
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -213,18 +214,18 @@ public class DefaultDITStructureRuleRegi
             }
         }
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
     public DefaultDITStructureRuleRegistry copy()
     {
         DefaultDITStructureRuleRegistry copy = new DefaultDITStructureRuleRegistry();
-        
+
         // Copy the base data
         copy.copy( this );
-        
+
         return copy;
     }
 }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultLdapSyntaxRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultLdapSyntaxRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultLdapSyntaxRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultLdapSyntaxRegistry.java Thu Feb  3 14:34:05 2011
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.model.schema.registries;
 
+
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 
@@ -36,20 +37,20 @@ public class DefaultLdapSyntaxRegistry e
      */
     public DefaultLdapSyntaxRegistry()
     {
-        super( SchemaObjectType.LDAP_SYNTAX, new OidRegistry() );
+        super( SchemaObjectType.LDAP_SYNTAX, new OidRegistry<LdapSyntax>() );
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
     public DefaultLdapSyntaxRegistry copy()
     {
         DefaultLdapSyntaxRegistry copy = new DefaultLdapSyntaxRegistry();
-        
+
         // Copy the base data
         copy.copy( this );
-        
+
         return copy;
     }
 }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java Thu Feb  3 14:34:05 2011
@@ -37,20 +37,20 @@ public class DefaultMatchingRuleRegistry
      */
     public DefaultMatchingRuleRegistry()
     {
-        super( SchemaObjectType.MATCHING_RULE, new OidRegistry() );
+        super( SchemaObjectType.MATCHING_RULE, new OidRegistry<MatchingRule>() );
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
     public DefaultMatchingRuleRegistry copy()
     {
         DefaultMatchingRuleRegistry copy = new DefaultMatchingRuleRegistry();
-        
+
         // Copy the base data
         copy.copy( this );
-        
+
         return copy;
     }
 }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleUseRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleUseRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleUseRegistry.java Thu Feb  3 14:34:05 2011
@@ -40,20 +40,20 @@ public class DefaultMatchingRuleUseRegis
      */
     public DefaultMatchingRuleUseRegistry()
     {
-        super( SchemaObjectType.MATCHING_RULE_USE, new OidRegistry() );
+        super( SchemaObjectType.MATCHING_RULE_USE, new OidRegistry<MatchingRuleUse>() );
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
     public DefaultMatchingRuleUseRegistry copy()
     {
         DefaultMatchingRuleUseRegistry copy = new DefaultMatchingRuleUseRegistry();
-        
+
         // Copy the base data
         copy.copy( this );
-        
+
         return copy;
     }
 }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultNameFormRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultNameFormRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultNameFormRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultNameFormRegistry.java Thu Feb  3 14:34:05 2011
@@ -37,20 +37,20 @@ public class DefaultNameFormRegistry ext
      */
     public DefaultNameFormRegistry()
     {
-        super( SchemaObjectType.NAME_FORM, new OidRegistry() );
+        super( SchemaObjectType.NAME_FORM, new OidRegistry<NameForm>() );
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
     public DefaultNameFormRegistry copy()
     {
         DefaultNameFormRegistry copy = new DefaultNameFormRegistry();
-        
+
         // Copy the base data
         copy.copy( this );
-        
+
         return copy;
     }
 }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultNormalizerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultNormalizerRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultNormalizerRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultNormalizerRegistry.java Thu Feb  3 14:34:05 2011
@@ -41,16 +41,17 @@ public class DefaultNormalizerRegistry e
 
     /** A speedup for debug */
     private static final boolean DEBUG = LOG.isDebugEnabled();
-    
+
+
     /**
      * Creates a new default NormalizerRegistry instance.
      */
     public DefaultNormalizerRegistry()
     {
-        super( SchemaObjectType.NORMALIZER, new OidRegistry() );
+        super( SchemaObjectType.NORMALIZER, new OidRegistry<Normalizer>() );
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -60,7 +61,7 @@ public class DefaultNormalizerRegistry e
         {
             return;
         }
-        
+
         // Loop on all the SchemaObjects stored and remove those associated
         // with the give schemaName
         for ( Normalizer normalizer : this )
@@ -69,7 +70,7 @@ public class DefaultNormalizerRegistry e
             {
                 String oid = normalizer.getOid();
                 SchemaObject removed = unregister( oid );
-                
+
                 if ( DEBUG )
                 {
                     LOG.debug( "Removed {} with oid {} from the registry", removed, oid );
@@ -77,32 +78,32 @@ public class DefaultNormalizerRegistry e
             }
         }
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
     public DefaultNormalizerRegistry copy()
     {
         DefaultNormalizerRegistry copy = new DefaultNormalizerRegistry();
-        
+
         // Copy the base data
         copy.copy( this );
-        
+
         return copy;
     }
-    
-    
+
+
     /**
      * @see Object#toString()
      */
     public String toString()
     {
         StringBuilder sb = new StringBuilder();
-        
+
         sb.append( schemaObjectType ).append( ": " );
         boolean isFirst = true;
-        
+
         for ( String name : byName.keySet() )
         {
             if ( isFirst )
@@ -113,15 +114,14 @@ public class DefaultNormalizerRegistry e
             {
                 sb.append( ", " );
             }
-            
+
             Normalizer normalizer = byName.get( name );
-            
+
             String fqcn = normalizer.getFqcn();
             int lastDotPos = fqcn.lastIndexOf( '.' );
-            
+
             sb.append( '<' ).append( normalizer.getOid() ).append( ", " );
-            
-            
+
             if ( lastDotPos > 0 )
             {
                 sb.append( fqcn.substring( lastDotPos + 1 ) );
@@ -130,10 +130,10 @@ public class DefaultNormalizerRegistry e
             {
                 sb.append( fqcn );
             }
-            
+
             sb.append( '>' );
         }
-        
+
         return sb.toString();
     }
 }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultObjectClassRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultObjectClassRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultObjectClassRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultObjectClassRegistry.java Thu Feb  3 14:34:05 2011
@@ -40,22 +40,23 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DefaultObjectClassRegistry extends DefaultSchemaObjectRegistry<ObjectClass> 
+public class DefaultObjectClassRegistry extends DefaultSchemaObjectRegistry<ObjectClass>
     implements ObjectClassRegistry
 {
     /** maps OIDs to a Set of descendants for that OID */
-    private Map<String,Set<ObjectClass>> oidToDescendants;
+    private Map<String, Set<ObjectClass>> oidToDescendants;
+
 
     /**
      * Creates a new default ObjectClassRegistry instance.
      */
     public DefaultObjectClassRegistry()
     {
-        super( SchemaObjectType.OBJECT_CLASS, new OidRegistry() );
-        oidToDescendants = new HashMap<String,Set<ObjectClass>>();
+        super( SchemaObjectType.OBJECT_CLASS, new OidRegistry<ObjectClass>() );
+        oidToDescendants = new HashMap<String, Set<ObjectClass>>();
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -65,15 +66,15 @@ public class DefaultObjectClassRegistry 
         {
             String oid = getOidByName( ancestorId );
             Set<ObjectClass> descendants = oidToDescendants.get( oid );
-            return (descendants != null) && !descendants.isEmpty();
+            return ( descendants != null ) && !descendants.isEmpty();
         }
         catch ( LdapException ne )
         {
             throw new LdapNoSuchAttributeException( ne.getMessage() );
         }
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -84,12 +85,12 @@ public class DefaultObjectClassRegistry 
         {
             String oid = getOidByName( ancestorId );
             Set<ObjectClass> descendants = oidToDescendants.get( oid );
-            
+
             if ( descendants == null )
             {
                 return Collections.EMPTY_SET.iterator();
             }
-            
+
             return descendants.iterator();
         }
         catch ( LdapException ne )
@@ -98,34 +99,34 @@ public class DefaultObjectClassRegistry 
         }
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
-    public void registerDescendants( ObjectClass objectClass, List<ObjectClass> ancestors ) 
+    public void registerDescendants( ObjectClass objectClass, List<ObjectClass> ancestors )
         throws LdapException
     {
         // add this attribute to descendant list of other attributes in superior chain
-        if ( ( ancestors == null ) || ( ancestors.size() == 0 ) ) 
+        if ( ( ancestors == null ) || ( ancestors.size() == 0 ) )
         {
             return;
         }
-        
+
         for ( ObjectClass ancestor : ancestors )
         {
             // Get the ancestor's descendant, if any
             Set<ObjectClass> descendants = oidToDescendants.get( ancestor.getOid() );
-    
+
             // Initialize the descendant Set to store the descendants for the attributeType
             if ( descendants == null )
             {
                 descendants = new HashSet<ObjectClass>( 1 );
                 oidToDescendants.put( ancestor.getOid(), descendants );
             }
-            
+
             // Add the current ObjectClass as a descendant
             descendants.add( objectClass );
-            
+
             try
             {
                 // And recurse until we reach the top of the hierarchy
@@ -137,35 +138,35 @@ public class DefaultObjectClassRegistry 
             }
         }
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
-    public void unregisterDescendants( ObjectClass attributeType, List<ObjectClass> ancestors ) 
+    public void unregisterDescendants( ObjectClass attributeType, List<ObjectClass> ancestors )
         throws LdapException
     {
         // add this attribute to descendant list of other attributes in superior chain
-        if ( ( ancestors == null ) || ( ancestors.size() == 0 ) ) 
+        if ( ( ancestors == null ) || ( ancestors.size() == 0 ) )
         {
             return;
         }
-        
+
         for ( ObjectClass ancestor : ancestors )
         {
             // Get the ancestor's descendant, if any
             Set<ObjectClass> descendants = oidToDescendants.get( ancestor.getOid() );
-    
+
             if ( descendants != null )
             {
                 descendants.remove( attributeType );
-                
+
                 if ( descendants.size() == 0 )
                 {
                     oidToDescendants.remove( ancestor.getOid() );
                 }
             }
-            
+
             try
             {
                 // And recurse until we reach the top of the hierarchy
@@ -177,8 +178,8 @@ public class DefaultObjectClassRegistry 
             }
         }
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -187,15 +188,15 @@ public class DefaultObjectClassRegistry 
         try
         {
             ObjectClass removed = super.unregister( numericOid );
-    
+
             // Deleting an ObjectClass which might be used as a superior means we have
             // to recursively update the descendant map. We also have to remove
             // the at.oid -> descendant relation
             oidToDescendants.remove( numericOid );
-            
+
             // Now recurse if needed
             unregisterDescendants( removed, removed.getSuperiors() );
-            
+
             return removed;
         }
         catch ( LdapException ne )
@@ -203,18 +204,18 @@ public class DefaultObjectClassRegistry 
             throw new LdapNoSuchAttributeException( ne.getMessage() );
         }
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
     public DefaultObjectClassRegistry copy()
     {
         DefaultObjectClassRegistry copy = new DefaultObjectClassRegistry();
-        
+
         // Copy the base data
         copy.copy( this );
-        
+
         return copy;
     }
 
@@ -229,21 +230,21 @@ public class DefaultObjectClassRegistry 
         {
             objectClass.clear();
         }
-        
+
         // First clear the shared elements
         super.clear();
-        
+
         // and clear the descendant
         for ( String oid : oidToDescendants.keySet() )
         {
             Set<ObjectClass> descendants = oidToDescendants.get( oid );
-            
+
             if ( descendants != null )
             {
                 descendants.clear();
             }
         }
-        
+
         oidToDescendants.clear();
     }
 }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java Thu Feb  3 14:34:05 2011
@@ -58,13 +58,13 @@ public abstract class DefaultSchemaObjec
     protected SchemaObjectType schemaObjectType;
 
     /** the global OID Registry */
-    protected OidRegistry oidRegistry;
+    protected OidRegistry<T> oidRegistry;
 
 
     /**
      * Creates a new DefaultSchemaObjectRegistry instance.
      */
-    protected DefaultSchemaObjectRegistry( SchemaObjectType schemaObjectType, OidRegistry oidRegistry )
+    protected DefaultSchemaObjectRegistry( SchemaObjectType schemaObjectType, OidRegistry<T> oidRegistry )
     {
         byName = new HashMap<String, T>();
         this.schemaObjectType = schemaObjectType;
@@ -387,7 +387,7 @@ public abstract class DefaultSchemaObjec
                 {
                     try
                     {
-                        copiedValue = ( T ) oidRegistry.getSchemaObject( value.getOid() );
+                        copiedValue = oidRegistry.getSchemaObject( value.getOid() );
                     }
                     catch ( LdapException ne )
                     {
@@ -396,7 +396,7 @@ public abstract class DefaultSchemaObjec
                 }
                 else
                 {
-                    copiedValue = ( T ) value.copy();
+                    copiedValue = (T) value.copy();
                 }
 
                 // Update the data structure. 
@@ -414,7 +414,7 @@ public abstract class DefaultSchemaObjec
     /**
      * {@inheritDoc}
      */
-    public SchemaObject get( String oid )
+    public T get( String oid )
     {
         try
         {

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSyntaxCheckerRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSyntaxCheckerRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSyntaxCheckerRegistry.java Thu Feb  3 14:34:05 2011
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DefaultSyntaxCheckerRegistry extends  DefaultSchemaObjectRegistry<SyntaxChecker>
+public class DefaultSyntaxCheckerRegistry extends DefaultSchemaObjectRegistry<SyntaxChecker>
     implements SyntaxCheckerRegistry
 {
     /** static class logger */
@@ -41,16 +41,17 @@ public class DefaultSyntaxCheckerRegistr
 
     /** A speedup for debug */
     private static final boolean DEBUG = LOG.isDebugEnabled();
-    
+
+
     /**
      * Creates a new default SyntaxCheckerRegistry instance.
      */
     public DefaultSyntaxCheckerRegistry()
     {
-        super( SchemaObjectType.SYNTAX_CHECKER, new OidRegistry() );
+        super( SchemaObjectType.SYNTAX_CHECKER, new OidRegistry<SyntaxChecker>() );
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -60,7 +61,7 @@ public class DefaultSyntaxCheckerRegistr
         {
             return;
         }
-        
+
         // Loop on all the SchemaObjects stored and remove those associated
         // with the give schemaName
         for ( SyntaxChecker syntaxChecker : this )
@@ -69,7 +70,7 @@ public class DefaultSyntaxCheckerRegistr
             {
                 String oid = syntaxChecker.getOid();
                 SchemaObject removed = unregister( oid );
-                
+
                 if ( DEBUG )
                 {
                     LOG.debug( "Removed {} with oid {} from the registry", removed, oid );
@@ -77,32 +78,32 @@ public class DefaultSyntaxCheckerRegistr
             }
         }
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
     public DefaultSyntaxCheckerRegistry copy()
     {
         DefaultSyntaxCheckerRegistry copy = new DefaultSyntaxCheckerRegistry();
-        
+
         // Copy the base data
         copy.copy( this );
-        
+
         return copy;
     }
 
-    
+
     /**
      * @see Object#toString()
      */
     public String toString()
     {
         StringBuilder sb = new StringBuilder();
-        
+
         sb.append( schemaObjectType ).append( ": " );
         boolean isFirst = true;
-        
+
         for ( String name : byName.keySet() )
         {
             if ( isFirst )
@@ -113,15 +114,14 @@ public class DefaultSyntaxCheckerRegistr
             {
                 sb.append( ", " );
             }
-            
+
             SyntaxChecker syntaxChecker = byName.get( name );
-            
+
             String fqcn = syntaxChecker.getFqcn();
             int lastDotPos = fqcn.lastIndexOf( '.' );
-            
+
             sb.append( '<' ).append( syntaxChecker.getOid() ).append( ", " );
-            
-            
+
             if ( lastDotPos > 0 )
             {
                 sb.append( fqcn.substring( lastDotPos + 1 ) );
@@ -130,10 +130,10 @@ public class DefaultSyntaxCheckerRegistr
             {
                 sb.append( fqcn );
             }
-            
+
             sb.append( '>' );
         }
-        
+
         return sb.toString();
     }
 }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java Thu Feb  3 14:34:05 2011
@@ -29,7 +29,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
 
@@ -274,7 +273,7 @@ public class ImmutableAttributeTypeRegis
     /**
      * {@inheritDoc}
      */
-    public SchemaObject get( String oid )
+    public AttributeType get( String oid )
     {
         return immutableAttributeTypeRegistry.get( oid );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableComparatorRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableComparatorRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableComparatorRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableComparatorRegistry.java Thu Feb  3 14:34:05 2011
@@ -22,13 +22,11 @@ package org.apache.directory.shared.ldap
 
 import java.util.Iterator;
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
-import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 
 
@@ -174,7 +172,7 @@ public class ImmutableComparatorRegistry
     /**
      * {@inheritDoc}
      */
-    public SchemaObject get( String oid )
+    public LdapComparator<?> get( String oid )
     {
         return immutableComparatorRegistry.get( oid );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITContentRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITContentRuleRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITContentRuleRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITContentRuleRegistry.java Thu Feb  3 14:34:05 2011
@@ -22,13 +22,11 @@ package org.apache.directory.shared.ldap
 
 import java.util.Iterator;
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.DITContentRule;
-import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 
 
@@ -174,7 +172,7 @@ public class ImmutableDITContentRuleRegi
     /**
      * {@inheritDoc}
      */
-    public SchemaObject get( String oid )
+    public DITContentRule get( String oid )
     {
         return immutableDITContentRuleRegistry.get( oid );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITStructureRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITStructureRuleRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITStructureRuleRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITStructureRuleRegistry.java Thu Feb  3 14:34:05 2011
@@ -22,13 +22,11 @@ package org.apache.directory.shared.ldap
 
 import java.util.Iterator;
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
-import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 
 
@@ -218,7 +216,7 @@ public class ImmutableDITStructureRuleRe
     /**
      * {@inheritDoc}
      */
-    public SchemaObject get( String oid )
+    public DITStructureRule get( String oid )
     {
         return immutableDITStructureRuleRegistry.get( oid );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableLdapSyntaxRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableLdapSyntaxRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableLdapSyntaxRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableLdapSyntaxRegistry.java Thu Feb  3 14:34:05 2011
@@ -22,13 +22,11 @@ package org.apache.directory.shared.ldap
 
 import java.util.Iterator;
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 
 
@@ -174,7 +172,7 @@ public class ImmutableLdapSyntaxRegistry
     /**
      * {@inheritDoc}
      */
-    public SchemaObject get( String oid )
+    public LdapSyntax get( String oid )
     {
         return immutableLdapSyntaxRegistry.get( oid );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java Thu Feb  3 14:34:05 2011
@@ -22,13 +22,11 @@ package org.apache.directory.shared.ldap
 
 import java.util.Iterator;
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 
 
@@ -174,7 +172,7 @@ public class ImmutableMatchingRuleRegist
     /**
      * {@inheritDoc}
      */
-    public SchemaObject get( String oid )
+    public MatchingRule get( String oid )
     {
         return immutableMatchingRuleRegistry.get( oid );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleUseRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleUseRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleUseRegistry.java Thu Feb  3 14:34:05 2011
@@ -22,13 +22,11 @@ package org.apache.directory.shared.ldap
 
 import java.util.Iterator;
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
-import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 
 
@@ -174,7 +172,7 @@ public class ImmutableMatchingRuleUseReg
     /**
      * {@inheritDoc}
      */
-    public SchemaObject get( String oid )
+    public MatchingRuleUse get( String oid )
     {
         return immutableMatchingRuleUseRegistry.get( oid );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableNameFormRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableNameFormRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableNameFormRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableNameFormRegistry.java Thu Feb  3 14:34:05 2011
@@ -22,13 +22,11 @@ package org.apache.directory.shared.ldap
 
 import java.util.Iterator;
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.NameForm;
-import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 
 
@@ -174,7 +172,7 @@ public class ImmutableNameFormRegistry i
     /**
      * {@inheritDoc}
      */
-    public SchemaObject get( String oid )
+    public NameForm get( String oid )
     {
         return immutableNameFormRegistry.get( oid );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableNormalizerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableNormalizerRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableNormalizerRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableNormalizerRegistry.java Thu Feb  3 14:34:05 2011
@@ -22,13 +22,11 @@ package org.apache.directory.shared.ldap
 
 import java.util.Iterator;
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
-import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 
 
@@ -174,7 +172,7 @@ public class ImmutableNormalizerRegistry
     /**
      * {@inheritDoc}
      */
-    public SchemaObject get( String oid )
+    public Normalizer get( String oid )
     {
         return immutableNormalizerRegistry.get( oid );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableObjectClassRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableObjectClassRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableObjectClassRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableObjectClassRegistry.java Thu Feb  3 14:34:05 2011
@@ -23,13 +23,11 @@ package org.apache.directory.shared.ldap
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
-import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 
 
@@ -211,7 +209,7 @@ public class ImmutableObjectClassRegistr
     /**
      * {@inheritDoc}
      */
-    public SchemaObject get( String oid )
+    public ObjectClass get( String oid )
     {
         return immutableObjectClassRegistry.get( oid );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableSyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableSyntaxCheckerRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableSyntaxCheckerRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableSyntaxCheckerRegistry.java Thu Feb  3 14:34:05 2011
@@ -22,12 +22,10 @@ package org.apache.directory.shared.ldap
 
 import java.util.Iterator;
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
 
@@ -174,7 +172,7 @@ public class ImmutableSyntaxCheckerRegis
     /**
      * {@inheritDoc}
      */
-    public SchemaObject get( String oid )
+    public SyntaxChecker get( String oid )
     {
         return immutableSyntaxCheckerRegistry.get( oid );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java Thu Feb  3 14:34:05 2011
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class OidRegistry implements Iterable<SchemaObject>
+public class OidRegistry<T extends SchemaObject> implements Iterable<T>
 {
     /** static class logger */
     private static final Logger LOG = LoggerFactory.getLogger( OidRegistry.class );
@@ -49,8 +49,8 @@ public class OidRegistry implements Iter
     /** Speedup for DEBUG mode */
     private static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
-    /** Maps OID to a SchemaObject */
-    private Map<String, SchemaObject> byOid = new HashMap<String, SchemaObject>();
+    /** Maps OID to a type of SchemaObject */
+    private Map<String, T> byOid = new HashMap<String, T>();
 
 
     /**
@@ -97,9 +97,9 @@ public class OidRegistry implements Iter
      * @return the associated SchemaObject
      * @throws LdapException if oid does not exist
      */
-    public SchemaObject getSchemaObject( String oid ) throws LdapException
+    public T getSchemaObject( String oid ) throws LdapException
     {
-        SchemaObject schemaObject = byOid.get( oid );
+        T schemaObject = byOid.get( oid );
 
         if ( schemaObject != null )
         {
@@ -164,7 +164,7 @@ public class OidRegistry implements Iter
      * 
      * @return all the SchemaObject registered
      */
-    public Iterator<SchemaObject> iterator()
+    public Iterator<T> iterator()
     {
         return byOid.values().iterator();
     }
@@ -175,7 +175,7 @@ public class OidRegistry implements Iter
      * 
      * @param schemaObject The SchemaObject the oid belongs to
      */
-    public void register( SchemaObject schemaObject ) throws LdapException
+    public void register( T schemaObject ) throws LdapException
     {
         if ( schemaObject == null )
         {
@@ -223,7 +223,7 @@ public class OidRegistry implements Iter
      *
      * @param schemaObject The SchemaObject to inject into the OidRegistry
      */
-    /* No qualifier */void put( SchemaObject schemaObject )
+    /* No qualifier */void put( T schemaObject )
     {
         byOid.put( schemaObject.getOid(), schemaObject );
     }
@@ -252,12 +252,12 @@ public class OidRegistry implements Iter
      * 
      * @return A new OidRegistry instance
      */
-    public OidRegistry copy()
+    public OidRegistry<T> copy()
     {
-        OidRegistry copy = new OidRegistry();
+        OidRegistry<T> copy = new OidRegistry<T>();
 
         // Clone the map
-        copy.byOid = new HashMap<String, SchemaObject>();
+        copy.byOid = new HashMap<String, T>();
 
         return copy;
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java Thu Feb  3 14:34:05 2011
@@ -101,7 +101,7 @@ public class Registries implements Schem
     protected NormalizerRegistry normalizerRegistry;
 
     /** The global OID registry */
-    protected OidRegistry globalOidRegistry;
+    protected OidRegistry<SchemaObject> globalOidRegistry;
 
     /** The SyntaxChecker registry */
     protected SyntaxCheckerRegistry syntaxCheckerRegistry;
@@ -147,7 +147,7 @@ public class Registries implements Schem
      */
     public Registries( SchemaManager schemaManager )
     {
-        this.globalOidRegistry = new OidRegistry();
+        globalOidRegistry = new OidRegistry<SchemaObject>();
         attributeTypeRegistry = new DefaultAttributeTypeRegistry();
         comparatorRegistry = new DefaultComparatorRegistry();
         ditContentRuleRegistry = new DefaultDITContentRuleRegistry();
@@ -253,7 +253,7 @@ public class Registries implements Schem
     /**
      * @return The global Oid registry
      */
-    public OidRegistry getGlobalOidRegistry()
+    public OidRegistry<SchemaObject> getGlobalOidRegistry()
     {
         return globalOidRegistry;
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaObjectRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaObjectRegistry.java?rev=1066817&r1=1066816&r2=1066817&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaObjectRegistry.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaObjectRegistry.java Thu Feb  3 14:34:05 2011
@@ -61,7 +61,7 @@ public interface SchemaObjectRegistry<T 
      * @param oid The SchemaObject's OID we are looking for
      * @return The SchemaObject, if any. Null otherwise
      */
-    SchemaObject get( String oid );
+    T get( String oid );
 
 
     /**



Mime
View raw message