--- old/src/java.base/share/classes/java/util/Scanner.java 2016-02-12 15:40:14.786539162 +0000 +++ new/src/java.base/share/classes/java/util/Scanner.java 2016-02-12 15:40:14.618542668 +0000 @@ -38,8 +38,6 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import sun.misc.LRUCache; - /** * A simple text scanner which can parse primitive types and strings using * regular expressions. @@ -2838,4 +2836,51 @@ } } } + + /** Utility class for small LRU caches. */ + abstract class LRUCache { + + private V[] oa = null; + private final int size; + + public LRUCache(int size) { + this.size = size; + } + + protected abstract V create(N name); + + protected abstract boolean hasName(V ob, N name); + + public void moveToFront(Object[] oa, int i) { + Object ob = oa[i]; + for (int j = i; j > 0; j--) + oa[j] = oa[j - 1]; + oa[0] = ob; + } + + public V forName(N name) { + if (oa == null) { + @SuppressWarnings("unchecked") + V[] temp = (V[])new Object[size]; + oa = temp; + } else { + for (int i = 0; i < oa.length; i++) { + V ob = oa[i]; + if (ob == null) + continue; + if (hasName(ob, name)) { + if (i > 0) + moveToFront(oa, i); + return ob; + } + } + } + + // Create a new object + V ob = create(name); + oa[oa.length - 1] = ob; + moveToFront(oa, oa.length - 1); + return ob; + } + } }