OpenJDK / jdk / hs
changeset 44745:f6c38031ebe5
Merge
| author | shurailine |
|---|---|
| date | Tue, 18 Apr 2017 07:49:09 -0700 |
| parents | 333a815987e2 f0bbd698c486 |
| children | a06c12b3efb6 |
| files | |
| diffstat | 61 files changed, 65 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/data/charsetmapping/stdcs-linux Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/make/data/charsetmapping/stdcs-linux Tue Apr 18 07:49:09 2017 -0700 @@ -24,3 +24,5 @@ JIS_X_0212 JIS_X_0208_Solaris JIS_X_0212_Solaris +MS932 +SJIS # SJIS must go together with MS932 to support sun.nio.cs.map
--- a/jdk/src/java.base/share/classes/java/lang/Comparable.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/lang/Comparable.java Tue Apr 18 07:49:09 2017 -0700 @@ -84,7 +84,7 @@ * {(x, y) such that x.equals(y)}. </pre><p> * * This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <T> the type of objects that this object may be compared to
--- a/jdk/src/java.base/share/classes/java/lang/UnsupportedOperationException.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/lang/UnsupportedOperationException.java Tue Apr 18 07:49:09 2017 -0700 @@ -29,7 +29,7 @@ * Thrown to indicate that the requested operation is not supported.<p> * * This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Josh Bloch
--- a/jdk/src/java.base/share/classes/java/util/AbstractCollection.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/AbstractCollection.java Tue Apr 18 07:49:09 2017 -0700 @@ -49,7 +49,7 @@ * the collection being implemented admits a more efficient implementation.<p> * * This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Josh Bloch
--- a/jdk/src/java.base/share/classes/java/util/AbstractList.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/AbstractList.java Tue Apr 18 07:49:09 2017 -0700 @@ -62,7 +62,7 @@ * collection being implemented admits a more efficient implementation. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Josh Bloch
--- a/jdk/src/java.base/share/classes/java/util/AbstractMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/AbstractMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -52,7 +52,7 @@ * map being implemented admits a more efficient implementation. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <K> the type of keys maintained by this map
--- a/jdk/src/java.base/share/classes/java/util/AbstractQueue.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/AbstractQueue.java Tue Apr 18 07:49:09 2017 -0700 @@ -54,7 +54,7 @@ * instead subclassing {@link AbstractCollection}. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/AbstractSequentialList.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/AbstractSequentialList.java Tue Apr 18 07:49:09 2017 -0700 @@ -54,7 +54,7 @@ * specification.<p> * * This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Josh Bloch
--- a/jdk/src/java.base/share/classes/java/util/AbstractSet.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/AbstractSet.java Tue Apr 18 07:49:09 2017 -0700 @@ -42,7 +42,7 @@ * for {@code equals} and {@code hashCode}.<p> * * This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <E> the type of elements maintained by this set
--- a/jdk/src/java.base/share/classes/java/util/ArrayDeque.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/ArrayDeque.java Tue Apr 18 07:49:09 2017 -0700 @@ -79,7 +79,7 @@ * Iterator} interfaces. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Josh Bloch and Doug Lea
--- a/jdk/src/java.base/share/classes/java/util/ArrayList.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/ArrayList.java Tue Apr 18 07:49:09 2017 -0700 @@ -91,7 +91,7 @@ * should be used only to detect bugs.</i> * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <E> the type of elements in this list
--- a/jdk/src/java.base/share/classes/java/util/Arrays.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/Arrays.java Tue Apr 18 07:49:09 2017 -0700 @@ -62,7 +62,7 @@ * a MergeSort, but it does have to be <i>stable</i>.) * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Josh Bloch @@ -8899,4 +8899,4 @@ return aLength != bLength ? length : -1; } -} \ No newline at end of file +}
--- a/jdk/src/java.base/share/classes/java/util/Collection.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/Collection.java Tue Apr 18 07:49:09 2017 -0700 @@ -112,7 +112,7 @@ * however most current implementations do not do so. * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @implSpec
--- a/jdk/src/java.base/share/classes/java/util/Collections.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/Collections.java Tue Apr 18 07:49:09 2017 -0700 @@ -65,7 +65,7 @@ * already sorted may or may not throw {@code UnsupportedOperationException}. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Josh Bloch
--- a/jdk/src/java.base/share/classes/java/util/Comparator.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/Comparator.java Tue Apr 18 07:49:09 2017 -0700 @@ -94,7 +94,7 @@ * an equivalence relation. * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <T> the type of objects that may be compared by this comparator
--- a/jdk/src/java.base/share/classes/java/util/Deque.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/Deque.java Tue Apr 18 07:49:09 2017 -0700 @@ -181,9 +181,9 @@ * methods, but instead inherit the identity-based versions from class * {@code Object}. * - * <p>This interface is a member of the <a - * href="{@docRoot}/../technotes/guides/collections/index.html"> Java Collections - * Framework</a>. + * <p>This interface is a member of the + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> + * Java Collections Framework</a>. * * @author Doug Lea * @author Josh Bloch
--- a/jdk/src/java.base/share/classes/java/util/EnumMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/EnumMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -68,7 +68,7 @@ * {@link HashMap} counterparts. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Josh Bloch
--- a/jdk/src/java.base/share/classes/java/util/EnumSet.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/EnumSet.java Tue Apr 18 07:49:09 2017 -0700 @@ -69,7 +69,7 @@ * constant time if their argument is also an enum set. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Josh Bloch
--- a/jdk/src/java.base/share/classes/java/util/HashMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/HashMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -117,7 +117,7 @@ * should be used only to detect bugs.</i> * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <K> the type of keys maintained by this map
--- a/jdk/src/java.base/share/classes/java/util/HashSet.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/HashSet.java Tue Apr 18 07:49:09 2017 -0700 @@ -72,7 +72,7 @@ * should be used only to detect bugs.</i> * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <E> the type of elements maintained by this set
--- a/jdk/src/java.base/share/classes/java/util/Hashtable.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/Hashtable.java Tue Apr 18 07:49:09 2017 -0700 @@ -106,7 +106,7 @@ * * <p>As of the Java 2 platform v1.2, this class was retrofitted to * implement the {@link Map} interface, making it a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * * Java Collections Framework</a>. Unlike the new collection * implementations, {@code Hashtable} is synchronized. If a
--- a/jdk/src/java.base/share/classes/java/util/IdentityHashMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/IdentityHashMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -122,7 +122,7 @@ * {@link HashMap} (which uses <i>chaining</i> rather than linear-probing). * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @see System#identityHashCode(Object)
--- a/jdk/src/java.base/share/classes/java/util/Iterator.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/Iterator.java Tue Apr 18 07:49:09 2017 -0700 @@ -40,7 +40,7 @@ * </ul> * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @apiNote
--- a/jdk/src/java.base/share/classes/java/util/LinkedHashMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/LinkedHashMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -140,7 +140,7 @@ * <em>fail-fast</em>, and additionally report {@link Spliterator#ORDERED}. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @implNote
--- a/jdk/src/java.base/share/classes/java/util/LinkedHashSet.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/LinkedHashSet.java Tue Apr 18 07:49:09 2017 -0700 @@ -100,7 +100,7 @@ * should be used only to detect bugs.</i> * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <E> the type of elements maintained by this set
--- a/jdk/src/java.base/share/classes/java/util/LinkedList.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/LinkedList.java Tue Apr 18 07:49:09 2017 -0700 @@ -70,7 +70,7 @@ * should be used only to detect bugs.</i> * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Josh Bloch
--- a/jdk/src/java.base/share/classes/java/util/List.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/List.java Tue Apr 18 07:49:09 2017 -0700 @@ -114,7 +114,7 @@ * </ul> * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <E> the type of elements in this list
--- a/jdk/src/java.base/share/classes/java/util/ListIterator.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/ListIterator.java Tue Apr 18 07:49:09 2017 -0700 @@ -46,7 +46,7 @@ * {@link #previous()}. * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Josh Bloch
--- a/jdk/src/java.base/share/classes/java/util/Map.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/Map.java Tue Apr 18 07:49:09 2017 -0700 @@ -140,7 +140,7 @@ * </ul> * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <K> the type of keys maintained by this map
--- a/jdk/src/java.base/share/classes/java/util/NavigableMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/NavigableMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -85,7 +85,7 @@ * {@link #keySet()} can be overridden to return {@link NavigableSet}. * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Doug Lea
--- a/jdk/src/java.base/share/classes/java/util/NavigableSet.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/NavigableSet.java Tue Apr 18 07:49:09 2017 -0700 @@ -79,7 +79,7 @@ * {@code NavigableSet}. * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Doug Lea
--- a/jdk/src/java.base/share/classes/java/util/PriorityQueue.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/PriorityQueue.java Tue Apr 18 07:49:09 2017 -0700 @@ -73,7 +73,7 @@ * ({@code peek}, {@code element}, and {@code size}). * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/Queue.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/Queue.java Tue Apr 18 07:49:09 2017 -0700 @@ -125,7 +125,7 @@ * ordering properties. * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/RandomAccess.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/RandomAccess.java Tue Apr 18 07:49:09 2017 -0700 @@ -59,7 +59,7 @@ * </pre> * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.4
--- a/jdk/src/java.base/share/classes/java/util/Set.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/Set.java Tue Apr 18 07:49:09 2017 -0700 @@ -91,7 +91,7 @@ * </ul> * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <E> the type of elements maintained by this set
--- a/jdk/src/java.base/share/classes/java/util/SortedMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/SortedMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -93,7 +93,7 @@ * SortedMap<String, V> sub = m.subMap(low+"\0", high);</pre> * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <K> the type of keys maintained by this map
--- a/jdk/src/java.base/share/classes/java/util/SortedSet.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/SortedSet.java Tue Apr 18 07:49:09 2017 -0700 @@ -89,7 +89,7 @@ * SortedSet<String> sub = s.subSet(low+"\0", high);</pre> * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <E> the type of elements maintained by this set
--- a/jdk/src/java.base/share/classes/java/util/TreeMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/TreeMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -92,7 +92,7 @@ * associated map using {@code put}.) * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <K> the type of keys maintained by this map
--- a/jdk/src/java.base/share/classes/java/util/TreeSet.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/TreeSet.java Tue Apr 18 07:49:09 2017 -0700 @@ -74,7 +74,7 @@ * should be used only to detect bugs.</i> * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <E> the type of elements maintained by this set
--- a/jdk/src/java.base/share/classes/java/util/Vector.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/Vector.java Tue Apr 18 07:49:09 2017 -0700 @@ -70,7 +70,7 @@ * * <p>As of the Java 2 platform v1.2, this class was retrofitted to * implement the {@link List} interface, making it a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. Unlike the new collection * implementations, {@code Vector} is synchronized. If a thread-safe * implementation is not needed, it is recommended to use {@link
--- a/jdk/src/java.base/share/classes/java/util/WeakHashMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/WeakHashMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -120,7 +120,7 @@ * should be used only to detect bugs.</i> * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @param <K> the type of keys maintained by this map
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java Tue Apr 18 07:49:09 2017 -0700 @@ -76,7 +76,7 @@ * methods of the {@link Collection} and {@link Iterator} interfaces. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/concurrent/BlockingDeque.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/BlockingDeque.java Tue Apr 18 07:49:09 2017 -0700 @@ -193,7 +193,7 @@ * the {@code BlockingDeque} in another thread. * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.6
--- a/jdk/src/java.base/share/classes/java/util/concurrent/BlockingQueue.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/BlockingQueue.java Tue Apr 18 07:49:09 2017 -0700 @@ -170,7 +170,7 @@ * the {@code BlockingQueue} in another thread. * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -254,7 +254,7 @@ * <p>All arguments to all task methods must be non-null. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java Tue Apr 18 07:49:09 2017 -0700 @@ -85,7 +85,7 @@ * the {@code ConcurrentLinkedDeque} in another thread. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.7
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java Tue Apr 18 07:49:09 2017 -0700 @@ -99,7 +99,7 @@ * the {@code ConcurrentLinkedQueue} in another thread. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -61,7 +61,7 @@ * the {@code ConcurrentMap} in another thread. * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentNavigableMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentNavigableMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -43,7 +43,7 @@ * and recursively so for its navigable sub-maps. * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Doug Lea
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java Tue Apr 18 07:49:09 2017 -0700 @@ -106,7 +106,7 @@ * elements. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Doug Lea
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java Tue Apr 18 07:49:09 2017 -0700 @@ -87,7 +87,7 @@ * distinguished from the absence of elements. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @author Doug Lea
--- a/jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java Tue Apr 18 07:49:09 2017 -0700 @@ -82,7 +82,7 @@ * the {@code CopyOnWriteArrayList} in another thread. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java Tue Apr 18 07:49:09 2017 -0700 @@ -87,7 +87,7 @@ * }}</pre> * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @see CopyOnWriteArrayList
--- a/jdk/src/java.base/share/classes/java/util/concurrent/DelayQueue.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/DelayQueue.java Tue Apr 18 07:49:09 2017 -0700 @@ -67,7 +67,7 @@ * particular order. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java Tue Apr 18 07:49:09 2017 -0700 @@ -68,7 +68,7 @@ * methods of the {@link Collection} and {@link Iterator} interfaces. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.6
--- a/jdk/src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java Tue Apr 18 07:49:09 2017 -0700 @@ -71,7 +71,7 @@ * methods of the {@link Collection} and {@link Iterator} interfaces. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java Tue Apr 18 07:49:09 2017 -0700 @@ -81,7 +81,7 @@ * the {@code LinkedTransferQueue} in another thread. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.7
--- a/jdk/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java Tue Apr 18 07:49:09 2017 -0700 @@ -101,7 +101,7 @@ * }}</pre> * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java Tue Apr 18 07:49:09 2017 -0700 @@ -80,7 +80,7 @@ * methods of the {@link Collection} and {@link Iterator} interfaces. * * <p>This class is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.5
--- a/jdk/src/java.base/share/classes/java/util/concurrent/TransferQueue.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/concurrent/TransferQueue.java Tue Apr 18 07:49:09 2017 -0700 @@ -58,7 +58,7 @@ * and {@code transfer} are effectively synonymous. * * <p>This interface is a member of the - * <a href="{@docRoot}/../technotes/guides/collections/index.html"> + * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework"> * Java Collections Framework</a>. * * @since 1.7
--- a/jdk/src/java.base/share/classes/java/util/package-info.java Mon Apr 17 19:23:43 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/util/package-info.java Tue Apr 18 07:49:09 2017 -0700 @@ -29,7 +29,7 @@ * miscellaneous utility classes (a string tokenizer, a random-number * generator, and a bit array). * - * <h2>Package Specification</h2> + * <h2><a name="CollectionsFramework"></a>{@index "Java Collections Framework"}</h2> * <ul> * <li><a href="../../../technotes/guides/collections/overview.html"><b>Collections Framework Overview</b></a> * <li><a href="../../../technotes/guides/collections/reference.html"><b>