archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Jesper Wilhelmsson 2022-06-16 12:01:32 +00:00
commit 3d12c0225b
17 changed files with 240 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/java.base/share/classes/java/nio/file/Files.java
View file

@ -1219,10 +1219,9 @@ public final class Files {
* <tbody>
* <tr>
* <th scope="row"> {@link StandardCopyOption#REPLACE_EXISTING REPLACE_EXISTING} </th>
* <td> If the target file exists, then the target file is replaced if it
* is not a non-empty directory. If the target file exists and is a
* symbolic link, then the symbolic link itself, not the target of
* the link, is replaced. </td>
* <td> Replace an existing file. A non-empty directory cannot be
* replaced. If the target file exists and is a symbolic link, then the
* symbolic link itself, not the target of the link, is replaced. </td>
* </tr>
* <tr>
* <th scope="row"> {@link StandardCopyOption#COPY_ATTRIBUTES COPY_ATTRIBUTES} </th>
@ -1342,10 +1341,9 @@ public final class Files {
* <tbody>
* <tr>
* <th scope="row"> {@link StandardCopyOption#REPLACE_EXISTING REPLACE_EXISTING} </th>
* <td> If the target file exists, then the target file is replaced if it
* is not a non-empty directory. If the target file exists and is a
* symbolic link, then the symbolic link itself, not the target of
* the link, is replaced. </td>
* <td> Replace an existing file. A non-empty directory cannot be
* replaced. If the target file exists and is a symbolic link, then the
* symbolic link itself, not the target of the link, is replaced. </td>
* </tr>
* <tr>
* <th scope="row"> {@link StandardCopyOption#ATOMIC_MOVE ATOMIC_MOVE} </th>