From 2b4e5aec308e9762e8b3b84196854f3fa6c3ba99 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 7 Apr 2018 21:31:57 -0500
Subject: [PATCH] Build cleanup from HashEdgeMap implementation

* Fix warnings about use of deprecated types
* Remove unnecessary exposure of HashEdgeMap internals
---
 .../Java/src/org/antlr/v4/runtime/dfa/ArrayEdgeMap.java    | 1 +
 runtime/Java/src/org/antlr/v4/runtime/dfa/HashEdgeMap.java | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/runtime/Java/src/org/antlr/v4/runtime/dfa/ArrayEdgeMap.java b/runtime/Java/src/org/antlr/v4/runtime/dfa/ArrayEdgeMap.java
index df814b0bbb..30fb18557b 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/dfa/ArrayEdgeMap.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/dfa/ArrayEdgeMap.java
@@ -76,6 +76,7 @@ public ArrayEdgeMap<T> remove(int key) {
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public ArrayEdgeMap<T> putAll(EdgeMap<? extends T> m) {
 		if (m.isEmpty()) {
 			return this;
diff --git a/runtime/Java/src/org/antlr/v4/runtime/dfa/HashEdgeMap.java b/runtime/Java/src/org/antlr/v4/runtime/dfa/HashEdgeMap.java
index 081018df76..fd537d3415 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/dfa/HashEdgeMap.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/dfa/HashEdgeMap.java
@@ -8,7 +8,6 @@
 import org.antlr.v4.runtime.misc.NotNull;
 
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -69,11 +68,13 @@ private int bucket(int key) {
 		return key & (values.length - 1);
 	}
 
-	public final AtomicIntegerArray getKeys() {
+	@NotNull
+	/*package*/ AtomicIntegerArray getKeys() {
 		return keys;
 	}
 
-	public final T[] getValues() {
+	@NotNull
+	/*package*/ T[] getValues() {
 		return values;
 	}