svn commit: r1510132 - /cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/ObjectStoreGraphDiff.java

[aa...@apache.org]

Author: aadamchik
Date: Sun Aug  4 10:58:38 2013
New Revision: 1510132

URL: http://svn.apache.org/r1510132
Log:
cleanup

Modified:
    cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/ObjectStoreGraphDiff.java

Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/ObjectStoreGraphDiff.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/ObjectStoreGraphDiff.java?rev=1510132&r1=1510131&r2=1510132&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/ObjectStoreGraphDiff.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/ObjectStoreGraphDiff.java Sun Aug  4 10:58:38 2013
@@ -22,7 +22,6 @@ package org.apache.cayenne.access;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -73,7 +72,7 @@ class ObjectStoreGraphDiff implements Gr
         // result in
         // ObjectStore modifications
 
-        Collection objectsToValidate = null;
+        Collection<Validating> objectsToValidate = null;
 
         for (final ObjectDiff diff : getChangesByObjectId().values()) {
 
@@ -83,10 +82,10 @@ class ObjectStoreGraphDiff implements Gr
 
                 if (diff.getObject() instanceof Validating) {
                     if (objectsToValidate == null) {
-                        objectsToValidate = new ArrayList();
+                        objectsToValidate = new ArrayList<Validating>();
                     }
 
-                    objectsToValidate.add(diff.getObject());
+                    objectsToValidate.add((Validating) diff.getObject());
                 }
 
             }
@@ -95,9 +94,7 @@ class ObjectStoreGraphDiff implements Gr
         if (objectsToValidate != null) {
             ValidationResult result = new ValidationResult();
 
-            Iterator validationIt = objectsToValidate.iterator();
-            while (validationIt.hasNext()) {
-                Validating object = (Validating) validationIt.next();
+            for (Validating object : objectsToValidate) {
                 switch (((Persistent) object).getPersistenceState()) {
                 case PersistenceState.NEW:
                     object.validateForInsert(result);