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

diff --git a/src/main/java/net/pterodactylus/sone/text/PartContainer.java b/src/main/java/net/pterodactylus/sone/text/PartContainer.java
index 88c889e..3444d19 100644
--- a/src/main/java/net/pterodactylus/sone/text/PartContainer.java
+++ b/src/main/java/net/pterodactylus/sone/text/PartContainer.java
@@ -1,5 +1,5 @@
 /*
- * Sone - PartContainer.java - Copyright © 2010 David Roden
+ * Sone - PartContainer.java - Copyright © 2010–2016 David Roden
  *
  * 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
@@ -23,6 +23,9 @@ import java.util.Deque;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
 
 /**
  * Part implementation that can contain an arbitrary amount of other parts.
@@ -33,61 +36,37 @@ import java.util.NoSuchElementException;
  */
 public class PartContainer implements Part, Iterable<Part> {
 
-	/** The parts to render. */
 	private final List<Part> parts = new ArrayList<Part>();
 
-	//
-	// ACCESSORS
-	//
-
-	/**
-	 * Adds a part to render.
-	 *
-	 * @param part
-	 *            The part to add
-	 */
-	public void add(Part part) {
-		parts.add(part);
+	public void add(@Nonnull Part part) {
+		parts.add(Objects.requireNonNull(part));
 	}
 
-	/**
-	 * Returns the part at the given index.
-	 *
-	 * @param index
-	 *            The index of the part
-	 * @return The part
-	 */
+	@Nonnull
 	public Part getPart(int index) {
 		return parts.get(index);
 	}
 
-	/**
-	 * Removes the part at the given index.
-	 *
-	 * @param index
-	 *            The index of the part to remove
-	 */
 	public void removePart(int index) {
 		parts.remove(index);
 	}
 
-	/**
-	 * Returns the number of parts.
-	 *
-	 * @return The number of parts
-	 */
 	public int size() {
 		return parts.size();
 	}
 
-	//
-	// ITERABLE METHODS
-	//
+	@Override
+	@Nonnull
+	public String getText() {
+		StringBuilder partText = new StringBuilder();
+		for (Part part : parts) {
+			partText.append(part.getText());
+		}
+		return partText.toString();
+	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
+	@Nonnull
 	@SuppressWarnings("synthetic-access")
 	public Iterator<Part> iterator() {
 		return new Iterator<Part>() {
@@ -107,7 +86,6 @@ public class PartContainer implements Part, Iterable<Part> {
 				}
 				noNextPart = true;
 				while (!partStack.isEmpty()) {
-					@SuppressWarnings("hiding")
 					Iterator<Part> parts = partStack.pop();
 					if (parts.hasNext()) {
 						nextPart = parts.next();