cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johnth...@apache.org
Subject svn commit: r1422187 - in /cayenne/main/trunk: framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ framework/cayenne-jdk1.5-unpublished/src/mai...
Date Sat, 15 Dec 2012 04:52:21 GMT
Author: johnthuss
Date: Sat Dec 15 04:52:07 2012
New Revision: 1422187

URL: http://svn.apache.org/viewvc?rev=1422187&view=rev
Log:
Minimize compiler warnings about missing type parameter for SelectQuery

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataPort.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/OptimisticLockException.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/OrderingTranslator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcActionBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseActionBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLActionBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLSelectAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresActionBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresSelectAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLActionBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseActionBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8ActionBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SelectAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleActionBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresActionBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSelectAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RelationshipQuery.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLActionVisitor.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQueryMetadata.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQueryPrefetchRouterAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/NamedObjectFactory.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java
    cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/ObjectIdBatchFault.java
    cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java
    cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapUtils.java
    cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java
    cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java
    cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataPort.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataPort.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataPort.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataPort.java Sat Dec 15 04:52:07 2012
@@ -197,7 +197,7 @@ public class DataPort {
 
             DbEntity entity = (DbEntity) it.next();
 
-            SelectQuery select = new SelectQuery(entity);
+            SelectQuery<DataRow> select = new SelectQuery<DataRow>(entity);
             select.setFetchingDataRows(true);
 
             // delegate is allowed to substitute query

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java Sat Dec 15 04:52:07 2012
@@ -62,7 +62,7 @@ public class IncrementalFaultList<E> imp
     protected List elements;
     protected DataContext dataContext;
     protected ObjEntity rootEntity;
-    protected SelectQuery internalQuery;
+    protected SelectQuery<?> internalQuery;
     protected int unfetchedObjects;
 
     /**
@@ -113,7 +113,7 @@ public class IncrementalFaultList<E> imp
         // create an internal query, it is a partial replica of
         // the original query and will serve as a value holder for
         // various parameters
-        this.internalQuery = new SelectQuery(rootEntity);
+        this.internalQuery = new SelectQuery<Object>(rootEntity);
         this.internalQuery.setFetchingDataRows(metadata.isFetchingDataRows());
         this.internalQuery.setPrefetchTree(metadata.getPrefetchTree());
 
@@ -248,14 +248,14 @@ public class IncrementalFaultList<E> imp
 
             // fetch the range of objects in fetchSize chunks
             boolean fetchesDataRows = internalQuery.isFetchingDataRows();
-            List<?> objects = new ArrayList<Object>(qualsSize);
+            List<Object> objects = new ArrayList<Object>(qualsSize);
 
             int fetchSize = maxFetchSize > 0 ? maxFetchSize : Integer.MAX_VALUE;
 
             int fetchEnd = Math.min(qualsSize, fetchSize);
             int fetchBegin = 0;
             while (fetchBegin < qualsSize) {
-                SelectQuery query = new SelectQuery(
+                SelectQuery<Object> query = new SelectQuery<Object>(
                         rootEntity,
                         ExpressionFactory.joinExp(
                                 Expression.OR,

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/OptimisticLockException.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/OptimisticLockException.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/OptimisticLockException.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/OptimisticLockException.java Sat Dec 15 04:52:07 2012
@@ -25,6 +25,7 @@ import java.util.Map;
 
 import org.apache.cayenne.Cayenne;
 import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.DataRow;
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.exp.Expression;
@@ -84,7 +85,7 @@ public class OptimisticLockException ext
                     : attributeQualifier;
         }
 
-        SelectQuery query = new SelectQuery(rootEntity, qualifier);
+        SelectQuery<DataRow> query = new SelectQuery<DataRow>(rootEntity, qualifier);
         query.setFetchingDataRows(true);
         return (Map<?, ?>) Cayenne.objectForQuery(context, query);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java Sat Dec 15 04:52:07 2012
@@ -43,9 +43,9 @@ import org.apache.cayenne.query.SelectQu
  */
 public class SelectAction extends BaseSQLAction {
 
-    protected SelectQuery query;
+    protected SelectQuery<?> query;
 
-    public SelectAction(SelectQuery query, JdbcAdapter adapter,
+    public SelectAction(SelectQuery<?> query, JdbcAdapter adapter,
             EntityResolver entityResolver) {
         super(adapter, entityResolver);
         this.query = query;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/OrderingTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/OrderingTranslator.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/OrderingTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/OrderingTranslator.java Sat Dec 15 04:52:07 2012
@@ -59,7 +59,7 @@ public class OrderingTranslator extends 
             return;
         }
 
-        Iterator<Ordering> it = ((SelectQuery) q).getOrderings().iterator();
+        Iterator<Ordering> it = ((SelectQuery<?>) q).getOrderings().iterator();
 
         Appendable mainBuffer = this.out;
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java Sat Dec 15 04:52:07 2012
@@ -277,8 +277,8 @@ public class SelectTranslator extends Qu
         return suppressingDistinct;
     }
 
-    private SelectQuery getSelectQuery() {
-        return (SelectQuery) getQuery();
+    private SelectQuery<?> getSelectQuery() {
+        return (SelectQuery<?>) getQuery();
     }
 
     protected List<ColumnDescriptor> buildResultColumns() {
@@ -286,7 +286,7 @@ public class SelectTranslator extends Qu
         this.defaultAttributesByColumn = new HashMap<ColumnDescriptor, ObjAttribute>();
 
         List<ColumnDescriptor> columns = new ArrayList<ColumnDescriptor>();
-        SelectQuery query = getSelectQuery();
+        SelectQuery<?> query = getSelectQuery();
 
         if (query.getRoot() instanceof DbEntity) {
             appendDbEntityColumns(columns, query);
@@ -301,9 +301,9 @@ public class SelectTranslator extends Qu
         return columns;
     }
 
-    List<ColumnDescriptor> appendDbEntityColumns(
+    <T> List<ColumnDescriptor> appendDbEntityColumns(
             List<ColumnDescriptor> columns,
-            SelectQuery query) {
+            SelectQuery<T> query) {
 
         final Set<ColumnTracker> attributes = new HashSet<ColumnTracker>();
 
@@ -318,9 +318,9 @@ public class SelectTranslator extends Qu
     /**
      * Appends columns needed for object SelectQuery to the provided columns list.
      */
-    List<ColumnDescriptor> appendQueryColumns(
+    <T> List<ColumnDescriptor> appendQueryColumns(
             final List<ColumnDescriptor> columns,
-            SelectQuery query) {
+            SelectQuery<T> query) {
 
         final Set<ColumnTracker> attributes = new HashSet<ColumnTracker>();
 
@@ -523,9 +523,9 @@ public class SelectTranslator extends Qu
         return columns;
     }
 
-    List<ColumnDescriptor> appendIdColumns(
+    <T> List<ColumnDescriptor> appendIdColumns(
             final List<ColumnDescriptor> columns,
-            SelectQuery query) {
+            SelectQuery<T> query) {
 
         Set<ColumnTracker> skipSet = new HashSet<ColumnTracker>();
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcActionBuilder.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcActionBuilder.java Sat Dec 15 04:52:07 2012
@@ -68,7 +68,7 @@ public class JdbcActionBuilder implement
         return new ProcedureAction(query, adapter, entityResolver);
     }
 
-    public SQLAction objectSelectAction(SelectQuery query) {
+    public <T> SQLAction objectSelectAction(SelectQuery<T> query) {
         return new SelectAction(query, adapter, entityResolver);
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseActionBuilder.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseActionBuilder.java Sat Dec 15 04:52:07 2012
@@ -36,7 +36,7 @@ class FrontBaseActionBuilder extends Jdb
     }
 
     @Override
-    public SQLAction objectSelectAction(SelectQuery query) {
+    public <T> SQLAction objectSelectAction(SelectQuery<T> query) {
         return new SelectAction(query, adapter, entityResolver) {
 
             @Override

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLActionBuilder.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLActionBuilder.java Sat Dec 15 04:52:07 2012
@@ -37,7 +37,7 @@ class HSQLActionBuilder extends JdbcActi
     }
 
     @Override
-    public SQLAction objectSelectAction(SelectQuery query) {
+    public <T> SQLAction objectSelectAction(SelectQuery<T> query) {
         return new HSQLSelectAction(query, adapter, entityResolver);
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLSelectAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLSelectAction.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLSelectAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLSelectAction.java Sat Dec 15 04:52:07 2012
@@ -31,7 +31,7 @@ import org.apache.cayenne.query.SelectQu
  */
 class HSQLSelectAction extends SelectAction {
 
-    HSQLSelectAction(SelectQuery query, JdbcAdapter adapter, EntityResolver entityResolver) {
+	<T> HSQLSelectAction(SelectQuery<T> query, JdbcAdapter adapter, EntityResolver entityResolver) {
         super(query, adapter, entityResolver);
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresActionBuilder.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresActionBuilder.java Sat Dec 15 04:52:07 2012
@@ -32,7 +32,7 @@ public class IngresActionBuilder extends
     }
 
     @Override
-    public SQLAction objectSelectAction(SelectQuery query) {
+    public <T> SQLAction objectSelectAction(SelectQuery<T> query) {
         return new IngresSelectAction(query, adapter, entityResolver);
     }   
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresSelectAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresSelectAction.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresSelectAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresSelectAction.java Sat Dec 15 04:52:07 2012
@@ -28,7 +28,7 @@ import org.apache.cayenne.query.SelectQu
 
 public class IngresSelectAction extends SelectAction {
 
-    public IngresSelectAction(SelectQuery query, JdbcAdapter adapter,
+    public <T> IngresSelectAction(SelectQuery<T> query, JdbcAdapter adapter,
             EntityResolver entityResolver) {
         super(query, adapter, entityResolver);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLActionBuilder.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLActionBuilder.java Sat Dec 15 04:52:07 2012
@@ -36,7 +36,7 @@ class MySQLActionBuilder extends JdbcAct
     }
 
     @Override
-    public SQLAction objectSelectAction(SelectQuery query) {
+    public <T> SQLAction objectSelectAction(SelectQuery<T> query) {
         return new MySQLSelectAction(query, adapter, entityResolver);
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectAction.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectAction.java Sat Dec 15 04:52:07 2012
@@ -31,7 +31,7 @@ import org.apache.cayenne.query.SelectQu
  */
 class MySQLSelectAction extends SelectAction {
 
-    MySQLSelectAction(SelectQuery query, JdbcAdapter adapter,
+	<T> MySQLSelectAction(SelectQuery<T> query, JdbcAdapter adapter,
             EntityResolver entityResolver) {
         super(query, adapter, entityResolver);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseActionBuilder.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseActionBuilder.java Sat Dec 15 04:52:07 2012
@@ -39,7 +39,7 @@ class OpenBaseActionBuilder extends Jdbc
     }
 
     @Override
-    public SQLAction objectSelectAction(SelectQuery query) {
+    public <T> SQLAction objectSelectAction(SelectQuery<T> query) {
        return new SelectAction(query, adapter, entityResolver) {
 
             @Override

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8ActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8ActionBuilder.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8ActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8ActionBuilder.java Sat Dec 15 04:52:07 2012
@@ -43,7 +43,7 @@ class Oracle8ActionBuilder extends Oracl
     }
 
     @Override
-    public SQLAction objectSelectAction(SelectQuery query) {
+    public <T> SQLAction objectSelectAction(SelectQuery<T> query) {
         return new Oracle8SelectAction(query, getAdapter(), getEntityResolver());
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SelectAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SelectAction.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SelectAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SelectAction.java Sat Dec 15 04:52:07 2012
@@ -30,7 +30,7 @@ import org.apache.cayenne.query.SelectQu
  */
 class Oracle8SelectAction extends OracleSelectAction {
 
-    Oracle8SelectAction(SelectQuery query, JdbcAdapter adapter,
+	<T> Oracle8SelectAction(SelectQuery<T> query, JdbcAdapter adapter,
             EntityResolver entityResolver) {
         super(query, adapter, entityResolver);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleActionBuilder.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleActionBuilder.java Sat Dec 15 04:52:07 2012
@@ -72,7 +72,7 @@ class OracleActionBuilder extends JdbcAc
     }
 
     @Override
-    public SQLAction objectSelectAction(SelectQuery query) {
+    public <T> SQLAction objectSelectAction(SelectQuery<T> query) {
         return new OracleSelectAction(query, getAdapter(), getEntityResolver());
     }
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectAction.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectAction.java Sat Dec 15 04:52:07 2012
@@ -32,7 +32,7 @@ import org.apache.cayenne.query.SelectQu
  */
 class OracleSelectAction extends SelectAction {
 
-    public OracleSelectAction(SelectQuery query, JdbcAdapter adapter,
+    public <T> OracleSelectAction(SelectQuery<T> query, JdbcAdapter adapter,
             EntityResolver entityResolver) {
         super(query, adapter, entityResolver);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresActionBuilder.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresActionBuilder.java Sat Dec 15 04:52:07 2012
@@ -41,7 +41,7 @@ class PostgresActionBuilder extends Jdbc
     }
 
     @Override
-    public SQLAction objectSelectAction(SelectQuery query) {
+    public <T> SQLAction objectSelectAction(SelectQuery<T> query) {
         return new PostgresSelectAction(query, adapter, entityResolver);
     }
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectAction.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectAction.java Sat Dec 15 04:52:07 2012
@@ -31,7 +31,7 @@ import org.apache.cayenne.query.SelectQu
  */
 class PostgresSelectAction extends SelectAction {
 
-    PostgresSelectAction(SelectQuery query, JdbcAdapter adapter,
+    <T> PostgresSelectAction(SelectQuery<T> query, JdbcAdapter adapter,
             EntityResolver entityResolver) {
         super(query, adapter, entityResolver);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java Sat Dec 15 04:52:07 2012
@@ -52,7 +52,7 @@ public class SQLServerActionBuilder exte
     }
 
     @Override
-    public SQLAction objectSelectAction(SelectQuery query) {
+    public <T> SQLAction objectSelectAction(SelectQuery<T> query) {
         return new SQLServerSelectAction(query, adapter, entityResolver);
     }    
     

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSelectAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSelectAction.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSelectAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSelectAction.java Sat Dec 15 04:52:07 2012
@@ -28,7 +28,7 @@ import org.apache.cayenne.query.SelectQu
 
 public class SQLServerSelectAction extends SelectAction {
 
-    public SQLServerSelectAction(SelectQuery query, JdbcAdapter adapter,
+    public <T> SQLServerSelectAction(SelectQuery<T> query, JdbcAdapter adapter,
             EntityResolver entityResolver) {
         super(query, adapter, entityResolver);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java Sat Dec 15 04:52:07 2012
@@ -34,7 +34,7 @@ class SelectQueryBuilder extends QueryLo
      */
     @Override
     public Query getQuery() {
-        SelectQuery query = new SelectQuery();
+        SelectQuery<Object> query = new SelectQuery<Object>();
         query.setRoot(getRoot());
         query.setName(name);
         query.setDataMap(dataMap);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java Sat Dec 15 04:52:07 2012
@@ -125,7 +125,7 @@ public class ObjectIdQuery extends Indir
                     + objectId);
         }
 
-        SelectQuery query = new SelectQuery(objectId.getEntityName(), ExpressionFactory
+        SelectQuery<Object> query = new SelectQuery<Object>(objectId.getEntityName(), ExpressionFactory
                 .matchAllDbExp(objectId.getIdSnapshot(), Expression.EQUAL_TO));
 
         // if we got to the point of fetch, always force refresh....

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java Sat Dec 15 04:52:07 2012
@@ -31,7 +31,7 @@ import org.apache.cayenne.util.Util;
  * A SelectQuery to perform a prefetch based on another query. Used internally by Cayenne
  * and is normally never used directly.
  */
-public class PrefetchSelectQuery extends SelectQuery {
+public class PrefetchSelectQuery extends SelectQuery<Object> {
 
     /**
      * The relationship path from root objects to the objects being prefetched.

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RelationshipQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RelationshipQuery.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RelationshipQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RelationshipQuery.java Sat Dec 15 04:52:07 2012
@@ -122,7 +122,7 @@ public class RelationshipQuery extends I
         Expression qualifier = ExpressionFactory.matchDbExp(relationship
                 .getReverseDbRelationshipPath(), objectId);
 
-        SelectQuery query = new SelectQuery(
+        SelectQuery<Object> query = new SelectQuery<Object>(
                 (ObjEntity) relationship.getTargetEntity(),
                 qualifier);
         query.setStatementFetchSize(statementFetchSize);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLActionVisitor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLActionVisitor.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLActionVisitor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLActionVisitor.java Sat Dec 15 04:52:07 2012
@@ -40,7 +40,7 @@ public interface SQLActionVisitor {
     /**
      * Creates an action to execute a SelectQuery.
      */
-    SQLAction objectSelectAction(SelectQuery query);
+    <T> SQLAction objectSelectAction(SelectQuery<T> query);
 
     /**
      * Creates an action to execute a SQLTemplate.

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQueryMetadata.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQueryMetadata.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQueryMetadata.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQueryMetadata.java Sat Dec 15 04:52:07 2012
@@ -39,7 +39,7 @@ class SelectQueryMetadata extends BaseQu
         this.pathSplitAliases = new HashMap<String, String>(info.getPathSplitAliases());
     }
 
-    boolean resolve(Object root, EntityResolver resolver, SelectQuery query) {
+    <T> boolean resolve(Object root, EntityResolver resolver, SelectQuery<T> query) {
 
         if (super.resolve(root, resolver, null)) {
 
@@ -99,7 +99,7 @@ class SelectQueryMetadata extends BaseQu
         return false;
     }
 
-    private void resolveAutoAliases(SelectQuery query) {
+    private <T> void resolveAutoAliases(SelectQuery<T> query) {
         Expression qualifier = query.getQualifier();
         if (qualifier != null) {
             resolveAutoAliases(qualifier);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQueryPrefetchRouterAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQueryPrefetchRouterAction.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQueryPrefetchRouterAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQueryPrefetchRouterAction.java Sat Dec 15 04:52:07 2012
@@ -35,7 +35,7 @@ import org.apache.cayenne.util.CayenneMa
  */
 class SelectQueryPrefetchRouterAction implements PrefetchProcessor {
 
-    SelectQuery query;
+    SelectQuery<?> query;
     QueryRouter router;
     EntityResolver resolver;
     ClassDescriptor classDescriptor;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java Sat Dec 15 04:52:07 2012
@@ -111,7 +111,7 @@ public class RemoteIncrementalFaultList 
         // server-side, so use a special wrapper that is itself a subclass of
         // SelectQuery
         if (query instanceof SelectQuery) {
-            query = new IncrementalSelectQuery((SelectQuery) paginatedQuery, cacheKey);
+            query = new IncrementalSelectQuery<Object>((SelectQuery<Object>) paginatedQuery, cacheKey);
         }
         else {
             query = new IncrementalQuery(paginatedQuery, cacheKey);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/NamedObjectFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/NamedObjectFactory.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/NamedObjectFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/NamedObjectFactory.java Sat Dec 15 04:52:07 2012
@@ -394,7 +394,7 @@ public abstract class NamedObjectFactory
 
         @Override
         protected Object create(String name, Object namingContext) {
-            SelectQuery query = new SelectQuery();
+            SelectQuery<Object> query = new SelectQuery<Object>();
             query.setName(name);
             return query;
         }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java Sat Dec 15 04:52:07 2012
@@ -128,13 +128,13 @@ public class MapLoaderLoadTest extends T
     }
 
     private void checkLoadedQueries(DataMap map) throws Exception {
-        SelectQuery queryWithQualifier = (SelectQuery) map.getQuery("QueryWithQualifier");
+        SelectQuery<?> queryWithQualifier = (SelectQuery<?>) map.getQuery("QueryWithQualifier");
         assertNotNull(queryWithQualifier);
         assertTrue(queryWithQualifier.getRoot() instanceof ObjEntity);
         assertEquals("Artist", ((Entity) queryWithQualifier.getRoot()).getName());
         assertNotNull(queryWithQualifier.getQualifier());
 
-        SelectQuery queryWithOrdering = (SelectQuery) map.getQuery("QueryWithOrdering");
+        SelectQuery<?> queryWithOrdering = (SelectQuery<?>) map.getQuery("QueryWithOrdering");
         assertNotNull(queryWithOrdering);
         assertTrue(queryWithOrdering.getRoot() instanceof ObjEntity);
         assertEquals("Artist", ((Entity) queryWithOrdering.getRoot()).getName());
@@ -150,7 +150,7 @@ public class MapLoaderLoadTest extends T
         assertTrue(dobOrdering.isAscending());
         assertFalse(dobOrdering.isCaseInsensitive());
 
-        SelectQuery queryWithPrefetch = (SelectQuery) map.getQuery("QueryWithPrefetch");
+        SelectQuery<?> queryWithPrefetch = (SelectQuery<?>) map.getQuery("QueryWithPrefetch");
         assertNotNull(queryWithPrefetch);
         assertTrue(queryWithPrefetch.getRoot() instanceof ObjEntity);
         assertEquals("Gallery", ((Entity) queryWithPrefetch.getRoot()).getName());

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java Sat Dec 15 04:52:07 2012
@@ -80,7 +80,7 @@ public class SelectQueryBasicsTest exten
     }
 
     public void testAddOrdering2() throws Exception {
-        SelectQuery q = new SelectQuery();
+        SelectQuery<Object> q = new SelectQuery<Object>();
 
         String path = "a.b.c";
         q.addOrdering(path, SortOrder.DESCENDING);

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/ObjectIdBatchFault.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/ObjectIdBatchFault.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/ObjectIdBatchFault.java (original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/ObjectIdBatchFault.java Sat Dec 15 04:52:07 2012
@@ -70,7 +70,7 @@ class ObjectIdBatchFault {
     private Map<String, Object> fetchObjects() {
 
         if (sources == null) {
-            return Collections.EMPTY_MAP;
+            return Collections.emptyMap();
         }
 
         EntityResolver resolver = context.getEntityResolver();
@@ -86,14 +86,14 @@ class ObjectIdBatchFault {
 
             Object object = Cayenne.objectForQuery(context, new ObjectIdQuery(id));
             if (object == null) {
-                return Collections.EMPTY_MAP;
+                return Collections.emptyMap();
             }
             else {
                 return Collections.singletonMap(uuid, object);
             }
         }
 
-        Map<String, SelectQuery> queriesByEntity = new HashMap<String, SelectQuery>();
+        Map<String, SelectQuery<DataObject>> queriesByEntity = new HashMap<String, SelectQuery<DataObject>>();
         Map<String, EntityIdCoder> codersByEntity = new HashMap<String, EntityIdCoder>();
 
         for (ObjectIdBatchSourceItem source : sources) {
@@ -101,13 +101,13 @@ class ObjectIdBatchFault {
             String uuid = source.getId();
             String entityName = EntityIdCoder.getEntityName(uuid);
             EntityIdCoder coder = codersByEntity.get(entityName);
-            SelectQuery query;
+            SelectQuery<DataObject> query;
 
             if (coder == null) {
                 coder = new EntityIdCoder(resolver.getObjEntity(entityName));
                 codersByEntity.put(entityName, coder);
 
-                query = new SelectQuery(entityName);
+                query = new SelectQuery<DataObject>(entityName);
                 queriesByEntity.put(entityName, query);
             }
             else {
@@ -124,7 +124,7 @@ class ObjectIdBatchFault {
         int capacity = (int) Math.ceil(sources.size() / 0.75d);
         Map<String, Object> results = new HashMap<String, Object>(capacity);
 
-        for (SelectQuery query : queriesByEntity.values()) {
+        for (SelectQuery<DataObject> query : queriesByEntity.values()) {
 
             EntityIdCoder coder = codersByEntity.get(query.getRoot());
             List<DataObject> objects = context.performQuery(query);

Modified: cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java Sat Dec 15 04:52:07 2012
@@ -34,7 +34,7 @@ import org.apache.cayenne.validation.Val
 
 class SelectQueryValidator extends ConfigurationNodeValidator {
 
-    void validate(SelectQuery query, ValidationResult validationResult) {
+    <T> void validate(SelectQuery<T> query, ValidationResult validationResult) {
 
         validateName(query, validationResult);
 
@@ -64,8 +64,8 @@ class SelectQueryValidator extends Confi
         // TODO: andrus 03/10/2010 - should this be implemented?
     }
 
-    void validateOrdering(
-            SelectQuery query,
+    <T> void validateOrdering(
+            SelectQuery<T> query,
             Entity root,
             Ordering ordering,
             ValidationResult validationResult) {
@@ -89,7 +89,7 @@ class SelectQueryValidator extends Confi
         // TODO: andrus 03/10/2010 - should this be implemented?
     }
 
-    Entity validateRoot(SelectQuery query, ValidationResult validationResult) {
+    <T> Entity validateRoot(SelectQuery<T> query, ValidationResult validationResult) {
         DataMap map = query.getDataMap();
         if (query.getRoot() == null && map != null) {
             addFailure(validationResult, query, "Query '%s' has no root", query.getName());
@@ -128,7 +128,7 @@ class SelectQueryValidator extends Confi
         return null;
     }
 
-    void validateName(SelectQuery query, ValidationResult validationResult) {
+    <T> void validateName(SelectQuery<T> query, ValidationResult validationResult) {
         String name = query.getName();
 
         // Must have name

Modified: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapUtils.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapUtils.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapUtils.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapUtils.java Sat Dec 15 04:52:07 2012
@@ -108,7 +108,7 @@ public class DataMapUtils {
         }
         
         if(query instanceof SelectQuery) {
-            for(Ordering ordering: ((SelectQuery)query).getOrderings()) {
+            for(Ordering ordering: ((SelectQuery<?>)query).getOrderings()) {
                 // validate paths in ordering
                 String path = ordering.getSortSpecString();
                 Iterator<CayenneMapEntry> it = ((ObjEntity)query.getRoot()).resolvePathComponents(path);

Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java Sat Dec 15 04:52:07 2012
@@ -77,7 +77,7 @@ public class SelectQueryOrderingTab exte
     static final String PLACEHOLDER_PANEL = "placeholder";
 
     protected ProjectController mediator;
-    protected SelectQuery selectQuery;
+    protected SelectQuery<?> selectQuery;
 
     protected MultiColumnBrowser browser;
     protected JTable table;
@@ -140,12 +140,12 @@ public class SelectQueryOrderingTab exte
             return;
         }
 
-        if (!(((SelectQuery) query).getRoot() instanceof Entity)) {
+        if (!(((SelectQuery<?>) query).getRoot() instanceof Entity)) {
             processInvalidModel("SelectQuery has no root set.");
             return;
         }
 
-        this.selectQuery = (SelectQuery) query;
+        this.selectQuery = (SelectQuery<?>) query;
         browser.setModel(createBrowserModel((Entity) selectQuery.getRoot()));
         table.setModel(createTableModel());
 

Modified: cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java (original)
+++ cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java Sat Dec 15 04:52:07 2012
@@ -78,12 +78,12 @@ public class Main {
 
 	static void selectTutorial(ObjectContext context) {
 		// SelectQuery examples
-		SelectQuery select1 = new SelectQuery(Painting.class);
+		SelectQuery<Painting> select1 = SelectQuery.from(Painting.class, null);
 		List<Painting> paintings1 = context.performQuery(select1);
 
 		Expression qualifier2 = ExpressionFactory.likeIgnoreCaseExp(
 				Painting.NAME_PROPERTY, "gi%");
-		SelectQuery select2 = new SelectQuery(Painting.class, qualifier2);
+		SelectQuery<Painting> select2 = SelectQuery.from(Painting.class, qualifier2);
 		List<Painting> paintings2 = context.performQuery(select2);
 	}
 
@@ -91,7 +91,7 @@ public class Main {
 		// Delete object examples
 		Expression qualifier = ExpressionFactory.matchExp(Artist.NAME_PROPERTY,
 				"Pablo Picasso");
-		SelectQuery selectToDelete = new SelectQuery(Artist.class, qualifier);
+		SelectQuery<Artist> selectToDelete = SelectQuery.from(Artist.class, qualifier);
 		Artist picasso = (Artist) Cayenne.objectForQuery(context,
 				selectToDelete);
 

Modified: cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java?rev=1422187&r1=1422186&r2=1422187&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java (original)
+++ cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java Sat Dec 15 04:52:07 2012
@@ -79,12 +79,12 @@ public class Main {
 
 	static void selectTutorial(ObjectContext context) {
 		// SelectQuery examples
-		SelectQuery select1 = new SelectQuery(Painting.class);
+		SelectQuery<Painting> select1 = SelectQuery.from(Painting.class, null);
 		List<Painting> paintings1 = context.performQuery(select1);
 
 		Expression qualifier2 = ExpressionFactory.likeIgnoreCaseExp(
 				Painting.NAME_PROPERTY, "gi%");
-		SelectQuery select2 = new SelectQuery(Painting.class, qualifier2);
+		SelectQuery<Painting> select2 = SelectQuery.from(Painting.class, qualifier2);
 		List<Painting> paintings2 = context.performQuery(select2);
 
 		Calendar c = new GregorianCalendar();
@@ -94,7 +94,7 @@ public class Main {
 				.fromString("artist.dateOfBirth < $date");
 		qualifier3 = qualifier3.expWithParameters(Collections.singletonMap(
 				"date", c.getTime()));
-		SelectQuery select3 = new SelectQuery(Painting.class, qualifier3);
+		SelectQuery<Painting> select3 = SelectQuery.from(Painting.class, qualifier3);
 		List<Painting> paintings3 = context.performQuery(select3);
 	}
 
@@ -102,7 +102,7 @@ public class Main {
 		// Delete object examples
 		Expression qualifier = ExpressionFactory.matchExp(Artist.NAME_PROPERTY,
 				"Pablo Picasso");
-		SelectQuery selectToDelete = new SelectQuery(Artist.class, qualifier);
+		SelectQuery<Artist> selectToDelete = SelectQuery.from(Artist.class, qualifier);
 		Artist picasso = (Artist) Cayenne.objectForQuery(context,
 				selectToDelete);
 



Mime
View raw message