svn commit: r1407890 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util: PersistentObjectList.java PersistentObjectSet.java

[aadamchik]

Author: aadamchik
Date: Sat Nov 10 21:29:42 2012
New Revision: 1407890

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

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectList.java
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectSet.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectList.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectList.java?rev=1407890&r1=1407889&r2=1407890&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectList.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectList.java
 Sat Nov 10 21:29:42 2012
@@ -42,7 +42,7 @@ public class PersistentObjectList extend
     protected List objectList;
 
     // track additions/removals in unresolved...
-    protected LinkedList addedToUnresolved;
+    protected LinkedList<Object> addedToUnresolved;
     protected LinkedList<Object> removedFromUnresolved;
 
     // exists for the benefit of custom serialization schemes such as the one 
in Hessian.
@@ -390,17 +390,15 @@ public class PersistentObjectList extend
         return true;
     }
 
-    protected void postprocessAdd(Collection collection) {
-        Iterator it = collection.iterator();
-        while (it.hasNext()) {
-            postprocessAdd(it.next());
+    protected void postprocessAdd(Collection<?> collection) {
+        for (Object next : collection) {
+            postprocessAdd(next);
         }
     }
 
-    protected void postprocessRemove(Collection collection) {
-        Iterator it = collection.iterator();
-        while (it.hasNext()) {
-            postprocessRemove(it.next());
+    protected void postprocessRemove(Collection<?> collection) {
+        for (Object next : collection) {
+            postprocessRemove(next);
         }
     }
 

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectSet.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectSet.java?rev=1407890&r1=1407889&r2=1407890&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectSet.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/PersistentObjectSet.java
 Sat Nov 10 21:29:42 2012
@@ -262,10 +262,9 @@ public class PersistentObjectSet extends
 
             // add only those that are not already on the list
             // do not include transient objects...
-            if (addedToUnresolved != null && !addedToUnresolved.isEmpty()) {
-                Iterator it = addedToUnresolved.iterator();
-                while (it.hasNext()) {
-                    Object next = it.next();
+            if (addedToUnresolved != null) {
+
+                for (Object next : addedToUnresolved) {
 
                     if (next instanceof Persistent) {
                         Persistent dataObject = (Persistent) next;
@@ -318,17 +317,15 @@ public class PersistentObjectSet extends
         return true;
     }
 
-    void postprocessAdd(Collection collection) {
-        Iterator it = collection.iterator();
-        while (it.hasNext()) {
-            postprocessAdd(it.next());
+    void postprocessAdd(Collection<?> collection) {
+        for (Object next : collection) {
+            postprocessAdd(next);
         }
     }
 
-    void postprocessRemove(Collection collection) {
-        Iterator it = collection.iterator();
-        while (it.hasNext()) {
-            postprocessRemove(it.next());
+    void postprocessRemove(Collection<?> collection) {
+        for (Object next : collection) {
+            postprocessRemove(next);
         }
     }