You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2006/01/28 11:20:30 UTC

svn commit: r373123 - /db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/oql/OQLQueryImpl.java

Author: arminw
Date: Sat Jan 28 02:20:16 2006
New Revision: 373123

URL: http://svn.apache.org/viewcvs?rev=373123&view=rev
Log:
minor improvement, use final keyword, use List instead Vector

Modified:
    db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/oql/OQLQueryImpl.java

Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/oql/OQLQueryImpl.java
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/oql/OQLQueryImpl.java?rev=373123&r1=373122&r2=373123&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/oql/OQLQueryImpl.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/oql/OQLQueryImpl.java Sat Jan 28 02:20:16 2006
@@ -16,11 +16,14 @@
  */
 
 import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
+import java.util.List;
 import java.util.ListIterator;
-import java.util.Vector;
 
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
 import org.apache.ojb.broker.ManageableCollection;
 import org.apache.ojb.broker.PBKey;
 import org.apache.ojb.broker.PersistenceBroker;
@@ -46,9 +49,6 @@
 import org.odmg.QueryParameterTypeInvalidException;
 import org.odmg.Transaction;
 
-import antlr.RecognitionException;
-import antlr.TokenStreamException;
-
 /**
  * The OQL query interface implementation.
  *
@@ -137,7 +137,7 @@
         }
     }
 
-    private Vector flatten(Criteria crit, Vector acc)
+    private List flatten(final Criteria crit, final List acc)
     {
         Enumeration e = crit.getElements();
         while (e.hasMoreElements())
@@ -176,12 +176,12 @@
      * @param	queryString	An OQL query.
      * @exception	QueryInvalidException	The query syntax is invalid.
      */
-    public void create(String queryString) throws org.odmg.QueryInvalidException
+    public void create(final String queryString) throws org.odmg.QueryInvalidException
     {
         create(queryString, Query.NO_START_AT_INDEX, Query.NO_END_AT_INDEX);
     }
 
-    public void create(String queryString, int startAtIndex, int endAtIndex) throws QueryInvalidException
+    public void create(final String queryString, final int startAtIndex, final int endAtIndex) throws QueryInvalidException
     {
         if (log.isDebugEnabled()) log.debug("create query for query-string: " + queryString);
         /**
@@ -203,12 +203,12 @@
         {
 //			Query query = QueryPool.getQuery(queryString);
             // Use the OQL parser to transform a query string to a valid org.apache.ojb.broker.query object
-            Query _query;
-            StringReader reader = new StringReader(queryString);
-            OQLLexer lexer = new OQLLexer(reader);
-            OQLParser parser = new OQLParser(lexer);
+            final Query _query;
+            final StringReader reader = new StringReader(queryString);
+            final OQLLexer lexer = new OQLLexer(reader);
+            final OQLParser parser = new OQLParser(lexer);
             _query = parser.buildQuery();
-            setBindIterator(flatten(_query.getCriteria(), new Vector()).listIterator());
+            setBindIterator(flatten(_query.getCriteria(), new ArrayList()).listIterator());
             _query.setStartAtIndex(startAtIndex);
             _query.setEndAtIndex(endAtIndex);
             setQuery(_query);



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