directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1295567 - in /directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema: AbstractSchemaObject.java LoadableSchemaObject.java SchemaObject.java
Date Thu, 01 Mar 2012 14:04:02 GMT
Author: elecharny
Date: Thu Mar  1 14:04:02 2012
New Revision: 1295567

URL: http://svn.apache.org/viewvc?rev=1295567&view=rev
Log:
Removed the useless registerOid() method from SchemaObject

Modified:
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSchemaObject.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSchemaObject.java?rev=1295567&r1=1295566&r2=1295567&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSchemaObject.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSchemaObject.java
Thu Mar  1 14:04:02 2012
@@ -30,7 +30,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.registries.Registries;
 import org.apache.directory.shared.util.Strings;
 
@@ -798,20 +797,6 @@ public abstract class AbstractSchemaObje
 
 
     /**
-     * Register the given SchemaObject into the given registries' globalOidRegistry
-     *
-     * @param schemaObject the SchemaObject we want to register
-     * @param registries The registries in which we want it to be stored
-     * @throws LdapException If the OID is invalid
-     */
-    public void registerOid( SchemaObject schemaObject, Registries registries ) throws LdapException
-    {
-        // Add the SchemaObject into the globalOidRegistry
-        registries.getGlobalOidRegistry().register( schemaObject );
-    }
-
-
-    /**
      * Copy the current SchemaObject on place
      *
      * @return The copied SchemaObject

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java?rev=1295567&r1=1295566&r2=1295567&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java
Thu Mar  1 14:04:02 2012
@@ -6,23 +6,21 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.shared.ldap.model.schema;
 
 
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.schema.registries.Registries;
 import org.apache.directory.shared.util.Strings;
 
 
@@ -135,15 +133,6 @@ public abstract class LoadableSchemaObje
     /**
      * {@inheritDoc}
      */
-    public void registerOid( SchemaObject schemaObject, Registries registries ) throws LdapException
-    {
-        // Do nothing : the current SchemaObject ha sthe same OID than the one it is realted
to
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public LoadableSchemaObject copy()
     {
         return null;

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=1295567&r1=1295566&r2=1295567&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
Thu Mar  1 14:04:02 2012
@@ -23,7 +23,6 @@ package org.apache.directory.shared.ldap
 import java.util.List;
 import java.util.Map;
 
-import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.registries.Registries;
 
 
@@ -293,16 +292,6 @@ public interface SchemaObject
 
 
     /**
-     * Register the given SchemaObject into the given registries' globalOidRegistry
-     *
-     * @param schemaObject the SchemaObject we want to register
-     * @param registries The registries in which we want it to be stored
-     * @throws LdapException If the OID is invalid
-     */
-    void registerOid( SchemaObject schemaObject, Registries registries ) throws LdapException;
-
-
-    /**
      * Copy the current SchemaObject on place
      *
      * @return The copied SchemaObject



Mime
View raw message