Author: pamarcelot
Date: Tue Feb 14 11:06:22 2012
New Revision: 1243875

URL: http://svn.apache.org/viewvc?rev=1243875&view=rev
Log:
Commented the following methods:
- addMatchingRuleUses
- addDitContentRules
- addNameForms
- addDitStructureRules

They are not implemented yet and throw exceptions when they're accessed which may make the loading of the schema fail in the case where some of these objects are exposed in the SubSchemaSubEntry.

Modified:
    directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1243875&r1=1243874&r2=1243875&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Tue Feb 14 11:06:22 2012
@@ -258,10 +258,10 @@ public class DefaultSchemaManager implem
             addMatchingRules( schema, registries );
             addAttributeTypes( schema, registries );
             addObjectClasses( schema, registries );
-            addMatchingRuleUses( schema, registries );
-            addDitContentRules( schema, registries );
-            addNameForms( schema, registries );
-            addDitStructureRules( schema, registries );
+            //addMatchingRuleUses( schema, registries );
+            //addDitContentRules( schema, registries );
+            //addNameForms( schema, registries );
+            //addDitStructureRules( schema, registries );
         }
         catch ( IOException ioe )
         {
@@ -814,29 +814,27 @@ public class DefaultSchemaManager implem
      * Add all the Schema's DitContentRules
      */
     // Not yet implemented, but may be used
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private void addDitContentRules( Schema schema, Registries registries ) throws LdapException, IOException
-    {
-        if ( !schemaLoader.loadDitContentRules( schema ).isEmpty() )
-        {
-            throw new NotImplementedException( I18n.err( I18n.ERR_11003 ) );
-        }
-    }
-
+    //    @SuppressWarnings("PMD.UnusedFormalParameter")
+    //    private void addDitContentRules( Schema schema, Registries registries ) throws LdapException, IOException
+    //    {
+    //        if ( !schemaLoader.loadDitContentRules( schema ).isEmpty() )
+    //        {
+    //            throw new NotImplementedException( I18n.err( I18n.ERR_11003 ) );
+    //        }
+    //    }
 
     /**
      * Add all the Schema's DitStructureRules
      */
     // Not yet implemented, but may be used
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private void addDitStructureRules( Schema schema, Registries registries ) throws LdapException, IOException
-    {
-        if ( !schemaLoader.loadDitStructureRules( schema ).isEmpty() )
-        {
-            throw new NotImplementedException( I18n.err( I18n.ERR_11004 ) );
-        }
-    }
-
+    //    @SuppressWarnings("PMD.UnusedFormalParameter")
+    //    private void addDitStructureRules( Schema schema, Registries registries ) throws LdapException, IOException
+    //    {
+    //        if ( !schemaLoader.loadDitStructureRules( schema ).isEmpty() )
+    //        {
+    //            throw new NotImplementedException( I18n.err( I18n.ERR_11004 ) );
+    //        }
+    //    }
 
     /**
      * Add all the Schema's MatchingRules
@@ -856,33 +854,31 @@ public class DefaultSchemaManager implem
      * Add all the Schema's MatchingRuleUses
      */
     // Not yet implemented, but may be used
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private void addMatchingRuleUses( Schema schema, Registries registries ) throws LdapException, IOException
-    {
-        if ( !schemaLoader.loadMatchingRuleUses( schema ).isEmpty() )
-        {
-            throw new NotImplementedException( I18n.err( I18n.ERR_11005 ) );
-        }
-        // for ( Entry entry : schemaLoader.loadMatchingRuleUses( schema ) )
-        // {
-        //     throw new NotImplementedException( I18n.err( I18n.ERR_11005 ) );
-        // }
-    }
-
+    //    @SuppressWarnings("PMD.UnusedFormalParameter")
+    //    private void addMatchingRuleUses( Schema schema, Registries registries ) throws LdapException, IOException
+    //    {
+    //        if ( !schemaLoader.loadMatchingRuleUses( schema ).isEmpty() )
+    //        {
+    //            throw new NotImplementedException( I18n.err( I18n.ERR_11005 ) );
+    //        }
+    //        // for ( Entry entry : schemaLoader.loadMatchingRuleUses( schema ) )
+    //        // {
+    //        //     throw new NotImplementedException( I18n.err( I18n.ERR_11005 ) );
+    //        // }
+    //    }
 
     /**
      * Add all the Schema's NameForms
      */
     // Not yet implemented, but may be used
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private void addNameForms( Schema schema, Registries registries ) throws LdapException, IOException
-    {
-        if ( !schemaLoader.loadNameForms( schema ).isEmpty() )
-        {
-            throw new NotImplementedException( I18n.err( I18n.ERR_11006 ) );
-        }
-    }
-
+    //    @SuppressWarnings("PMD.UnusedFormalParameter")
+    //    private void addNameForms( Schema schema, Registries registries ) throws LdapException, IOException
+    //    {
+    //        if ( !schemaLoader.loadNameForms( schema ).isEmpty() )
+    //        {
+    //            throw new NotImplementedException( I18n.err( I18n.ERR_11006 ) );
+    //        }
+    //    }
 
     /**
      * Add all the Schema's Normalizers