archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8285368: Overhaul doc-comment inheritance

Browse source 
6376959: Algorithm for Inheriting Method Comments seems to go not as documented
6934301: Support directed inheriting of class comments with @inheritDoc

Reviewed-by: jjg, rriggs, aivanov, smarks, martin
This commit is contained in:
Pavel Rappo 2023-06-15 17:47:41 +00:00
parent 3eeb681a0d
commit 3e0bbd290c
32 changed files with 1736 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
View file

@ -1531,7 +1531,7 @@ public class ConcurrentHashMap<K,V> extends AbstractMap<K,V>
// ConcurrentMap methods
/**
* {@inheritDoc}
* {@inheritDoc ConcurrentMap}
*
* @return the previous value associated with the specified key,
* or {@code null} if there was no mapping for the key
@ -1542,9 +1542,10 @@ public class ConcurrentHashMap<K,V> extends AbstractMap<K,V>
}
/**
* {@inheritDoc}
* {@inheritDoc ConcurrentMap}
*
* @throws NullPointerException if the specified key is null
* @return {@inheritDoc ConcurrentMap}
*/
public boolean remove(Object key, Object value) {
if (key == null)
@ -1553,9 +1554,10 @@ public class ConcurrentHashMap<K,V> extends AbstractMap<K,V>
}
/**
* {@inheritDoc}
* {@inheritDoc ConcurrentMap}
*
* @throws NullPointerException if any of the arguments are null
* @return {@inheritDoc ConcurrentMap}
*/
public boolean replace(K key, V oldValue, V newValue) {
if (key == null || oldValue == null || newValue == null)
@ -1564,7 +1566,7 @@ public class ConcurrentHashMap<K,V> extends AbstractMap<K,V>
}
/**
* {@inheritDoc}
* {@inheritDoc ConcurrentMap}
*
* @return the previous value associated with the specified key,
* or {@code null} if there was no mapping for the key