db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/platforms PlatformOracle9iImpl.java
Date Mon, 04 Aug 2003 06:06:26 GMT
thma        2003/08/03 23:06:25

  Modified:    src/java/org/apache/ojb/odmg/oql OQLLexerTokenTypes.java
                        OQLLexer.java OQLParser.java
               src/java/org/apache/ojb/broker/platforms
                        PlatformOracle9iImpl.java
  Log:
  update OQL parser, remove unused import statements
  
  Revision  Changes    Path
  1.7       +0 -5      db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexerTokenTypes.java
  
  Index: OQLLexerTokenTypes.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexerTokenTypes.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- OQLLexerTokenTypes.java	2 Aug 2003 08:27:22 -0000	1.6
  +++ OQLLexerTokenTypes.java	4 Aug 2003 06:06:25 -0000	1.7
  @@ -20,11 +20,6 @@
    */
   package org.apache.ojb.odmg.oql;
   
  -import org.apache.ojb.broker.query.*;
  -import org.apache.ojb.broker.metadata.*;
  -import org.apache.ojb.broker.*;
  -import java.util.*;
  -
   public interface OQLLexerTokenTypes {
   	int EOF = 1;
   	int NULL_TREE_LOOKAHEAD = 3;
  
  
  
  1.11      +0 -10     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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- OQLLexer.java	2 Aug 2003 08:27:22 -0000	1.10
  +++ OQLLexer.java	4 Aug 2003 06:06:25 -0000	1.11
  @@ -20,34 +20,24 @@
    */
   package org.apache.ojb.odmg.oql;
   
  -import org.apache.ojb.broker.query.*;
  -import org.apache.ojb.broker.metadata.*;
  -import org.apache.ojb.broker.*;
  -import java.util.*;
  -
   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.ByteBuffer;
   import antlr.CharBuffer;
   import antlr.Token;
  -import antlr.CommonToken;
   import antlr.RecognitionException;
   import antlr.NoViableAltForCharException;
  -import antlr.MismatchedCharException;
   import antlr.TokenStream;
   import antlr.ANTLRHashString;
   import antlr.LexerSharedInputState;
   import antlr.collections.impl.BitSet;
  -import antlr.SemanticException;
   
   public class OQLLexer extends antlr.CharScanner implements OQLLexerTokenTypes, TokenStream
    {
  
  
  
  1.16      +3 -9      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- OQLParser.java	2 Aug 2003 08:27:22 -0000	1.15
  +++ OQLParser.java	4 Aug 2003 06:06:25 -0000	1.16
  @@ -27,20 +27,12 @@
   
   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 antlr.collections.AST;
  -import antlr.ASTPair;
  -import antlr.collections.impl.ASTArray;
   
   public class OQLParser extends antlr.LLkParser
          implements OQLLexerTokenTypes
  @@ -145,7 +137,9 @@
   			}
   			else
   			{
  -			ClassDescriptor cld = PersistenceBrokerFactory.defaultPersistenceBroker().getClassDescriptor(clazz);
  +				PersistenceBroker broker = PersistenceBrokerFactory.defaultPersistenceBroker();
  +			ClassDescriptor cld = broker.getClassDescriptor(clazz);
  +			broker.close();
   			for (int i = 0; i < projectionAttrs.length; i++)
   			{
   			projectionAttrs[i] = projectionAttrs[i].substring(projectionAttrs[i].indexOf('.') +
1);
  
  
  
  1.6       +0 -3      db-ojb/src/java/org/apache/ojb/broker/platforms/PlatformOracle9iImpl.java
  
  Index: PlatformOracle9iImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/platforms/PlatformOracle9iImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PlatformOracle9iImpl.java	29 Jul 2003 16:54:12 -0000	1.5
  +++ PlatformOracle9iImpl.java	4 Aug 2003 06:06:25 -0000	1.6
  @@ -62,9 +62,6 @@
   import java.lang.reflect.Method;
   import java.sql.*;
   import java.io.ByteArrayInputStream;
  -import java.io.Reader;
  -import java.io.StringReader;
  -import java.io.InputStreamReader;
   
   /**
    *  This class is a concrete implementation of <code>Platform</code>. Provides
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message