projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor text parser
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
text
/
PartContainer.java
diff --git
a/src/main/java/net/pterodactylus/sone/text/PartContainer.java
b/src/main/java/net/pterodactylus/sone/text/PartContainer.java
index
a8a7e85
..
3444d19
100644
(file)
--- 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–201
2
David Roden
+ * Sone - PartContainer.java - Copyright © 2010–201
6
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
*
* 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.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.
/**
* Part implementation that can contain an arbitrary amount of other parts.
@@
-33,61
+36,27
@@
import java.util.NoSuchElementException;
*/
public class PartContainer implements Part, Iterable<Part> {
*/
public class PartContainer implements Part, Iterable<Part> {
- /** The parts to render. */
private final List<Part> parts = new ArrayList<Part>();
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);
}
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);
}
public void removePart(int index) {
parts.remove(index);
}
- /**
- * Returns the number of parts.
- *
- * @return The number of parts
- */
public int size() {
return parts.size();
}
public int size() {
return parts.size();
}
- //
- // PART METHODS
- //
-
- /**
- * {@inheritDoc}
- */
@Override
@Override
+ @Nonnull
public String getText() {
StringBuilder partText = new StringBuilder();
for (Part part : parts) {
public String getText() {
StringBuilder partText = new StringBuilder();
for (Part part : parts) {
@@
-96,14
+65,8
@@
public class PartContainer implements Part, Iterable<Part> {
return partText.toString();
}
return partText.toString();
}
- //
- // ITERABLE METHODS
- //
-
- /**
- * {@inheritDoc}
- */
@Override
@Override
+ @Nonnull
@SuppressWarnings("synthetic-access")
public Iterator<Part> iterator() {
return new Iterator<Part>() {
@SuppressWarnings("synthetic-access")
public Iterator<Part> iterator() {
return new Iterator<Part>() {