Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 33528 invoked from network); 9 Mar 2011 20:49:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Mar 2011 20:49:52 -0000 Received: (qmail 79120 invoked by uid 500); 9 Mar 2011 20:49:52 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 79078 invoked by uid 500); 9 Mar 2011 20:49:52 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 79070 invoked by uid 99); 9 Mar 2011 20:49:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2011 20:49:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2011 20:49:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 12B0B23888A2; Wed, 9 Mar 2011 20:49:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1079988 - /directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java Date: Wed, 09 Mar 2011 20:49:31 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110309204931.12B0B23888A2@eris.apache.org> Author: akarasulu Date: Wed Mar 9 20:49:30 2011 New Revision: 1079988 URL: http://svn.apache.org/viewvc?rev=1079988&view=rev Log: pushing some of the methods that need to be removed to the end of the file Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java?rev=1079988&r1=1079987&r2=1079988&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java Wed Mar 9 20:49:30 2011 @@ -79,14 +79,6 @@ public interface SchemaObject /** - * A special method used when renaming an SchemaObject: we may have to - * change it's OID - * @param oid The new OID - */ - void setOid( String oid ); - - - /** * Gets short names for this SchemaObject if any exists for it, otherwise, * returns an empty list. * @@ -106,46 +98,6 @@ public interface SchemaObject /** - * Inject this SchemaObject into the given registries, updating the references to - * other SchemaObject - * - * @param errors the errors we got - * @param registries the registries - * @throws LdapException if one of the referenced schema objects does not exist - */ - void addToRegistries( List errors, Registries registries ) throws LdapException; - - - /** - * Remove this SchemaObject from the given registries, updating the references to - * other SchemaObject. - * - * @param errors the errors we got - * @param registries The registries - * @throws org.apache.directory.shared.ldap.model.exception.LdapException if one of the referenced schema objects does not exist - */ - void removeFromRegistries( List errors, Registries registries ) throws LdapException; - - - /** - * Add a new name to the list of names for this SchemaObject. The name - * is lower cased and trimmed. - * - * @param names The names to add - */ - void addName( String... names ); - - - /** - * Sets the list of names for this SchemaObject. The names are - * lower cased and trimmed. - * - * @param names The list of names. Can be empty - */ - void setNames( List names ); - - - /** * Gets a short description about this SchemaObject. * * @return a short description about this SchemaObject @@ -154,14 +106,6 @@ public interface SchemaObject /** - * Sets the SchemaObject's description - * - * @param description The SchemaObject's description - */ - void setDescription( String description ); - - - /** * Gets the SchemaObject specification. * * @return the SchemaObject specification @@ -170,14 +114,6 @@ public interface SchemaObject /** - * Sets the SchemaObject's specification - * - * @param specification The SchemaObject's specification - */ - void setSpecification( String specification ); - - - /** * Tells if this SchemaObject is enabled. * * @return true if the SchemaObject is enabled, or if it depends on @@ -195,14 +131,6 @@ public interface SchemaObject /** - * Sets the SchemaObject state, either enabled or disabled. - * - * @param enabled The current SchemaObject state - */ - void setEnabled( boolean enabled ); - - - /** * Tells if this SchemaObject is ReadOnly. * * @return true if the SchemaObject is not modifiable @@ -211,14 +139,6 @@ public interface SchemaObject /** - * Sets the SchemaObject readOnly flag - * - * @param isReadOnly The current SchemaObject ReadOnly status - */ - void setReadOnly( boolean isReadOnly ); - - - /** * Gets whether or not this SchemaObject has been inactivated. All * SchemaObjects except Syntaxes allow for this parameter within their * definition. For Syntaxes this property should always return false in @@ -230,35 +150,30 @@ public interface SchemaObject /** - * Sets the Obsolete flag. - * - * @param obsolete The Obsolete flag state - */ - void setObsolete( boolean obsolete ); - - - /** * @return The SchemaObject extensions, as a Map of [extension, values] */ Map> getExtensions(); - + /** - * Add an extension with its values - * @param key The extension key - * @param values The associated values + * Gets the name of the schema this SchemaObject is associated with. + * + * @return the name of the schema associated with this schemaObject */ - void addExtension( String key, List values ); + String getSchemaName(); + + // -------------- STUFF THAT NEEDS TO GO ----------------- + /** - * Add an extensions with their values. (Actually do a copy) + * Sets the Obsolete flag. * - * @param extensions The extensions map + * @param obsolete The Obsolete flag state */ - void setExtensions( Map> extensions ); - + void setObsolete( boolean obsolete ); + /** * The SchemaObject type : *
  • AttributeType @@ -279,31 +194,121 @@ public interface SchemaObject /** - * Gets the name of the schema this SchemaObject is associated with. + * {@inheritDoc} + */ + int hashCode(); + + + /** + * {@inheritDoc} + */ + boolean equals( Object o1 ); + + + /** + * Copy the current SchemaObject on place * - * @return the name of the schema associated with this schemaObject + * @return The copied SchemaObject */ - String getSchemaName(); + SchemaObject copy(); /** - * Sets the name of the schema this SchemaObject is associated with. + * Copies the given schema object into this schema object. + * + * @param original the original SchemaObject + * @return this + */ + SchemaObject copy( SchemaObject original ); + + + /** + * Clear the current SchemaObject : remove all the references to other objects, + * and all the Maps. + */ + void clear(); + + + /** + * Sets the SchemaObject readOnly flag * - * @param schemaName the new schema name + * @param isReadOnly The current SchemaObject ReadOnly status */ - void setSchemaName( String schemaName ); + void setReadOnly( boolean isReadOnly ); /** - * {@inheritDoc} + * Sets the SchemaObject state, either enabled or disabled. + * + * @param enabled The current SchemaObject state */ - int hashCode(); + void setEnabled( boolean enabled ); /** - * {@inheritDoc} + * Sets the SchemaObject's description + * + * @param description The SchemaObject's description */ - boolean equals( Object o1 ); + void setDescription( String description ); + + + /** + * A special method used when renaming an SchemaObject: we may have to + * change it's OID + * @param oid The new OID + */ + void setOid( String oid ); + + + /** + * Add a new name to the list of names for this SchemaObject. The name + * is lower cased and trimmed. + * + * @param names The names to add + */ + void addName( String... names ); + + + /** + * Sets the list of names for this SchemaObject. The names are + * lower cased and trimmed. + * + * @param names The list of names. Can be empty + */ + void setNames( List names ); + + + /** + * Sets the SchemaObject's specification + * + * @param specification The SchemaObject's specification + */ + void setSpecification( String specification ); + + + /** + * Add an extension with its values + * @param key The extension key + * @param values The associated values + */ + void addExtension( String key, List values ); + + + /** + * Add an extensions with their values. (Actually do a copy) + * + * @param extensions The extensions map + */ + void setExtensions( Map> extensions ); + + + /** + * Sets the name of the schema this SchemaObject is associated with. + * + * @param schemaName the new schema name + */ + void setSchemaName( String schemaName ); /** @@ -317,29 +322,27 @@ public interface SchemaObject /** - * Copy the current SchemaObject on place + * Inject this SchemaObject into the given registries, updating the references to + * other SchemaObject * - * @return The copied SchemaObject + * @param errors the errors we got + * @param registries the registries + * @throws LdapException if one of the referenced schema objects does not exist */ - SchemaObject copy(); + void addToRegistries( List errors, Registries registries ) throws LdapException; /** - * Copies the given schema object into this schema object. + * Remove this SchemaObject from the given registries, updating the references to + * other SchemaObject. * - * @param original the original SchemaObject - * @return this - */ - SchemaObject copy( SchemaObject original ); - - - /** - * Clear the current SchemaObject : remove all the references to other objects, - * and all the Maps. + * @param errors the errors we got + * @param registries The registries + * @throws org.apache.directory.shared.ldap.model.exception.LdapException if one of the referenced schema objects does not exist */ - void clear(); - + void removeFromRegistries( List errors, Registries registries ) throws LdapException; + /** * Inject the Registries into the SchemaObject *