From 36a9af8b2991a8f7704365ff61e97b97d9541587 Mon Sep 17 00:00:00 2001
From: sharwell <sharwell@pixelminegames.com>
Date: Thu, 17 Nov 2011 16:59:19 -0800
Subject: [PATCH] v4: Specify @Nullable

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9342]
---
 .../Java/src/org/antlr/v4/runtime/atn/LexerATNSimulator.java  | 3 ++-
 runtime/Java/src/org/antlr/v4/runtime/dfa/DFA.java            | 3 ++-
 runtime/Java/src/org/antlr/v4/runtime/dfa/DFASerializer.java  | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/runtime/Java/src/org/antlr/v4/runtime/atn/LexerATNSimulator.java b/runtime/Java/src/org/antlr/v4/runtime/atn/LexerATNSimulator.java
index 5fbf03ddb..de05d68a1 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/atn/LexerATNSimulator.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/atn/LexerATNSimulator.java
@@ -29,6 +29,7 @@
 
 package org.antlr.v4.runtime.atn;
 
+import com.sun.istack.internal.Nullable;
 import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.dfa.DFA;
 import org.antlr.v4.runtime.dfa.DFAState;
@@ -104,7 +105,7 @@ public class LexerATNSimulator extends ATNSimulator {
 		this(null, atn);
 	}
 
-	public LexerATNSimulator(Lexer recog, ATN atn) {
+	public LexerATNSimulator(@Nullable Lexer recog, ATN atn) {
 		super(atn);
 		dfa = new DFA[atn.modeToStartState.size()];
 		for (int i=0; i<atn.modeToStartState.size(); i++) {
diff --git a/runtime/Java/src/org/antlr/v4/runtime/dfa/DFA.java b/runtime/Java/src/org/antlr/v4/runtime/dfa/DFA.java
index 0428ba444..de37f7240 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/dfa/DFA.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/dfa/DFA.java
@@ -28,6 +28,7 @@
  */
 package org.antlr.v4.runtime.dfa;
 
+import com.sun.istack.internal.Nullable;
 import org.antlr.v4.runtime.atn.ATNState;
 
 import java.util.*;
@@ -52,7 +53,7 @@ public class DFA {
 
 	public String toString() { return toString(null); }
 
-	public String toString(String[] tokenNames) {
+	public String toString(@Nullable String[] tokenNames) {
 		if ( s0==null ) return "";
 		DFASerializer serializer = new DFASerializer(this,tokenNames);
 		return serializer.toString();
diff --git a/runtime/Java/src/org/antlr/v4/runtime/dfa/DFASerializer.java b/runtime/Java/src/org/antlr/v4/runtime/dfa/DFASerializer.java
index 0753eb1c8..98466d469 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/dfa/DFASerializer.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/dfa/DFASerializer.java
@@ -29,12 +29,14 @@
 
 package org.antlr.v4.runtime.dfa;
 
+import com.sun.istack.internal.Nullable;
+
 /** A DFA walker that knows how to dump them to serialized strings. */
 public class DFASerializer {
 	String[] tokenNames;
 	DFA dfa;
 
-	public DFASerializer(DFA dfa, String[] tokenNames) {
+	public DFASerializer(DFA dfa, @Nullable String[] tokenNames) {
 		this.dfa = dfa;
 		this.tokenNames = tokenNames;
 	}