svn commit: r889762 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java

[doogie-3]

Author: doogie
Date: Fri Dec 11 18:44:36 2009
New Revision: 889762

URL: http://svn.apache.org/viewvc?rev=889762&view=rev
Log:
Rename putAll(Iterator) to putAllIterator(Iterator).

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java?rev=889762&r1=889761&r2=889762&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java Fri Dec 11 18:44:36 2009
@@ -217,10 +217,10 @@
         } else {
             it = map.entrySet().iterator();
         }
-        putAll(it);
+        putAllIterator(it);
     }
 
-    protected abstract <KE extends K, VE extends V> void putAll(Iterator<Map.Entry<KE, VE>> it);
+    protected abstract <KE extends K, VE extends V> void putAllIterator(Iterator<Map.Entry<KE, VE>> it);
 
     public String toString() {
         StringBuilder sb = new StringBuilder();