Issue 421 parenting of collections (#501)

* Migrate from List to NodeList
* Disallow usage of null in the AST
* Use Optional where fields are optional (previously nullable)

1 files changed, 6 insertions, 4 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
index ded1ad8d8..5e3c228a9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
@@ -25,6 +25,8 @@ import com.github.javaparser.Range;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 
+import static com.github.javaparser.utils.Utils.assertNotNull;
+
 /**
  * @author Julio Vilmar Gesser
  */
@@ -35,11 +37,11 @@ public final class LabeledStmt extends Statement {
 	private Statement stmt;
 
 	public LabeledStmt() {
+        this(Range.UNKNOWN, "empty", new EmptyStmt());
 	}
 
 	public LabeledStmt(final String label, final Statement stmt) {
-		setLabel(label);
-		setStmt(stmt);
+        this(Range.UNKNOWN, label, stmt);
 	}
 
 	public LabeledStmt(Range range, final String label, final Statement stmt) {
@@ -65,12 +67,12 @@ public final class LabeledStmt extends Statement {
 	}
 
 	public LabeledStmt setLabel(final String label) {
-		this.label = label;
+		this.label = assertNotNull(label);
 		return this;
 	}
 
 	public LabeledStmt setStmt(final Statement stmt) {
-		this.stmt = stmt;
+		this.stmt = assertNotNull(stmt);
 		setAsParentNodeOf(this.stmt);
 		return this;
 	}