directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r427197 - /directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java
Date Mon, 31 Jul 2006 18:43:19 GMT
Author: elecharny
Date: Mon Jul 31 11:43:18 2006
New Revision: 427197

URL: http://svn.apache.org/viewvc?rev=427197&view=rev
Log:
Merging changes form optimization branch of shared/ldap/src/main/java/org/apache/directory/shared/ldap/aci
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
.

Modified:
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java?rev=427197&r1=427196&r2=427197&view=diff
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java
(original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java
Mon Jul 31 11:43:18 2006
@@ -20,6 +20,7 @@
 
 import java.io.StringReader;
 import java.text.ParseException;
+import java.util.Map;
 
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
 
@@ -49,12 +50,12 @@
     /**
      * Creates a ACIItem parser.
      */
-    public ACIItemParser()
+    public ACIItemParser( Map oidsMap )
     {
         this.lexer = new ReusableAntlrACIItemLexer( new StringReader( "" ) );
         this.parser = new ReusableAntlrACIItemParser( lexer );
 
-        this.parser.init(); // this method MUST be called while we cannot do
+        this.parser.init( oidsMap ); // this method MUST be called while we cannot do
         // constructor overloading for antlr generated parser
         this.isNormalizing = false;
     }
@@ -63,13 +64,13 @@
     /**
      * Creates a normalizing ACIItem parser.
      */
-    public ACIItemParser(NameComponentNormalizer normalizer)
+    public ACIItemParser(NameComponentNormalizer normalizer, Map oidsMap )
     {
         this.lexer = new ReusableAntlrACIItemLexer( new StringReader( "" ) );
         this.parser = new ReusableAntlrACIItemParser( lexer );
 
         this.parser.setNormalizer( normalizer );
-        this.parser.init(); // this method MUST be called while we cannot do
+        this.parser.init( oidsMap ); // this method MUST be called while we cannot do
         // constructor overloading for antlr generated parser
         this.isNormalizing = true;
     }



Mime
View raw message