--- a/src/java.base/share/classes/java/util/Map.java Wed Mar 28 00:45:37 2018 +0200
+++ b/src/java.base/share/classes/java/util/Map.java Tue Mar 27 16:25:40 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -141,7 +141,7 @@
* </ul>
*
* <p>This interface is a member of the
- * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework">
+ * <a href="{@docRoot}/java.base/java/util/package-summary.html#CollectionsFramework">
* Java Collections Framework</a>.
*
* @param <K> the type of keys maintained by this map
@@ -187,10 +187,10 @@
* key
* @throws ClassCastException if the key is of an inappropriate type for
* this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws NullPointerException if the specified key is null and this map
* does not permit null keys
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
*/
boolean containsKey(Object key);
@@ -207,10 +207,10 @@
* specified value
* @throws ClassCastException if the value is of an inappropriate type for
* this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws NullPointerException if the specified value is null and this
* map does not permit null values
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
*/
boolean containsValue(Object value);
@@ -235,10 +235,10 @@
* {@code null} if this map contains no mapping for the key
* @throws ClassCastException if the key is of an inappropriate type for
* this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws NullPointerException if the specified key is null and this map
* does not permit null keys
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
*/
V get(Object key);
@@ -295,10 +295,10 @@
* is not supported by this map
* @throws ClassCastException if the key is of an inappropriate type for
* this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws NullPointerException if the specified key is null and this
* map does not permit null keys
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
*/
V remove(Object key);
@@ -608,10 +608,10 @@
* {@code defaultValue} if this map contains no mapping for the key
* @throws ClassCastException if the key is of an inappropriate type for
* this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws NullPointerException if the specified key is null and this map
* does not permit null keys
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @since 1.8
*/
default V getOrDefault(Object key, V defaultValue) {
@@ -690,13 +690,13 @@
* values
* @throws ClassCastException if a replacement value is of an inappropriate
* type for this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws NullPointerException if function or a replacement value is null,
* and this map does not permit null keys or values
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws IllegalArgumentException if some property of a replacement value
* prevents it from being stored in this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws ConcurrentModificationException if an entry is found to be
* removed during iteration
* @since 1.8
@@ -757,16 +757,16 @@
* if the implementation supports null values.)
* @throws UnsupportedOperationException if the {@code put} operation
* is not supported by this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws ClassCastException if the key or value is of an inappropriate
* type for this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws NullPointerException if the specified key or value is null,
* and this map does not permit null keys or values
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws IllegalArgumentException if some property of the specified key
* or value prevents it from being stored in this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @since 1.8
*/
default V putIfAbsent(K key, V value) {
@@ -803,13 +803,13 @@
* @return {@code true} if the value was removed
* @throws UnsupportedOperationException if the {@code remove} operation
* is not supported by this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws ClassCastException if the key or value is of an inappropriate
* type for this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws NullPointerException if the specified key or value is null,
* and this map does not permit null keys or values
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @since 1.8
*/
default boolean remove(Object key, Object value) {
@@ -852,14 +852,14 @@
* @return {@code true} if the value was replaced
* @throws UnsupportedOperationException if the {@code put} operation
* is not supported by this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws ClassCastException if the class of a specified key or value
* prevents it from being stored in this map
* @throws NullPointerException if a specified key or newValue is null,
* and this map does not permit null keys or values
* @throws NullPointerException if oldValue is null and this map does not
* permit null values
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws IllegalArgumentException if some property of a specified key
* or value prevents it from being stored in this map
* @since 1.8
@@ -902,10 +902,10 @@
* if the implementation supports null values.)
* @throws UnsupportedOperationException if the {@code put} operation
* is not supported by this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws ClassCastException if the class of the specified key or value
* prevents it from being stored in this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws NullPointerException if the specified key or value is null,
* and this map does not permit null keys or values
* @throws IllegalArgumentException if some property of the specified key
@@ -985,13 +985,13 @@
* is null
* @throws UnsupportedOperationException if the {@code put} operation
* is not supported by this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws ClassCastException if the class of the specified key or value
* prevents it from being stored in this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws IllegalArgumentException if some property of the specified key
* or value prevents it from being stored in this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @since 1.8
*/
default V computeIfAbsent(K key,
@@ -1062,13 +1062,13 @@
* remappingFunction is null
* @throws UnsupportedOperationException if the {@code put} operation
* is not supported by this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws ClassCastException if the class of the specified key or value
* prevents it from being stored in this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws IllegalArgumentException if some property of the specified key
* or value prevents it from being stored in this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @since 1.8
*/
default V computeIfPresent(K key,
@@ -1154,13 +1154,13 @@
* remappingFunction is null
* @throws UnsupportedOperationException if the {@code put} operation
* is not supported by this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws ClassCastException if the class of the specified key or value
* prevents it from being stored in this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws IllegalArgumentException if some property of the specified key
* or value prevents it from being stored in this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @since 1.8
*/
default V compute(K key,
@@ -1249,13 +1249,13 @@
* value is associated with the key
* @throws UnsupportedOperationException if the {@code put} operation
* is not supported by this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws ClassCastException if the class of the specified key or value
* prevents it from being stored in this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws IllegalArgumentException if some property of the specified key
* or value prevents it from being stored in this map
- * (<a href="{@docRoot}/java/util/Collection.html#optional-restrictions">optional</a>)
+ * (<a href="{@docRoot}/java.base/java/util/Collection.html#optional-restrictions">optional</a>)
* @throws NullPointerException if the specified key is null and this map
* does not support null keys or the value or remappingFunction is
* null