directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1409110 - in /directory/shared/trunk/ldap: model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
Date Wed, 14 Nov 2012 08:10:00 GMT
Author: elecharny
Date: Wed Nov 14 08:10:00 2012
New Revision: 1409110

URL: http://svn.apache.org/viewvc?rev=1409110&view=rev
Log:
Removed the SchemaManager from Registries : it's not used anywhere

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

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java?rev=1409110&r1=1409109&r2=1409110&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java
Wed Nov 14 08:10:00 2012
@@ -143,19 +143,11 @@ public class Registries implements Schem
      */
     protected Map<SchemaObjectWrapper, Set<SchemaObjectWrapper>> using;
 
-    /** A reference on the schema Manager */
-    @SuppressWarnings(
-        { "PMD.UnusedPrivateField", "unused" })
-    // False positive
-    private SchemaManager schemaManager;
-
 
     /**
      * Creates a new instance of Registries.
-     *
-     * @param schemaManager the schema manager
      */
-    public Registries( SchemaManager schemaManager )
+    public Registries()
     {
         globalOidRegistry = new OidRegistry<SchemaObject>();
         attributeTypeRegistry = new DefaultAttributeTypeRegistry();
@@ -175,7 +167,6 @@ public class Registries implements Schem
 
         isRelaxed = STRICT;
         disabledAccepted = false;
-        this.schemaManager = schemaManager;
     }
 
 

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=1409110&r1=1409109&r2=1409110&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
Wed Nov 14 08:10:00 2012
@@ -140,7 +140,7 @@ public class DefaultSchemaManager implem
         namingContext = Dn.ROOT_DSE;
         this.schemaLoader = new JarLdifSchemaLoader();
         errors = new ArrayList<Throwable>();
-        registries = new Registries( this );
+        registries = new Registries();
         factory = new SchemaEntityFactory();
         isRelaxed = STRICT;
         loadAllEnabled();
@@ -158,7 +158,7 @@ public class DefaultSchemaManager implem
         namingContext = Dn.ROOT_DSE;
         this.schemaLoader = loader;
         errors = new ArrayList<Throwable>();
-        registries = new Registries( this );
+        registries = new Registries();
         factory = new SchemaEntityFactory();
         isRelaxed = STRICT;
     }
@@ -176,7 +176,7 @@ public class DefaultSchemaManager implem
         this.namingContext = namingContext;
         this.schemaLoader = loader;
         errors = new ArrayList<Throwable>();
-        registries = new Registries( this );
+        registries = new Registries();
         factory = new SchemaEntityFactory();
         isRelaxed = STRICT;
     }



Mime
View raw message