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 03:13:22 UTC
svn commit: r616590 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/
Author: kmenard
Date: Tue Jan 29 18:13:21 2008
New Revision: 616590
URL: http://svn.apache.org/viewvc?rev=616590&view=rev
Log:
Generics.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNodeSyncQualifierDescriptor.java
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/DataRowStore.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowUtils.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java?rev=616590&r1=616589&r2=616590&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java Tue Jan 29 18:13:21 2008
@@ -44,15 +44,15 @@
private final DataDomainFlushAction parent;
private final EntityResolver resolver;
private final Collection indirectModifications;
- private final Collection flattenedInserts;
- private final Collection flattenedDeletes;
+ private final Collection<FlattenedArcKey> flattenedInserts;
+ private final Collection<FlattenedArcKey> flattenedDeletes;
DataDomainIndirectDiffBuilder(DataDomainFlushAction parent) {
this.parent = parent;
this.indirectModifications = parent.getResultIndirectlyModifiedIds();
this.resolver = parent.getDomain().getEntityResolver();
- this.flattenedInserts = new HashSet();
- this.flattenedDeletes = new HashSet();
+ this.flattenedInserts = new HashSet<FlattenedArcKey>();
+ this.flattenedDeletes = new HashSet<FlattenedArcKey>();
}
void processIndirectChanges(GraphDiff allChanges) {
@@ -60,18 +60,18 @@
allChanges.apply(this);
if (!flattenedInserts.isEmpty()) {
- Iterator it = flattenedInserts.iterator();
+ Iterator<FlattenedArcKey> it = flattenedInserts.iterator();
while (it.hasNext()) {
- FlattenedArcKey key = (FlattenedArcKey) it.next();
+ FlattenedArcKey key = it.next();
DbEntity entity = key.getJoinEntity();
parent.addFlattenedInsert(entity, key);
}
}
if (!flattenedDeletes.isEmpty()) {
- Iterator it = flattenedDeletes.iterator();
+ Iterator<FlattenedArcKey> it = flattenedDeletes.iterator();
while (it.hasNext()) {
- FlattenedArcKey key = (FlattenedArcKey) it.next();
+ FlattenedArcKey key = it.next();
DbEntity entity = key.getJoinEntity();
parent.addFlattenedDelete(entity, key);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java?rev=616590&r1=616589&r2=616590&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java Tue Jan 29 18:13:21 2008
@@ -280,13 +280,13 @@
return DONE;
}
- Collection<?> objects = refreshQuery.getObjects();
+ Collection<Persistent> objects = (Collection<Persistent>) refreshQuery.getObjects();
if (objects != null && !objects.isEmpty()) {
- Collection ids = new ArrayList(objects.size());
- Iterator it = objects.iterator();
+ Collection<ObjectId> ids = new ArrayList<ObjectId>(objects.size());
+ Iterator<Persistent> it = objects.iterator();
while (it.hasNext()) {
- Persistent object = (Persistent) it.next();
+ Persistent object = it.next();
ids.add(object.getObjectId());
}
@@ -505,7 +505,7 @@
List mainRows = response.firstList();
if (mainRows != null && !mainRows.isEmpty()) {
- Collection columns = rsMapping.getColumnResults();
+ Collection<String> columns = rsMapping.getColumnResults();
if (columns.isEmpty()) {
throw new CayenneRuntimeException(
"Invalid result set mapping, no columns mapped.");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNodeSyncQualifierDescriptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNodeSyncQualifierDescriptor.java?rev=616590&r1=616589&r2=616590&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNodeSyncQualifierDescriptor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNodeSyncQualifierDescriptor.java Tue Jan 29 18:13:21 2008
@@ -54,10 +54,10 @@
return attributes;
}
- Map createQualifierSnapshot(ObjectDiff diff) {
+ Map<String, Object> createQualifierSnapshot(ObjectDiff diff) {
int len = attributes.size();
- Map map = new HashMap(len * 2);
+ Map<String, Object> map = new HashMap<String, Object>(len * 2);
for (int i = 0; i < len; i++) {
DbAttribute attribute = attributes.get(i);
if (!map.containsKey(attribute.getName())) {
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=616590&r1=616589&r2=616590&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 Tue Jan 29 18:13:21 2008
@@ -229,7 +229,7 @@
currentRow++;
- Map nextRow = result.nextDataRow();
+ Map<String, Object> nextRow = result.nextDataRow();
insert.add(nextRow);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowStore.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowStore.java?rev=616590&r1=616589&r2=616590&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowStore.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowStore.java Tue Jan 29 18:13:21 2008
@@ -193,7 +193,7 @@
EventBridgeFactory factory = (EventBridgeFactory) Class.forName(
eventBridgeFactory).newInstance();
- Collection subjects = Collections.singleton(getSnapshotEventSubject());
+ Collection<EventSubject> subjects = Collections.singleton(getSnapshotEventSubject());
String externalSubject = EventBridge
.convertToExternalSubject(getSnapshotEventSubject());
this.remoteNotificationsHandler = factory.createEventBridge(
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowUtils.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowUtils.java?rev=616590&r1=616589&r2=616590&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowUtils.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowUtils.java Tue Jan 29 18:13:21 2008
@@ -19,7 +19,6 @@
package org.apache.cayenne.access;
-import java.util.Iterator;
import java.util.Map;
import org.apache.cayenne.DataRow;
@@ -220,7 +219,7 @@
});
}
- static boolean hasFK(DbRelationship relationship, Map snapshot) {
+ static boolean hasFK(DbRelationship relationship, Map<String, Object> snapshot) {
for (final DbJoin join : relationship.getJoins()) {
if (!snapshot.containsKey(join.getSourceName())) {
return false;