Author: akarasulu
Date: Sun Oct 10 01:09:23 2004
New Revision: 54227
Modified:
incubator/directory/eve/trunk/backend/tools/src/antlr/openldap.g
incubator/directory/eve/trunk/backend/tools/src/java/org/apache/eve/tools/schema/OpenLdapSchemaParser.java
Log:
renamed reset to clear and added changes to grammar
Modified: incubator/directory/eve/trunk/backend/tools/src/antlr/openldap.g
==============================================================================
--- incubator/directory/eve/trunk/backend/tools/src/antlr/openldap.g
(original)
+++ incubator/directory/eve/trunk/backend/tools/src/antlr/openldap.g Sun Oct
10 01:09:23 2004
@@ -124,6 +124,13 @@
// ------------------------------------------------------------------------
+ public void clear()
+ {
+ attributeTypes.clear();
+ objectClasses.clear();
+ }
+
+
public Map getAttributeTypes()
{
return Collections.unmodifiableMap( attributeTypes );
Modified:
incubator/directory/eve/trunk/backend/tools/src/java/org/apache/eve/tools/schema/OpenLdapSchemaParser.java
==============================================================================
---
incubator/directory/eve/trunk/backend/tools/src/java/org/apache/eve/tools/schema/OpenLdapSchemaParser.java
(original)
+++
incubator/directory/eve/trunk/backend/tools/src/java/org/apache/eve/tools/schema/OpenLdapSchemaParser.java
Sun Oct 10 01:09:23 2004
@@ -18,13 +18,12 @@
import org.apache.ldap.common.util.ExceptionUtils;
-import org.apache.ldap.common.NotImplementedException;
-import java.io.PipedOutputStream;
+import java.util.Map;
import java.io.IOException;
import java.io.PipedInputStream;
import java.text.ParseException;
-import java.util.Map;
+import java.io.PipedOutputStream;
import antlr.RecognitionException;
import antlr.TokenStreamException;
@@ -71,9 +70,9 @@
}
- public void reset()
+ public synchronized void clear()
{
- throw new NotImplementedException( "impl to clear all parsed objects"
);
+ parser.clear();
}
@@ -92,8 +91,7 @@
/**
* Thread safe method parses an OpenLDAP schema file.
*/
- public synchronized void parse( String schema )
- throws IOException, ParseException
+ public synchronized void parse( String schema ) throws IOException,
ParseException
{
if ( schema == null || schema.trim().equals( "" ) )
{