directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r807525 - in /directory/shared/branches/shared-schema/ldap/src/main: antlr/ java/org/apache/directory/shared/ldap/schema/
Date Tue, 25 Aug 2009 08:52:55 GMT
Author: elecharny
Date: Tue Aug 25 08:52:55 2009
New Revision: 807525

URL: http://svn.apache.org/viewvc?rev=807525&view=rev
Log:
Fixed NF, MR and MRU to avoid using the Registries if not mandate to

Modified:
    directory/shared/branches/shared-schema/ldap/src/main/antlr/schema.g
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRule.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRuleUse.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java

Modified: directory/shared/branches/shared-schema/ldap/src/main/antlr/schema.g
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/antlr/schema.g?rev=807525&r1=807524&r2=807525&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/antlr/schema.g (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/antlr/schema.g Tue Aug 25 08:52:55
2009
@@ -28,10 +28,10 @@
 
 import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
 import org.apache.directory.shared.ldap.schema.parsers.DITContentRuleDescription;
-import org.apache.directory.shared.ldap.schema.parsers.DITStructureRuleDescription;
+import org.apache.directory.shared.ldap.schema.DITStructureRule;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescription;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescription;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.schema.NameForm;
 import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
 import org.apache.directory.shared.ldap.schema.parsers.ParserMonitor;
@@ -514,26 +514,26 @@
      *    extensions WSP RPAREN      ; extensions
      * </pre>
     */
-matchingRuleDescription returns [MatchingRuleDescription mrd]
+matchingRuleDescription returns [MatchingRule matchingRule]
     {
         matchedProduction( "matchingRuleDescription()" );
         ElementTracker et = new ElementTracker();
     }
     :
-    ( oid:STARTNUMERICOID { mrd = new MatchingRuleDescription(numericoid(oid.getText()));
} )
+    ( oid:STARTNUMERICOID { matchingRule = new MatchingRule(numericoid(oid.getText())); }
)
     (
-        ( name:NAME { et.track("NAME", name); mrd.setNames(qdescrs(name.getText())); } )
+        ( name:NAME { et.track("NAME", name); matchingRule.setNames(qdescrs(name.getText()));
} )
         |
-        ( desc:DESC { et.track("DESC", desc); mrd.setDescription(qdstring(desc.getText()));
} )
+        ( desc:DESC { et.track("DESC", desc); matchingRule.setDescription(qdstring(desc.getText()));
} )
         |
-        ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); mrd.setObsolete( true ); }
)
+        ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); matchingRule.setObsolete( true
); } )
         |
-        ( syntax:SYNTAX { et.track("SYNTAX", syntax); mrd.setSyntax(numericoid(syntax.getText()));
} )
+        ( syntax:SYNTAX { et.track("SYNTAX", syntax); matchingRule.setSyntaxOid(numericoid(syntax.getText()));
} )
         |
         ( extension:EXTENSION { 
             Extension ex = extension(extension.getText());
             et.track(ex.key, extension); 
-            mrd.addExtension(ex.key, ex.values); 
+            matchingRule.addExtension(ex.key, ex.values); 
          } )
     )*
     RPAR
@@ -563,26 +563,26 @@
      *    extensions WSP RPAREN      ; extensions
      * </pre>
     */
-matchingRuleUseDescription returns [MatchingRuleUseDescription mrud]
+matchingRuleUseDescription returns [MatchingRuleUse matchingRuleUse]
     {
         matchedProduction( "matchingRuleUseDescription()" );
         ElementTracker et = new ElementTracker();
     }
     :
-    ( oid:STARTNUMERICOID { mrud = new MatchingRuleUseDescription(numericoid(oid.getText()));
} )
+    ( oid:STARTNUMERICOID { matchingRuleUse = new MatchingRuleUse(numericoid(oid.getText()));
} )
     (
-        ( name:NAME { et.track("NAME", name); mrud.setNames(qdescrs(name.getText())); } )
+        ( name:NAME { et.track("NAME", name); matchingRuleUse.setNames(qdescrs(name.getText()));
} )
         |
-        ( desc:DESC { et.track("DESC", desc); mrud.setDescription(qdstring(desc.getText()));
} )
+        ( desc:DESC { et.track("DESC", desc); matchingRuleUse.setDescription(qdstring(desc.getText()));
} )
         |
-        ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); mrud.setObsolete( true ); }
)
+        ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); matchingRuleUse.setObsolete(
true ); } )
         |
-        ( applies:APPLIES { et.track("APPLIES", applies); mrud.setApplicableAttributes(oids(applies.getText()));
} )
+        ( applies:APPLIES { et.track("APPLIES", applies); matchingRuleUse.setApplicableAttributes(oids(applies.getText()));
} )
         |
         ( extension:EXTENSION { 
             Extension ex = extension(extension.getText());
             et.track(ex.key, extension); 
-            mrud.addExtension(ex.key, ex.values); 
+            matchingRuleUse.addExtension(ex.key, ex.values); 
          } )
     )*
     RPAR
@@ -666,28 +666,28 @@
      * ruleid = number
      * </pre>
     */
-ditStructureRuleDescription returns [DITStructureRuleDescription dsrd]
+ditStructureRuleDescription returns [DITStructureRule ditStructureRule]
     {
         matchedProduction( "ditStructureRuleDescription()" );
         ElementTracker et = new ElementTracker();
     }
     :
-    ( ruleid:STARTNUMERICOID { dsrd = new DITStructureRuleDescription(ruleid(ruleid.getText()));
} )
+    ( ruleid:STARTNUMERICOID { ditStructureRule = new DITStructureRule(ruleid(ruleid.getText()));
} )
     (
-        ( name:NAME { et.track("NAME", name); dsrd.setNames(qdescrs(name.getText())); } )
+        ( name:NAME { et.track("NAME", name); ditStructureRule.setNames(qdescrs(name.getText()));
} )
         |
-        ( desc:DESC { et.track("DESC", desc); dsrd.setDescription(qdstring(desc.getText()));
} )
+        ( desc:DESC { et.track("DESC", desc); ditStructureRule.setDescription(qdstring(desc.getText()));
} )
         |
-        ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); dsrd.setObsolete( true ); }
)
+        ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); ditStructureRule.setObsolete(
true ); } )
         |
-        ( form:FORM { et.track("FORM", form); dsrd.setForm(oid(form.getText())); } )
+        ( form:FORM { et.track("FORM", form); ditStructureRule.setForm(oid(form.getText()));
} )
         |
-        ( sup:SUP { et.track("SUP", sup); dsrd.setSuperRules(ruleids(sup.getText())); } )
+        ( sup:SUP { et.track("SUP", sup); ditStructureRule.setSuperRules(ruleids(sup.getText()));
} )
         |
         ( extension:EXTENSION { 
             Extension ex = extension(extension.getText());
             et.track(ex.key, extension); 
-            dsrd.addExtension(ex.key, ex.values); 
+            ditStructureRule.addExtension(ex.key, ex.values); 
          } )
     )*
     RPAR
@@ -719,13 +719,13 @@
      *    extensions WSP RPAREN      ; extensions
      * </pre>
     */
-nameFormDescription [Registries registries] returns [NameForm nameForm]
+nameFormDescription returns [NameForm nameForm]
     {
         matchedProduction( "nameFormDescription()" );
         ElementTracker et = new ElementTracker();
     }
     :
-    ( oid:STARTNUMERICOID { nameForm = new NameForm(numericoid(oid.getText()), registries);
} )
+    ( oid:STARTNUMERICOID { nameForm = new NameForm(numericoid(oid.getText())); } )
     (
         ( name:NAME { et.track("NAME", name); nameForm.setNames(qdescrs(name.getText()));
} )
         |
@@ -735,9 +735,9 @@
         |
         ( oc:OC { et.track("OC", oc); nameForm.setStructuralObjectClass(oid(oc.getText()));
} )
         |
-        ( must:MUST { et.track("MUST", must); nameForm.setMustAttributeTypes(oids(must.getText()));
} )
+        ( must:MUST { et.track("MUST", must); nameForm.setMustAttributeTypeOids(oids(must.getText()));
} )
         |
-        ( may:MAY { et.track("MAY", may); nameForm.setMayAttributeTypes(oids(may.getText()));
} )
+        ( may:MAY { et.track("MAY", may); nameForm.setMayAttributeTypeOids(oids(may.getText()));
} )
         |
         ( extension:EXTENSION { 
             Extension ex = extension(extension.getText());

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRule.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRule.java?rev=807525&r1=807524&r2=807525&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRule.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRule.java
Tue Aug 25 08:52:55 2009
@@ -81,15 +81,6 @@
     /** The serialVersionUID */
     private static final long serialVersionUID = 1L;
 
-    /** The associated LdapSyntax registry */
-    //private final LdapSyntaxRegistry ldapSyntaxRegistry;
-    
-    /** The associated Comparator registry */
-    //private final ComparatorRegistry comparatorRegistry;
-
-    /** The associated Normalizer registry */
-    //private final NormalizerRegistry normalizerRegistry;
-    
     /** The associated Comparator */
     private LdapComparator<? super Object> ldapComparator;
 
@@ -99,21 +90,30 @@
     /** The associated LdapSyntax */
     private LdapSyntax ldapSyntax;
     
+    /** The associated LdapSyntax OID */
+    private String ldapSyntaxOid;
+    
     /**
      * Creates a new instance of MatchingRule.
      *
      * @param oid The MatchingRule OID
      * @param registries The Registries reference
      */
-    protected MatchingRule( String oid, Registries registries )
+    public MatchingRule( String oid )
     {
         super( SchemaObjectType.MATCHING_RULE, oid );
-        
-        //ldapSyntaxRegistry = registries.getLdapSyntaxRegistry();
-        //normalizerRegistry = registries.getNormalizerRegistry();
-        //comparatorRegistry = registries.getComparatorRegistry();
+    }
 
-        try
+
+    /**
+     * Inject the registries into this Object, updating the references to
+     * other SchemaObject
+     *
+     * @param registries The Registries
+     */
+    public void setRegistries( Registries registries ) throws NamingException
+    {
+        if ( registries != null )
         {
             // Gets the associated C 
             ldapComparator = (LdapComparator<? super Object>)registries.getComparatorRegistry().lookup(
oid );
@@ -124,24 +124,45 @@
             // Gets the associated SC 
             ldapSyntax = registries.getLdapSyntaxRegistry().lookup( oid );
         }
-        catch ( NamingException ne )
-        {
-            // What can we do here ???
-        }
     }
-
-
+    
+    
     /**
      * Gets the LdapSyntax used by this MatchingRule.
      * 
      * @return the LdapSyntax of this MatchingRule
      * @throws NamingException if there is a failure resolving the object
      */
-    LdapSyntax getLdapSyntax() throws NamingException
+    public LdapSyntax getSyntax() throws NamingException
     {
         return ldapSyntax;
     }
 
+    
+    /**
+     * Gets the LdapSyntax OID used by this MatchingRule.
+     * 
+     * @return the LdapSyntax of this MatchingRule
+     * @throws NamingException if there is a failure resolving the object
+     */
+    public String getSyntaxOid() throws NamingException
+    {
+        return ldapSyntaxOid;
+    }
+
+    
+    /**
+     * Sets the Syntax's OID
+     *
+     * @param oid The Syntax's OID
+     */
+    public void setSyntaxOid( String oid )
+    {
+        if ( !isReadOnly )
+        {
+            this.ldapSyntaxOid = oid;
+        }
+    }
 
     /**
      * Gets the LdapComparator enabling the use of this MatchingRule for ORDERING

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRuleUse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRuleUse.java?rev=807525&r1=807524&r2=807525&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRuleUse.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRuleUse.java
Tue Aug 25 08:52:55 2009
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.schema;
 
 
-import javax.naming.NamingException;
+import java.util.List;
 
 
 /**
@@ -79,25 +79,43 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface MatchingRuleUse extends SchemaObject
+public class MatchingRuleUse extends SchemaObject
 {
+    /** The serialVersionUID */
+    private static final long serialVersionUID = 1L;
+
+    /** The list of attributes types the matching rule applies to */
+    private List<String> applicableAttributes;
+
+    /**
+     * Creates a new instance of MatchingRuleUseDescription
+     */
+    public MatchingRuleUse( String oid )
+    {
+        super(  SchemaObjectType.MATCHING_RULE_USE, oid );
+    }
+    
+
     /**
-     * Gets the matchingRule this MatchingRuleUse definition applies to.
-     * 
-     * @return the matchingRule
-     * @throws NamingException
-     *             if there is a failure resolving the object
+     * @return The matchingRule's list of Attribute types the MRU applies to
      */
-    public MatchingRule getMatchingRule() throws NamingException;
+    public List<String> getApplicableAttributes()
+    {
+        return applicableAttributes;
+    }
 
 
     /**
-     * Gets the the attributes which can be used with the matching rule in an
-     * extensible match assertion.
-     * 
-     * @return the applicable attributes
-     * @throws NamingException
-     *             if there is a failure resolving the object
+     * Set the matchingRule's Attribute types the MRU applies to. description
+     *
+     * @param applicableAttributes The Attribute types list
      */
-    public AttributeType[] getApplicableAttributes() throws NamingException;
+    public void setApplicableAttributes( List<String> applicableAttributes )
+    {
+        if ( !isReadOnly )
+        {
+            this.applicableAttributes = applicableAttributes;
+        }
+    }
+    
 }

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java?rev=807525&r1=807524&r2=807525&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java
Tue Aug 25 08:52:55 2009
@@ -101,14 +101,23 @@
     /** The serialVersionUID */
     private static final long serialVersionUID = 1L;
 
+    /** The structural object class OID this rule applies to */
+    private String structuralObjectClassOid;
+    
     /** The structural object class this rule applies to */
-    private String structuralObjectClass;
+    private ObjectClass structuralObjectClass;
     
-    /** The set of required attributes for this name form */
-    private List<String> mustAttributeTypes;
+    /** The set of required attribute OIDs for this name form */
+    private List<String> mustAttributeTypeOids;
+
+    /** The set of required AttributeTypes for this name form */
+    private List<AttributeType> mustAttributeTypes;
 
-    /** The set of allowed attributes for this name form */
-    private List<String> mayAttributeTypes;
+    /** The set of allowed attribute OIDs for this name form */
+    private List<String> mayAttributeTypeOids;
+    
+    /** The set of allowed AttributeTypes for this name form */
+    private List<AttributeType> mayAttributeTypes;
     
     /** The associated AttributeType registry */
     private AttributeTypeRegistry atRegistry;
@@ -123,17 +132,48 @@
      * @param oid The MatchingRule OID
      * @param registries The Registries reference
      */
-    public NameForm( String oid, Registries registries )
+    public NameForm( String oid )
     {
         super( SchemaObjectType.NAME_FORM, oid );
         
-        mustAttributeTypes = new ArrayList<String>();
-        mayAttributeTypes = new ArrayList<String>();
-        
+        mustAttributeTypeOids = new ArrayList<String>();
+        mayAttributeTypeOids = new ArrayList<String>();
+    }
+    
+    
+    /**
+     * Inject the registries into this Object, updating the references to
+     * other SchemaObject
+     *
+     * @param registries The Registries
+     */
+    public void setRegistries( Registries registries ) throws NamingException
+    {
         if ( registries != null )
         {
             atRegistry = registries.getAttributeTypeRegistry();
             ocRegistry = registries.getObjectClassRegistry();
+            structuralObjectClass = ocRegistry.lookup( structuralObjectClassOid );
+            
+            if ( mayAttributeTypeOids != null )
+            {
+                mayAttributeTypes = new ArrayList<AttributeType>( mayAttributeTypeOids.size()
);
+                
+                for ( String oid : mayAttributeTypeOids )
+                {
+                    mayAttributeTypes.add( atRegistry.lookup( oid ) );
+                }
+            }
+
+            if ( mustAttributeTypeOids != null )
+            {
+                mustAttributeTypes = new ArrayList<AttributeType>( mustAttributeTypeOids.size()
);
+                
+                for ( String oid : mustAttributeTypeOids )
+                {
+                    mustAttributeTypes.add( atRegistry.lookup( oid ) );
+                }
+            }
         }
     }
 
@@ -145,7 +185,20 @@
      * @return the ObjectClass's oid this NameForm is for
      * @throws NamingException If the structuralObjectClass is invalid
      */
-    public String getStructuralObjectClass() throws NamingException
+    public String getStructuralObjectClassOid() throws NamingException
+    {
+        return structuralObjectClassOid;
+    }
+
+
+    /**
+     * Gets the STRUCTURAL ObjectClass this name form specifies naming
+     * attributes for.
+     * 
+     * @return the ObjectClass this NameForm is for
+     * @throws NamingException If the structuralObjectClass is invalid
+     */
+    public ObjectClass getStructuralObjectClass() throws NamingException
     {
         return structuralObjectClass;
     }
@@ -156,16 +209,30 @@
      * 
      * @param structuralObjectClass the structural object class to set
      */
-    public void setStructuralObjectClass( String structuralObjectClass )
+    public void setStructuralObjectClass( String structuralObjectClassOid )
     {
         if ( !isReadOnly )
         {
-            this.structuralObjectClass = structuralObjectClass;
+            this.structuralObjectClassOid = structuralObjectClassOid;
         }
     }
 
 
     /**
+     * Gets all the AttributeTypes OIDs of the attributes this NameForm specifies as
+     * having to be used in the given objectClass for naming: as part of the
+     * Rdn.
+     * 
+     * @return the AttributeTypes OIDs of the must use attributes
+     * @throws NamingException if there is a failure resolving one AttributeTyoe
+     */
+    public List<String> getMustAttributeTypeOids() throws NamingException
+    {
+        return Collections.unmodifiableList( mustAttributeTypeOids );
+    }
+
+
+    /**
      * Gets all the AttributeTypes of the attributes this NameForm specifies as
      * having to be used in the given objectClass for naming: as part of the
      * Rdn.
@@ -173,57 +240,55 @@
      * @return the AttributeTypes of the must use attributes
      * @throws NamingException if there is a failure resolving one AttributeTyoe
      */
-    public List<String> getMustAttributeTypes() throws NamingException
+    public List<AttributeType> getMustAttributeTypes() throws NamingException
     {
         return Collections.unmodifiableList( mustAttributeTypes );
-        
-        /*
-        if ( mustAttributeTypes != null )
-        {
-            List<AttributeType> must = new ArrayList<AttributeType>();
-            
-            for ( String oid : mustAttributeTypes )
-            {
-                must.add( atRegistry.lookup( oid ) );
-            }
-            
-            return must;
-        }
-        
-        return null;
-        */
     }
 
 
     /**
-     * Sets the list of required AttributeTypes
+     * Sets the list of required AttributeTypes OIDs
      *
-     * @param mustAttributeTypes the list of required AttributeTypes
+     * @param mustAttributeTypeOids the list of required AttributeTypes OIDs
      */
-    public void setMustAttributeTypes( List<String> mustAttributeTypes )
+    public void setMustAttributeTypeOids( List<String> mustAttributeTypeOids )
     {
         if ( !isReadOnly )
         {
-            this.mustAttributeTypes = mustAttributeTypes;
+            this.mustAttributeTypeOids = mustAttributeTypeOids;
         }
     }
 
 
     /**
-     * Add a required AttribyuteType
+     * Add a required AttributeType OID
      *
-     * @param oid The attributeType oid
+     * @param oid The attributeType OID
      */
-    public void addMustAttributeType( String oid )
+    public void addMustAttributeTypeOids( String oid )
     {
         if ( !isReadOnly )
         {
-            mustAttributeTypes.add( oid );
+            mustAttributeTypeOids.add( oid );
         }
     }
 
     
     /**
+     * Gets all the AttributeTypes OIDs of the attribute this NameForm specifies as
+     * being usable without requirement in the given objectClass for naming: as
+     * part of the Rdn.
+     * 
+     * @return the AttributeTypes OIDs of the may use attributes
+     * @throws NamingException if there is a failure resolving one AttributeTyoe
+     */
+    public List<String> getMayAttributeTypeOids() throws NamingException
+    {
+        return Collections.unmodifiableList( mayAttributeTypeOids );
+    }
+
+    
+    /**
      * Gets all the AttributeTypes of the attribute this NameForm specifies as
      * being useable without requirement in the given objectClass for naming: as
      * part of the Rdn.
@@ -231,38 +296,22 @@
      * @return the AttributeTypes of the may use attributes
      * @throws NamingException if there is a failure resolving one AttributeTyoe
      */
-    public List<String> getMayAttributeTypes() throws NamingException
+    public List<AttributeType> getMayAttributeTypes() throws NamingException
     {
         return Collections.unmodifiableList( mayAttributeTypes );
-        
-        /*
-        if ( mayAttributeTypes != null )
-        {
-            List<AttributeType> may = new ArrayList<AttributeType>();
-            
-            for ( String oid : mayAttributeTypes )
-            {
-                may.add( atRegistry.lookup( oid ) );
-            }
-            
-            return may;
-        }
-        
-        return null;
-        */
     }
     
     
     /**
      * Sets the list of allowed AttributeTypes
      *
-     * @param mustAttributeTypes the list of allowed AttributeTypes
+     * @param mayAttributeTypeOids the list of allowed AttributeTypes
      */
-    public void setMayAttributeTypes( List<String> mayAttributeTypes )
+    public void setMayAttributeTypeOids( List<String> mayAttributeTypeOids )
     {
         if ( !isReadOnly )
         {
-            this.mayAttributeTypes = mayAttributeTypes;
+            this.mayAttributeTypeOids = mayAttributeTypeOids;
         }
     }
     
@@ -272,11 +321,11 @@
      *
      * @param oid The attributeType oid
      */
-    public void addMayAttributeType( String oid )
+    public void addMayAttributeTypeOids( String oid )
     {
         if ( !isReadOnly )
         {
-            mayAttributeTypes.add( oid );
+            mayAttributeTypeOids.add( oid );
         }
     }
 }



Mime
View raw message