svn commit: r427196 - in /directory/trunks/shared/ldap/src/main/antlr: ACIItem.g DnCommonTokenTypes.txt dnparser.g subtree-specification.g typelexer.g valuelexer.g valueparser.g

[el...@apache.org]

Author: elecharny
Date: Mon Jul 31 11:42:27 2006
New Revision: 427196

URL: http://svn.apache.org/viewvc?rev=427196&view=rev
Log:
Merging changes form optimization branch of shared/ldap/src/main/antlr back into this 1.1 trunks
branch.  Here's the merge command used: svn merge -r 414084:427187 https://svn.apache.org/repos/asf/directory/branches/shared/optimization .

Removed:
    directory/trunks/shared/ldap/src/main/antlr/DnCommonTokenTypes.txt
    directory/trunks/shared/ldap/src/main/antlr/dnparser.g
    directory/trunks/shared/ldap/src/main/antlr/typelexer.g
    directory/trunks/shared/ldap/src/main/antlr/valuelexer.g
    directory/trunks/shared/ldap/src/main/antlr/valueparser.g
Modified:
    directory/trunks/shared/ldap/src/main/antlr/ACIItem.g
    directory/trunks/shared/ldap/src/main/antlr/subtree-specification.g

Modified: directory/trunks/shared/ldap/src/main/antlr/ACIItem.g
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/antlr/ACIItem.g?rev=427196&r1=427195&r2=427196&view=diff
==============================================================================
--- directory/trunks/shared/ldap/src/main/antlr/ACIItem.g (original)
+++ directory/trunks/shared/ldap/src/main/antlr/ACIItem.g Mon Jul 31 11:42:27 2006
@@ -120,6 +120,7 @@
     private int m_precedence;
     private Set m_grantsAndDenials;
     private Set m_userPermissions;
+    private Map oidsMap;
     
     private Set chopBeforeExclusions;
     private Set chopAfterExclusions;
@@ -138,8 +139,9 @@
      *
      * @return the DnParser to be used for parsing Names
      */
-    public void init()
+    public void init( Map oidsMap )
     {
+    	this.oidsMap = oidsMap;
     }
 
     /**
@@ -488,7 +490,7 @@
         // A Dn can be considered as a set of attributeTypeAndValues
         // So, parse the set as a Dn and extract each attributeTypeAndValue
         LdapDN attributeTypeAndValueSetAsDn = new LdapDN( token.getText() );
-        attributeTypeAndValueSetAsDn.normalize();
+        attributeTypeAndValueSetAsDn.normalize( oidsMap );
         Enumeration attributeTypeAndValueSet = attributeTypeAndValueSetAsDn.getAll();
         while ( attributeTypeAndValueSet.hasMoreElements() )
         {
@@ -1153,7 +1155,7 @@
     token:SAFEUTF8STRING
     {
         name = new LdapDN( token.getText() );
-        name.normalize();
+        name.normalize( oidsMap );
         log.debug( "recognized a DistinguishedName: " + token.getText() );
     }
     ;

Modified: directory/trunks/shared/ldap/src/main/antlr/subtree-specification.g
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/antlr/subtree-specification.g?rev=427196&r1=427195&r2=427196&view=diff
==============================================================================
--- directory/trunks/shared/ldap/src/main/antlr/subtree-specification.g (original)
+++ directory/trunks/shared/ldap/src/main/antlr/subtree-specification.g Mon Jul 31 11:42:27 2006
@@ -21,6 +21,7 @@
 package org.apache.directory.shared.ldap.subtree;
 
 import java.util.Set;
+import java.util.Map;
 import java.util.HashSet;
 import java.util.ArrayList;
 
@@ -80,25 +81,28 @@
 
     private SubtreeSpecificationModifier ssModifier = null;
     
+    private Map oidsMap;
+    
     private ComponentsMonitor subtreeSpecificationComponentsMonitor = null;
 
     /**
      * Does nothing.
      */
-    public void init()
+    public void init( Map oidsMap )
     {
+    	this.oidsMap = oidsMap;
     }
     
     
     public void setNormalizerMappingResolver( NormalizerMappingResolver resolver )
     {
-    	this.resolver = resolver;
+    	this.resolver = resolver;
     }
     
     
     public boolean isNormalizing()
     {
-    	return this.resolver != null;
+    	return this.resolver != null;
     }
     
 
@@ -306,7 +310,7 @@
         name = new LdapDN( token.getText() );
         if ( isNormalizing() )
         {
-        	name.normalize();
+        	name.normalize( oidsMap );
         }
         log.debug( "recognized a DistinguishedName: " + token.getText() );
     }