From 0033f1cc9556e454f725bfbc95ebca3de9a60557 Mon Sep 17 00:00:00 2001
From: Ioannis Tsakpinis <iotsakp@gmail.com>
Date: Wed, 13 Jul 2011 12:44:25 +0000
Subject: [PATCH] Made MappedForeach package private (foreach returns Iterable
 now) and changed next() to go through the bounds check.

---
 src/java/org/lwjgl/util/mapped/MappedForeach.java | 5 ++---
 src/java/org/lwjgl/util/mapped/MappedObject.java  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/java/org/lwjgl/util/mapped/MappedForeach.java b/src/java/org/lwjgl/util/mapped/MappedForeach.java
index b61ed889..42160f6b 100644
--- a/src/java/org/lwjgl/util/mapped/MappedForeach.java
+++ b/src/java/org/lwjgl/util/mapped/MappedForeach.java
@@ -38,7 +38,7 @@ import java.util.Iterator;
  *
  * @author Riven
  */
-public class MappedForeach<T extends MappedObject> implements Iterable<T> {
+final class MappedForeach<T extends MappedObject> implements Iterable<T> {
 
 	final T   mapped;
 	final int elementCount;
@@ -58,8 +58,7 @@ public class MappedForeach<T extends MappedObject> implements Iterable<T> {
 			}
 
 			public T next() {
-				mapped.viewAddress = mapped.baseAddress + (this.index++) * mapped.stride;
-
+				MappedHelper.put_view(mapped, this.index++);
 				return mapped;
 			}
 
diff --git a/src/java/org/lwjgl/util/mapped/MappedObject.java b/src/java/org/lwjgl/util/mapped/MappedObject.java
index cf8eced1..afa5a94d 100644
--- a/src/java/org/lwjgl/util/mapped/MappedObject.java
+++ b/src/java/org/lwjgl/util/mapped/MappedObject.java
@@ -214,7 +214,7 @@ public class MappedObject {
 	 * For convenience you are encouraged to static-import this specific method:
 	 * <code>import static org.lwjgl.util.mapped.MappedObject.foreach;</code>
 	 */
-	public static <T extends MappedObject> MappedForeach<T> foreach(T mapped, int elementCount) {
+	public static <T extends MappedObject> Iterable<T> foreach(T mapped, int elementCount) {
 		return new MappedForeach<T>(mapped, elementCount);
 	}