Make StructureModifier Iterable

Author: BradBot1

src/main/java/com/comphenix/protocol/reflect/StructureModifier.java

@@ -26,6 +26,8 @@
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
 
+import java.lang.Iterable;
+import java.util.Iterator;
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 import java.lang.reflect.Field;
@@ -51,7 +53,7 @@
  * @param <T> Type of the fields to retrieve.
  * @author Kristian
  */
-public class StructureModifier<T> {
+public class StructureModifier<T> implements Iterable<T> {
 
     // Instance generator we will use
     private static final DefaultInstances DEFAULT_GENERATOR = getDefaultGenerator();
@@ -666,4 +668,12 @@ protected void setConverter(EquivalentConverter<T> converter) {
     public String toString() {
         return "StructureModifier[fieldType=" + this.fieldType + ", data=" + this.accessors + "]";
     }
+
+    /**
+	 * {@inheritDoc}
+	 */
+    @Override
+    public Iterator<T> iterator() {
+        return new StructureModifierIterator<T>(this);
+    }
 }

src/main/java/com/comphenix/protocol/reflect/StructureModifierIterator.java

@@ -0,0 +1,56 @@
+/*
+ *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ *  Copyright (C) 2012 Kristian S. Stangeland
+ *
+ *  This program is free software; you can redistribute it and/or modify it under the terms of the
+ *  GNU General Public License as published by the Free Software Foundation; either version 2 of
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program;
+ *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307 USA
+ */
+package com.comphenix.protocol.reflect;
+
+import java.util.Iterator;
+
+/**
+ * Provides iterator access to a {@link StructureModifier}
+ *
+ * @param <T> Type of the fields in the {@link StructureModifier}
+ * @author BradBot_1
+ */
+class StructureModifierIterator<T> implements Iterator<T> {
+    
+    private final StructureModifier<T> structure;
+    private int index = 0;
+
+    /**
+     * @param structure - {@link StructureModifier} to operate on.
+     */
+    StructureModifierIterator(final StructureModifier<T> structure) {
+        this.structure = structure;
+    }
+
+    /**
+	 * {@inheritDoc}
+	 */
+    @Override
+    public final boolean hasNext() {
+        return this.index < this.structure.size();
+    }
+
+    /**
+	 * {@inheritDoc}
+	 */
+    @Override
+    public final T next() {
+        if (!this.hasNext()) return null;
+        return structure.read(index++);
+    }
+
+}