X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FPartContainer.java;h=88c889e64e1cfe7ffe16b50e34c38e3206b4f5da;hb=dbb47149d5e2c1e67ec9889587ff24dd7c622862;hp=d52658edfd879e79bf099abab0541008258a5c65;hpb=64561f92233e7105055714a9de3db8eead92dd44;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/text/PartContainer.java b/src/main/java/net/pterodactylus/sone/text/PartContainer.java
index d52658e..88c889e 100644
--- a/src/main/java/net/pterodactylus/sone/text/PartContainer.java
+++ b/src/main/java/net/pterodactylus/sone/text/PartContainer.java
@@ -17,11 +17,12 @@
 
 package net.pterodactylus.sone.text;
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Deque;
+import java.util.Iterator;
 import java.util.List;
+import java.util.NoSuchElementException;
 
 /**
  * Part implementation that can contain an arbitrary amount of other parts.
@@ -30,7 +31,7 @@ import java.util.List;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class PartContainer implements Part {
+public class PartContainer implements Part, Iterable<Part> {
 
 	/** The parts to render. */
 	private final List<Part> parts = new ArrayList<Part>();
@@ -80,35 +81,70 @@ public class PartContainer implements Part {
 	}
 
 	//
-	// PART METHODS
+	// ITERABLE METHODS
 	//
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void render(Writer writer) throws IOException {
-		for (Part part : parts) {
-			part.render(writer);
-		}
-	}
+	@SuppressWarnings("synthetic-access")
+	public Iterator<Part> iterator() {
+		return new Iterator<Part>() {
 
-	//
-	// OBJECT METHODS
-	//
+			private Deque<Iterator<Part>> partStack = new ArrayDeque<Iterator<Part>>();
+			private Part nextPart;
+			private boolean foundNextPart;
+			private boolean noNextPart;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String toString() {
-		StringWriter stringWriter = new StringWriter();
-		try {
-			render(stringWriter);
-		} catch (IOException ioe1) {
-			/* should never throw, ignore. */
-		}
-		return stringWriter.toString();
+			{
+				partStack.push(parts.iterator());
+			}
+
+			private void findNext() {
+				if (foundNextPart) {
+					return;
+				}
+				noNextPart = true;
+				while (!partStack.isEmpty()) {
+					@SuppressWarnings("hiding")
+					Iterator<Part> parts = partStack.pop();
+					if (parts.hasNext()) {
+						nextPart = parts.next();
+						partStack.push(parts);
+						if (nextPart instanceof PartContainer) {
+							partStack.push(((PartContainer) nextPart).iterator());
+						} else {
+							noNextPart = false;
+							break;
+						}
+					}
+				}
+				foundNextPart = true;
+			}
+
+			@Override
+			public boolean hasNext() {
+				findNext();
+				return !noNextPart;
+			}
+
+			@Override
+			public Part next() {
+				findNext();
+				if (noNextPart) {
+					throw new NoSuchElementException();
+				}
+				foundNextPart = false;
+				return nextPart;
+			}
+
+			@Override
+			public void remove() {
+				/* ignore. */
+			}
+
+		};
 	}
 
 }