Use TransformedIterator instead of ForwardingIterator.

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=79673799

Author: cpovirk

guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/Synchronized.java

@@ -827,16 +827,13 @@ private static class SynchronizedAsMapEntries<K, V>
       super(delegate, mutex);
     }
 
-    @Override public Iterator<Map.Entry<K, Collection<V>>> iterator() {
+    @Override
+    public Iterator<Map.Entry<K, Collection<V>>> iterator() {
       // Must be manually synchronized.
-      final Iterator<Map.Entry<K, Collection<V>>> iterator = super.iterator();
-      return new ForwardingIterator<Map.Entry<K, Collection<V>>>() {
-        @Override protected Iterator<Map.Entry<K, Collection<V>>> delegate() {
-          return iterator;
-        }
-
-        @Override public Map.Entry<K, Collection<V>> next() {
-          final Map.Entry<K, Collection<V>> entry = super.next();
+      return new TransformedIterator<Map.Entry<K, Collection<V>>, Map.Entry<K, Collection<V>>>(
+          super.iterator()) {
+        @Override
+        Map.Entry<K, Collection<V>> transform(final Map.Entry<K, Collection<V>> entry) {
           return new ForwardingMapEntry<K, Collection<V>>() {
             @Override protected Map.Entry<K, Collection<V>> delegate() {
               return entry;
@@ -1191,13 +1188,9 @@ private static class SynchronizedAsMapValues<V>
 
     @Override public Iterator<Collection<V>> iterator() {
       // Must be manually synchronized.
-      final Iterator<Collection<V>> iterator = super.iterator();
-      return new ForwardingIterator<Collection<V>>() {
-        @Override protected Iterator<Collection<V>> delegate() {
-          return iterator;
-        }
-        @Override public Collection<V> next() {
-          return typePreservingCollection(super.next(), mutex);
+      return new TransformedIterator<Collection<V>, Collection<V>>(super.iterator()) {
+        @Override Collection<V> transform(Collection<V> from) {
+          return typePreservingCollection(from, mutex);
         }
       };
     }

guava/src/com/google/common/collect/MapConstraints.java

@@ -580,13 +580,9 @@ private static class ConstrainedEntries<K, V>
     }
 
     @Override public Iterator<Entry<K, V>> iterator() {
-      final Iterator<Entry<K, V>> iterator = entries.iterator();
-      return new ForwardingIterator<Entry<K, V>>() {
-        @Override public Entry<K, V> next() {
-          return constrainedEntry(iterator.next(), constraint);
-        }
-        @Override protected Iterator<Entry<K, V>> delegate() {
-          return iterator;
+      return new TransformedIterator<Entry<K, V>, Entry<K, V>>(entries.iterator()) {
+        @Override Entry<K, V> transform(Entry<K, V> from) {
+          return constrainedEntry(from, constraint);
         }
       };
     }
@@ -652,13 +648,10 @@ static class ConstrainedAsMapEntries<K, V>
     }
 
     @Override public Iterator<Entry<K, Collection<V>>> iterator() {
-      final Iterator<Entry<K, Collection<V>>> iterator = entries.iterator();
-      return new ForwardingIterator<Entry<K, Collection<V>>>() {
-        @Override public Entry<K, Collection<V>> next() {
-          return constrainedAsMapEntry(iterator.next(), constraint);
-        }
-        @Override protected Iterator<Entry<K, Collection<V>>> delegate() {
-          return iterator;
+      return new TransformedIterator<Entry<K, Collection<V>>, Entry<K, Collection<V>>>(
+          entries.iterator()) {
+        @Override Entry<K, Collection<V>> transform(Entry<K, Collection<V>> from) {
+          return constrainedAsMapEntry(from, constraint);
         }
       };
     }

guava/src/com/google/common/collect/Synchronized.java

@@ -843,16 +843,13 @@ private static class SynchronizedAsMapEntries<K, V>
       super(delegate, mutex);
     }
 
-    @Override public Iterator<Map.Entry<K, Collection<V>>> iterator() {
+    @Override
+    public Iterator<Map.Entry<K, Collection<V>>> iterator() {
       // Must be manually synchronized.
-      final Iterator<Map.Entry<K, Collection<V>>> iterator = super.iterator();
-      return new ForwardingIterator<Map.Entry<K, Collection<V>>>() {
-        @Override protected Iterator<Map.Entry<K, Collection<V>>> delegate() {
-          return iterator;
-        }
-
-        @Override public Map.Entry<K, Collection<V>> next() {
-          final Map.Entry<K, Collection<V>> entry = super.next();
+      return new TransformedIterator<Map.Entry<K, Collection<V>>, Map.Entry<K, Collection<V>>>(
+          super.iterator()) {
+        @Override
+        Map.Entry<K, Collection<V>> transform(final Map.Entry<K, Collection<V>> entry) {
           return new ForwardingMapEntry<K, Collection<V>>() {
             @Override protected Map.Entry<K, Collection<V>> delegate() {
               return entry;
@@ -1207,13 +1204,9 @@ private static class SynchronizedAsMapValues<V>
 
     @Override public Iterator<Collection<V>> iterator() {
       // Must be manually synchronized.
-      final Iterator<Collection<V>> iterator = super.iterator();
-      return new ForwardingIterator<Collection<V>>() {
-        @Override protected Iterator<Collection<V>> delegate() {
-          return iterator;
-        }
-        @Override public Collection<V> next() {
-          return typePreservingCollection(super.next(), mutex);
+      return new TransformedIterator<Collection<V>, Collection<V>>(super.iterator()) {
+        @Override Collection<V> transform(Collection<V> from) {
+          return typePreservingCollection(from, mutex);
         }
       };
     }