aclute 2005/08/16 08:06:55
Modified: src/java/org/apache/ojb/jdo/jdoql Tag: OJB_1_0_RELEASE
JDOQLTreeParserTokenTypes.java JDOQLTreeParser.java
JDOQLLexer.java JDOQLParser.java
src/java/org/apache/ojb/odmg/oql Tag: OJB_1_0_RELEASE
OQLParser.java OQLLexer.java
Log:
Cleaning up Imports -- removing unused imports
Revision Changes Path
No revision
No revision
1.3.2.2 +1 -2
db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTreeParserTokenTypes.java
Index: JDOQLTreeParserTokenTypes.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTreeParserTokenTypes.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- JDOQLTreeParserTokenTypes.java 10 Apr 2005 18:28:20 -0000 1.3.2.1
+++ JDOQLTreeParserTokenTypes.java 16 Aug 2005 15:06:54 -0000 1.3.2.2
@@ -17,8 +17,7 @@
* limitations under the License.
*/
- import java.util.*;
-
+
public interface JDOQLTreeParserTokenTypes {
int EOF = 1;
int NULL_TREE_LOOKAHEAD = 3;
1.4.2.2 +6 -10
db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTreeParser.java
Index: JDOQLTreeParser.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTreeParser.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- JDOQLTreeParser.java 10 Apr 2005 18:28:20 -0000 1.4.2.1
+++ JDOQLTreeParser.java 16 Aug 2005 15:06:54 -0000 1.4.2.2
@@ -17,19 +17,15 @@
* limitations under the License.
*/
- import java.util.*;
+ import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
-import antlr.TreeParser;
-import antlr.Token;
-import antlr.collections.AST;
-import antlr.RecognitionException;
-import antlr.ANTLRException;
import antlr.NoViableAltException;
-import antlr.MismatchedTokenException;
-import antlr.SemanticException;
+import antlr.RecognitionException;
+import antlr.collections.AST;
import antlr.collections.impl.BitSet;
-import antlr.ASTPair;
-import antlr.collections.impl.ASTArray;
public class JDOQLTreeParser extends antlr.TreeParser implements
JDOQLTreeParserTokenTypes
1.4.2.2 +11 -15 db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLLexer.java
Index: JDOQLLexer.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLLexer.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- JDOQLLexer.java 10 Apr 2005 18:28:20 -0000 1.4.2.1
+++ JDOQLLexer.java 16 Aug 2005 15:06:54 -0000 1.4.2.2
@@ -18,28 +18,24 @@
*/
import java.io.InputStream;
-import antlr.TokenStreamException;
-import antlr.TokenStreamIOException;
-import antlr.TokenStreamRecognitionException;
-import antlr.CharStreamException;
-import antlr.CharStreamIOException;
-import antlr.ANTLRException;
import java.io.Reader;
import java.util.Hashtable;
-import antlr.CharScanner;
-import antlr.InputBuffer;
+
+import antlr.ANTLRHashString;
import antlr.ByteBuffer;
import antlr.CharBuffer;
-import antlr.Token;
-import antlr.CommonToken;
-import antlr.RecognitionException;
+import antlr.CharStreamException;
+import antlr.CharStreamIOException;
+import antlr.InputBuffer;
+import antlr.LexerSharedInputState;
import antlr.NoViableAltForCharException;
-import antlr.MismatchedCharException;
+import antlr.RecognitionException;
+import antlr.Token;
import antlr.TokenStream;
-import antlr.ANTLRHashString;
-import antlr.LexerSharedInputState;
+import antlr.TokenStreamException;
+import antlr.TokenStreamIOException;
+import antlr.TokenStreamRecognitionException;
import antlr.collections.impl.BitSet;
-import antlr.SemanticException;
public class JDOQLLexer extends antlr.CharScanner implements
JDOQLTokenTypes, TokenStream
{
1.5.2.2 +8 -14 db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLParser.java
Index: JDOQLParser.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLParser.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- JDOQLParser.java 10 Apr 2005 18:28:20 -0000 1.5.2.1
+++ JDOQLParser.java 16 Aug 2005 15:06:54 -0000 1.5.2.2
@@ -17,24 +17,18 @@
* limitations under the License.
*/
-import antlr.TokenBuffer;
-import antlr.TokenStreamException;
-import antlr.TokenStreamIOException;
-import antlr.ANTLRException;
-import antlr.LLkParser;
-import antlr.Token;
-import antlr.TokenStream;
-import antlr.RecognitionException;
+import antlr.ASTFactory;
+import antlr.ASTPair;
import antlr.NoViableAltException;
-import antlr.MismatchedTokenException;
-import antlr.SemanticException;
import antlr.ParserSharedInputState;
-import antlr.collections.impl.BitSet;
+import antlr.RecognitionException;
+import antlr.Token;
+import antlr.TokenBuffer;
+import antlr.TokenStream;
+import antlr.TokenStreamException;
import antlr.collections.AST;
-import java.util.Hashtable;
-import antlr.ASTFactory;
-import antlr.ASTPair;
import antlr.collections.impl.ASTArray;
+import antlr.collections.impl.BitSet;
public class JDOQLParser extends antlr.LLkParser implements
JDOQLParserTokenTypes
{
No revision
No revision
1.26.2.2 +10 -15 db-ojb/src/java/org/apache/ojb/odmg/oql/OQLParser.java
Index: OQLParser.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLParser.java,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -u -r1.26.2.1 -r1.26.2.2
--- OQLParser.java 10 Apr 2005 18:28:21 -0000 1.26.2.1
+++ OQLParser.java 16 Aug 2005 15:06:55 -0000 1.26.2.2
@@ -18,20 +18,6 @@
package org.apache.ojb.odmg.oql;
-import antlr.TokenBuffer;
-import antlr.TokenStreamException;
-import antlr.TokenStreamIOException;
-import antlr.ANTLRException;
-import antlr.LLkParser;
-import antlr.Token;
-import antlr.TokenStream;
-import antlr.RecognitionException;
-import antlr.NoViableAltException;
-import antlr.MismatchedTokenException;
-import antlr.SemanticException;
-import antlr.ParserSharedInputState;
-import antlr.collections.impl.BitSet;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Vector;
@@ -39,11 +25,20 @@
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.MetadataManager;
import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
-import org.apache.ojb.broker.util.ClassHelper;
import org.apache.ojb.broker.query.Criteria;
import org.apache.ojb.broker.query.Query;
import org.apache.ojb.broker.query.QueryByCriteria;
import org.apache.ojb.broker.query.QueryFactory;
+import org.apache.ojb.broker.util.ClassHelper;
+
+import antlr.NoViableAltException;
+import antlr.ParserSharedInputState;
+import antlr.RecognitionException;
+import antlr.Token;
+import antlr.TokenBuffer;
+import antlr.TokenStream;
+import antlr.TokenStreamException;
+import antlr.collections.impl.BitSet;
public class OQLParser extends antlr.LLkParser implements
OQLLexerTokenTypes
{
1.19.2.2 +12 -16 db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexer.java
Index: OQLLexer.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexer.java,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -r1.19.2.1 -r1.19.2.2
--- OQLLexer.java 10 Apr 2005 18:28:21 -0000 1.19.2.1
+++ OQLLexer.java 16 Aug 2005 15:06:55 -0000 1.19.2.2
@@ -19,28 +19,24 @@
import java.io.InputStream;
-import antlr.TokenStreamException;
-import antlr.TokenStreamIOException;
-import antlr.TokenStreamRecognitionException;
-import antlr.CharStreamException;
-import antlr.CharStreamIOException;
-import antlr.ANTLRException;
import java.io.Reader;
import java.util.Hashtable;
-import antlr.CharScanner;
-import antlr.InputBuffer;
+
+import antlr.ANTLRHashString;
import antlr.ByteBuffer;
import antlr.CharBuffer;
-import antlr.Token;
-import antlr.CommonToken;
-import antlr.RecognitionException;
+import antlr.CharStreamException;
+import antlr.CharStreamIOException;
+import antlr.InputBuffer;
+import antlr.LexerSharedInputState;
import antlr.NoViableAltForCharException;
-import antlr.MismatchedCharException;
+import antlr.RecognitionException;
+import antlr.Token;
import antlr.TokenStream;
-import antlr.ANTLRHashString;
-import antlr.LexerSharedInputState;
+import antlr.TokenStreamException;
+import antlr.TokenStreamIOException;
+import antlr.TokenStreamRecognitionException;
import antlr.collections.impl.BitSet;
-import antlr.SemanticException;
/**
* This OQL grammar has been derived from a OQL sample grammar from the ODMG
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
