cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From and...@apache.org
Subject svn commit: r921763 - in /cayenne/sandbox/cayenne-gwt/src: main/java/org/apache/cayenne/query/ main/resources/org/apache/cayenne/emul/org/apache/cayenne/ main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/ test/java/org/apache/cayenn...
Date Thu, 11 Mar 2010 09:54:23 GMT
Author: andrey
Date: Thu Mar 11 09:54:23 2010
New Revision: 921763

URL: http://svn.apache.org/viewvc?rev=921763&view=rev
Log:
cleanup

Removed:
    cayenne/sandbox/cayenne-gwt/src/main/java/org/apache/cayenne/query/AbstractQuery_CustomFieldSerializer.java
    cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/AbstractQuery_CustomFieldSerializer.java
Modified:
    cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/emul/org/apache/cayenne/ObjectContext.java
    cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/AbstractQuery.java
    cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/QualifiedQuery.java
    cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/SQLTemplate.java
    cayenne/sandbox/cayenne-gwt/src/test/java/org/apache/cayenne/gwt/test/client/model/auto/_TestDomainMap.java

Modified: cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/emul/org/apache/cayenne/ObjectContext.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/emul/org/apache/cayenne/ObjectContext.java?rev=921763&r1=921762&r2=921763&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/emul/org/apache/cayenne/ObjectContext.java
(original)
+++ cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/emul/org/apache/cayenne/ObjectContext.java
Thu Mar 11 09:54:23 2010
@@ -20,7 +20,14 @@
 package org.apache.cayenne;
 
 import java.io.Serializable;
+import java.util.List;
+
+import org.apache.cayenne.query.Query;
 
 public interface ObjectContext extends Serializable {
-	
+	/**
+     * Executes a selecting query, returning a list of persistent objects or data rows.
+     */
+    @SuppressWarnings("unchecked")
+    List performQuery(Query query);
 }
\ No newline at end of file

Modified: cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/AbstractQuery.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/AbstractQuery.java?rev=921763&r1=921762&r2=921763&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/AbstractQuery.java
(original)
+++ cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/AbstractQuery.java
Thu Mar 11 09:54:23 2010
@@ -19,14 +19,11 @@
 
 package org.apache.cayenne.query;
 
-import java.io.Serializable;
-
-
 /**
  * A common superclass of Cayenne queries.
  * 
  */
-public abstract class AbstractQuery<T> implements Query, Serializable {
+public abstract class AbstractQuery<T> implements Query {
 
     /**
      * The root object this query. May be an entity name, Java class, ObjEntity or

Modified: cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/QualifiedQuery.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/QualifiedQuery.java?rev=921763&r1=921762&r2=921763&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/QualifiedQuery.java
(original)
+++ cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/QualifiedQuery.java
Thu Mar 11 09:54:23 2010
@@ -19,13 +19,15 @@
 
 package org.apache.cayenne.query;
 
+import java.io.Serializable;
+
 import org.apache.cayenne.exp.Expression;
 
 /**
  * An abstract superclass of queries with Expression qualifiers.
  * 
  */
-public abstract class QualifiedQuery extends AbstractQuery {
+public abstract class QualifiedQuery extends AbstractQuery<Serializable> {
 
     protected Expression qualifier;
 

Modified: cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/SQLTemplate.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/SQLTemplate.java?rev=921763&r1=921762&r2=921763&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/SQLTemplate.java
(original)
+++ cayenne/sandbox/cayenne-gwt/src/main/resources/org/apache/cayenne/query/emul/org/apache/cayenne/query/SQLTemplate.java
Thu Mar 11 09:54:23 2010
@@ -19,6 +19,8 @@
 
 package org.apache.cayenne.query;
 
+import java.io.Serializable;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -59,7 +61,7 @@ import org.apache.commons.collections.Tr
  * 
  * @since 1.1
  */
-public class SQLTemplate extends AbstractQuery implements ParameterizedQuery {
+public class SQLTemplate extends AbstractQuery<Serializable> implements ParameterizedQuery
{
 
     static final String COLUMN_NAME_CAPITALIZATION_PROPERTY = "cayenne.SQLTemplate.columnNameCapitalization";
     

Modified: cayenne/sandbox/cayenne-gwt/src/test/java/org/apache/cayenne/gwt/test/client/model/auto/_TestDomainMap.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-gwt/src/test/java/org/apache/cayenne/gwt/test/client/model/auto/_TestDomainMap.java?rev=921763&r1=921762&r2=921763&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-gwt/src/test/java/org/apache/cayenne/gwt/test/client/model/auto/_TestDomainMap.java
(original)
+++ cayenne/sandbox/cayenne-gwt/src/test/java/org/apache/cayenne/gwt/test/client/model/auto/_TestDomainMap.java
Thu Mar 11 09:54:23 2010
@@ -1,5 +1,10 @@
 package org.apache.cayenne.gwt.test.client.model.auto;
 
+import java.util.List;
+
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.gwt.test.client.model.Forest;
+import org.apache.cayenne.query.NamedQuery;
 
 /**
  * This class was generated by Cayenne.
@@ -10,4 +15,8 @@ package org.apache.cayenne.gwt.test.clie
 public class _TestDomainMap {
 
     public static final String FOREST_QUERY_QUERYNAME = "ForestQuery";
+
+    public List<Forest> performForestQuery(ObjectContext context ) {
+        return context.performQuery(new NamedQuery("ForestQuery"));
+    }
 }
\ No newline at end of file



Mime
View raw message