From 421085e6e3ac688463d5c13a271f4cc28d760582 Mon Sep 17 00:00:00 2001
From: Moritz Eysholdt <moritz.eysholdt@itemis.de>
Date: Fri, 9 Mar 2012 14:01:30 +0100
Subject: [PATCH] fixed broken serializer tests in Xbase. The problem was that
 the node model was not iterated properly.

---
 .../xtext/serializer/sequencer/SemanticNodeIterator.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/SemanticNodeIterator.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/SemanticNodeIterator.java
index b006b4e2f..741beafe4 100644
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/SemanticNodeIterator.java
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/SemanticNodeIterator.java
@@ -33,9 +33,9 @@ public class SemanticNodeIterator implements Iterator<Triple<INode, AbstractElem
 	public SemanticNodeIterator(EObject obj) {
 		INode start = NodeModelUtils.findActualNodeFor(obj);
 		if (start != null) {
-			if (isEObjectNode(start))
-				start = ((ICompositeNode) start).getFirstChild();
 			this.next = findNext(start, false);
+			while (this.next != null && this.next.getThird() == obj)
+				this.next = findNext(this.next.getFirst(), false);
 		} else
 			this.next = null;
 	}
@@ -52,7 +52,7 @@ public class SemanticNodeIterator implements Iterator<Triple<INode, AbstractElem
 				continue;
 			}
 			EObject ge = current.getGrammarElement();
-			if (isEObjectNode(current))
+			if (ge instanceof AbstractElement && isEObjectNode(current))
 				return Tuples.create(current, (AbstractElement) ge, getEObjectNodeEObject(current));
 			else if (GrammarUtil.isAssigned(ge) && !GrammarUtil.isEObjectRuleCall(ge)) {
 				if (ge instanceof CrossReference)