diff --git a/me/Grid.java b/me/Grid.java index cb6c0d7a..e9e5727c 100644 --- a/me/Grid.java +++ b/me/Grid.java @@ -156,7 +156,7 @@ public class Grid implements IGrid @Override public IReadOnlyCollection getNodes() { - return new NodeIteratable( Machines ); + return new NodeIterable( Machines ); } @Override diff --git a/me/NodeIteratable.java b/me/NodeIterable.java similarity index 82% rename from me/NodeIteratable.java rename to me/NodeIterable.java index b2a25d68..700e1d90 100644 --- a/me/NodeIteratable.java +++ b/me/NodeIterable.java @@ -1,57 +1,57 @@ -package appeng.me; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Set; - -import appeng.api.networking.IGridNode; -import appeng.api.util.IReadOnlyCollection; - -public class NodeIteratable implements IReadOnlyCollection -{ - - final private HashMap> Machines; - - public NodeIteratable(HashMap> Machines) { - this.Machines = Machines; - } - - @Override - public Iterator iterator() - { - return new NodeIterator( Machines ); - } - - @Override - public int size() - { - int size = 0; - - for (Set o : Machines.values()) - size += o.size(); - - return size; - } - - @Override - public boolean isEmpty() - { - for (Set o : Machines.values()) - if ( !o.isEmpty() ) - return false; - - return true; - } - - @Override - public boolean contains(Object node) - { - Class c = ((IGridNode) node).getMachine().getClass(); - - Set p = Machines.get( c ); - if ( p != null ) - return p.contains( node ); - - return false; - } -} +package appeng.me; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Set; + +import appeng.api.networking.IGridNode; +import appeng.api.util.IReadOnlyCollection; + +public class NodeIterable implements IReadOnlyCollection +{ + + final private HashMap> Machines; + + public NodeIterable(HashMap> Machines) { + this.Machines = Machines; + } + + @Override + public Iterator iterator() + { + return new NodeIterator( Machines ); + } + + @Override + public int size() + { + int size = 0; + + for (Set o : Machines.values()) + size += o.size(); + + return size; + } + + @Override + public boolean isEmpty() + { + for (Set o : Machines.values()) + if ( !o.isEmpty() ) + return false; + + return true; + } + + @Override + public boolean contains(Object node) + { + Class c = ((IGridNode) node).getMachine().getClass(); + + Set p = Machines.get( c ); + if ( p != null ) + return p.contains( node ); + + return false; + } +}