You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/12/26 12:11:47 UTC
svn commit: r606879 - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/
cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/
Author: aadamchik
Date: Wed Dec 26 03:11:44 2007
New Revision: 606879
URL: http://svn.apache.org/viewvc?rev=606879&view=rev
Log:
generics: removing <?> parameter from the returned collections.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContext.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/QueryResponse.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockObjectContext.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java?rev=606879&r1=606878&r2=606879&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java Wed Dec 26 03:11:44 2007
@@ -67,7 +67,8 @@
public abstract QueryResponse performGenericQuery(Query query);
- public abstract List<?> performQuery(Query query);
+ @SuppressWarnings("unchecked")
+ public abstract List performQuery(Query query);
/**
* @deprecated since 3.0 this method is replaced by
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContext.java?rev=606879&r1=606878&r2=606879&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContext.java Wed Dec 26 03:11:44 2007
@@ -337,8 +337,9 @@
/**
* Runs a query, returning result as list.
*/
- public List<?> performQuery(Query query) {
- List<?> result = onQuery(this, query).firstList();
+ @SuppressWarnings("unchecked")
+ public List performQuery(Query query) {
+ List result = onQuery(this, query).firstList();
return result != null ? result : new ArrayList<Object>(1);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java?rev=606879&r1=606878&r2=606879&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java Wed Dec 26 03:11:44 2007
@@ -156,7 +156,8 @@
/**
* Executes a selecting query, returning a list of persistent objects or data rows.
*/
- List<?> performQuery(Query query);
+ @SuppressWarnings("unchecked")
+ List performQuery(Query query);
/**
* Executes any kind of query providing the result in a form of QueryResponse.
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/QueryResponse.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/QueryResponse.java?rev=606879&r1=606878&r2=606879&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/QueryResponse.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/QueryResponse.java Wed Dec 26 03:11:44 2007
@@ -98,7 +98,8 @@
* null if the query has no lists. Note that this method resets current iterator to an
* undefined state.
*/
- List<?> firstList();
+ @SuppressWarnings("unchecked")
+ List firstList();
/**
* A utility method for quickly retrieving the first update count from the response.
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java?rev=606879&r1=606878&r2=606879&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java Wed Dec 26 03:11:44 2007
@@ -1298,13 +1298,14 @@
* @return A list of DataObjects or a DataRows, depending on the value returned by
* {@link QueryMetadata#isFetchingDataRows()}.
*/
- public List<?> performQuery(Query query) {
+ @SuppressWarnings("unchecked")
+ public List performQuery(Query query) {
query = nonNullDelegate().willPerformQuery(this, query);
if (query == null) {
return new ArrayList<Object>(1);
}
- List<?> result = onQuery(this, query).firstList();
+ List result = onQuery(this, query).firstList();
return result != null ? result : new ArrayList<Object>(1);
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockObjectContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockObjectContext.java?rev=606879&r1=606878&r2=606879&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockObjectContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/MockObjectContext.java Wed Dec 26 03:11:44 2007
@@ -78,7 +78,8 @@
return null;
}
- public List<?> performQuery(Query query) {
+ @SuppressWarnings("unchecked")
+ public List performQuery(Query query) {
return null;
}