andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved CombinedIterator to org.jboss.netty.channel.group because it's only used there

Browse Source
This commit is contained in:
Trustin Lee 2010-01-14 11:52:11 +00:00
parent f8de47e2da
commit be2991c586
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/jboss/netty/util/internal/CombinedIterator.java → src/main/java/org/jboss/netty/channel/group/CombinedIterator.java
View File

@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jboss.netty.util.internal; package org.jboss.netty.channel.group;
import java.util.Iterator; import java.util.Iterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
@ -23,13 +23,13 @@ import java.util.NoSuchElementException;
* @author Trustin Lee (trustin@gmail.com) * @author Trustin Lee (trustin@gmail.com)
* @version $Rev$, $Date$ * @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> i1;
private final Iterator<E> i2; private final Iterator<E> i2;
private Iterator<E> currentIterator; private Iterator<E> currentIterator;
public CombinedIterator(Iterator<E> i1, Iterator<E> i2) { CombinedIterator(Iterator<E> i1, Iterator<E> i2) {
if (i1 == null) { if (i1 == null) {
throw new NullPointerException("i1"); throw new NullPointerException("i1");
} }

1
src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java
View File

@ -30,7 +30,6 @@ import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture; import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelFutureListener; import org.jboss.netty.channel.ChannelFutureListener;
import org.jboss.netty.channel.ServerChannel; import org.jboss.netty.channel.ServerChannel;
import org.jboss.netty.util.internal.CombinedIterator;
import org.jboss.netty.util.internal.ConcurrentHashMap; import org.jboss.netty.util.internal.ConcurrentHashMap;
/** /**