harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r405648 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util: Hashtable.java Set.java
Date Wed, 10 May 2006 06:07:19 GMT
Author: smishura
Date: Tue May  9 23:07:17 2006
New Revision: 405648

URL: http://svn.apache.org/viewcvs?rev=405648&view=rev
Log:
Fix for HARMONY-454 ([classlib][luni] java.util.Set generics uplift and related changes)

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Hashtable.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Set.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Hashtable.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Hashtable.java?rev=405648&r1=405647&r2=405648&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Hashtable.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Hashtable.java
Tue May  9 23:07:17 2006
@@ -645,9 +645,7 @@
 	 *            the Map to copy mappings from
 	 */
 	public synchronized void putAll(Map<? extends K,? extends V> map) {
-		Iterator<Map.Entry<K,V>> it = map.entrySet().iterator();
-		while (it.hasNext()) {
-			Map.Entry<K,V> entry = it.next();
+		for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
 			put(entry.getKey(), entry.getValue());
 		}
 	}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Set.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Set.java?rev=405648&r1=405647&r2=405648&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Set.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Set.java
Tue May  9 23:07:17 2006
@@ -18,6 +18,7 @@
 
 /**
  * Set is a collection which does not allow duplicate elements.
+ * @since 1.2
  */
 public interface Set<E> extends Collection<E> {
 	
@@ -123,7 +124,7 @@
 	 * 
 	 * @see Iterator
 	 */
-	public Iterator iterator();
+	public Iterator<E> iterator();
 
 	/**
 	 * Removes any occurrence of the specified object from this Set.



Mime
View raw message