From f233f6eaae263cea5adb0f50b79ee711ffde4c67 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sun, 6 Apr 2014 16:26:22 -0500
Subject: [PATCH 1/2] Fix build warning due to use of generics

---
 .../Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java b/runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java
index 3c13aecea..7a6756253 100755
--- a/runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java
@@ -1269,7 +1269,7 @@ public class ParserATNSimulator extends ATNSimulator {
 				succeeded.add(c);
 			}
 		}
-		return new Pair(succeeded,failed);
+		return new Pair<ATNConfigSet, ATNConfigSet>(succeeded,failed);
 	}
 
 	/** Look through a list of predicate/alt pairs, returning alts for the

From fb662028206d2092facc3b9ed2b11fac00ea0446 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sun, 6 Apr 2014 16:26:41 -0500
Subject: [PATCH 2/2] Improved documentation for Transition.isEpsilon

---
 .../src/org/antlr/v4/runtime/atn/Transition.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/runtime/Java/src/org/antlr/v4/runtime/atn/Transition.java b/runtime/Java/src/org/antlr/v4/runtime/atn/Transition.java
index d29571519..2f5393989 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/atn/Transition.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/atn/Transition.java
@@ -109,8 +109,18 @@ public abstract class Transition {
 
 	public abstract int getSerializationType();
 
-	/** Are we epsilon, action, sempred? */
-	public boolean isEpsilon() { return false; }
+	/**
+	 * Determines if the transition is an "epsilon" transition.
+	 *
+	 * <p>The default implementation returns {@code false}.</p>
+	 *
+	 * @return {@code true} if traversing this transition in the ATN does not
+	 * consume an input symbol; otherwise, {@code false} if traversing this
+	 * transition consumes (matches) an input symbol.
+	 */
+	public boolean isEpsilon() {
+		return false;
+	}
 
 	@Nullable
 	public IntervalSet label() { return null; }