From 80e8bf06a7a4e78f2509bc052c5f32371325726a Mon Sep 17 00:00:00 2001
From: Jani Laakso <jani.laakso@itmill.com>
Date: Sun, 21 Oct 2007 13:48:13 +0000
Subject: [PATCH] Fixed #1024

svn changeset:2567/svn branch:trunk
---
 src/com/itmill/toolkit/ui/SplitPanel.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/com/itmill/toolkit/ui/SplitPanel.java b/src/com/itmill/toolkit/ui/SplitPanel.java
index e18a6e9840..41416c9de2 100644
--- a/src/com/itmill/toolkit/ui/SplitPanel.java
+++ b/src/com/itmill/toolkit/ui/SplitPanel.java
@@ -177,24 +177,32 @@ public class SplitPanel extends AbstractComponentContainer implements Layout,
 			int i = 0;
 
 			public boolean hasNext() {
-				if (i < 2)
+				if (i < (firstComponent == null ? 0 : 1)
+						+ (secondComponent == null ? 0 : 1))
 					return true;
 				return false;
 			}
 
 			public Object next() {
+				if (!hasNext())
+					return null;
 				i++;
 				if (i == 1)
-					return firstComponent;
+					return firstComponent == null ? secondComponent
+							: firstComponent;
 				else if (i == 2)
 					return secondComponent;
 				return null;
 			}
 
 			public void remove() {
-				if (i == 1)
-					setFirstComponent(null);
-				else if (i == 2)
+				if (i == 1) {
+					if (firstComponent != null) {
+						setFirstComponent(null);
+						i = 0;
+					} else
+						setSecondComponent(null);
+				} else if (i == 2)
 					setSecondComponent(null);
 			}
 		};
-- 
2.39.5