You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by km...@apache.org on 2008/01/30 05:47:08 UTC
svn commit: r616615 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access:
QueryResult.java ToManyList.java Transaction.java
TransactionResultIteratorDecorator.java
Author: kmenard
Date: Tue Jan 29 20:47:07 2008
New Revision: 616615
URL: http://svn.apache.org/viewvc?rev=616615&view=rev
Log:
Generics.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ToManyList.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/Transaction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java?rev=616615&r1=616614&r2=616615&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java Tue Jan 29 20:47:07 2008
@@ -159,7 +159,7 @@
return Collections.EMPTY_LIST;
}
- List list = new ArrayList(size);
+ List<Object> list = new ArrayList<Object>(size);
for (Object obj : allResults) {
if (obj instanceof List) {
list.add(obj);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ToManyList.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ToManyList.java?rev=616615&r1=616614&r2=616615&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ToManyList.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ToManyList.java Tue Jan 29 20:47:07 2008
@@ -49,7 +49,7 @@
// track additions/removals in unresolved...
LinkedList addedToUnresolved;
- LinkedList removedFromUnresolved;
+ LinkedList<Object> removedFromUnresolved;
/**
* Creates ToManyList.
@@ -352,7 +352,7 @@
}
if (removedFromUnresolved == null) {
- removedFromUnresolved = new LinkedList();
+ removedFromUnresolved = new LinkedList<Object>();
}
// No point in adding a new or transient object -- these will never be fetched
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/Transaction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/Transaction.java?rev=616615&r1=616614&r2=616615&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/Transaction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/Transaction.java Tue Jan 29 20:47:07 2008
@@ -39,7 +39,7 @@
*
* @since 1.2
*/
- static final ThreadLocal currentTransaction = new InheritableThreadLocal();
+ static final ThreadLocal<Transaction> currentTransaction = new InheritableThreadLocal<Transaction>();
private static final Transaction NO_TRANSACTION = new Transaction() {
@@ -67,7 +67,7 @@
public static final int STATUS_NO_TRANSACTION = 6;
public static final int STATUS_MARKED_ROLLEDBACK = 7;
- protected Map connections;
+ protected Map<String, Connection> connections;
protected int status;
protected TransactionDelegate delegate;
@@ -108,7 +108,7 @@
* @since 1.2
*/
public static Transaction getThreadTransaction() {
- return (Transaction) currentTransaction.get();
+ return currentTransaction.get();
}
/**
@@ -187,7 +187,7 @@
* @since 1.2
*/
public Connection getConnection(String name) {
- return (connections != null) ? (Connection) connections.get(name) : null;
+ return (connections != null) ? connections.get(name) : null;
}
/**
@@ -199,7 +199,7 @@
}
if (connections == null) {
- connections = new HashMap();
+ connections = new HashMap<String, Connection>();
}
return connections.put(name, connection) != connection;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java?rev=616615&r1=616614&r2=616615&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java Tue Jan 29 20:47:07 2008
@@ -68,7 +68,7 @@
}
public List dataRows(boolean close) throws CayenneException {
- List list = new ArrayList();
+ List<Map> list = new ArrayList<Map>();
try {
while (hasNextRow()) {