From be2991c586e8eb988d77ae766e13db3907bf890d Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Thu, 14 Jan 2010 11:52:11 +0000
Subject: [PATCH] Moved CombinedIterator to org.jboss.netty.channel.group
 because it's only used there

---
 .../{util/internal => channel/group}/CombinedIterator.java  | 6 +++---
 .../org/jboss/netty/channel/group/DefaultChannelGroup.java  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename src/main/java/org/jboss/netty/{util/internal => channel/group}/CombinedIterator.java (92%)

diff --git a/src/main/java/org/jboss/netty/util/internal/CombinedIterator.java b/src/main/java/org/jboss/netty/channel/group/CombinedIterator.java
similarity index 92%
rename from src/main/java/org/jboss/netty/util/internal/CombinedIterator.java
rename to src/main/java/org/jboss/netty/channel/group/CombinedIterator.java
index 907260a6e4..b467eb1b71 100644
--- a/src/main/java/org/jboss/netty/util/internal/CombinedIterator.java
+++ b/src/main/java/org/jboss/netty/channel/group/CombinedIterator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package org.jboss.netty.channel.group;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -23,13 +23,13 @@ import java.util.NoSuchElementException;
  * @author Trustin Lee (trustin@gmail.com)
  * @version $Rev$, $Date$
  */
-public class CombinedIterator<E> implements Iterator<E> {
+final class CombinedIterator<E> implements Iterator<E> {
 
     private final Iterator<E> i1;
     private final Iterator<E> i2;
     private Iterator<E> currentIterator;
 
-    public CombinedIterator(Iterator<E> i1, Iterator<E> i2) {
+    CombinedIterator(Iterator<E> i1, Iterator<E> i2) {
         if (i1 == null) {
             throw new NullPointerException("i1");
         }
diff --git a/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java b/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java
index cd88b48ad5..b2de7e92e9 100644
--- a/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java
+++ b/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java
@@ -30,7 +30,6 @@ import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.ChannelFutureListener;
 import org.jboss.netty.channel.ServerChannel;
-import org.jboss.netty.util.internal.CombinedIterator;
 import org.jboss.netty.util.internal.ConcurrentHashMap;
 
 /**