Merge pull request antlr#35 from tunnelvisionlabs/hash-edge-map

Build cleanup from HashEdgeMap implementation
sharwell · Apr 8, 2018 · 7123888 · 7123888
2 parents 6f44dcf + 2b4e5ae
commit 7123888
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -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
@@ -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;
 	}