infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-19 14:55:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

7131400: [macosx] Desktop.edit(a directory) should throw IOException

Browse Source 
Reviewed-by: pbansal, aivanov
This commit is contained in:
Sergey Bylokhov 2020-06-22 06:48:26 +01:00
parent a6df9ae23a
commit 02201d19c6
2 changed files with 69 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java.desktop/share/classes/java/awt/Desktop.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2020, 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
@ -458,7 +458,9 @@ public class Desktop {
checkActionSupport(Action.EDIT);
file.canWrite();
checkFileValidation(file);
if (file.isDirectory()) {
throw new IOException(file.getPath() + " is a directory");
}
peer.edit(file);
}
@ -491,7 +493,9 @@ public class Desktop {
}
checkActionSupport(Action.PRINT);
checkFileValidation(file);
if (file.isDirectory()) {
throw new IOException(file.getPath() + " is a directory");
}
peer.print(file);
}

62
test/jdk/java/awt/Desktop/EditPrintFolder.java Normal file
View File

@ -0,0 +1,62 @@
/*
* Copyright (c) 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.awt.Desktop;
import java.io.File;
import java.io.IOException;
import java.nio.file.FileSystems;
/**
* @test
* @bug 7131400
* @key headful
* @summary IOException should be thrown if folder is passed to print()/edit()
*/
public final class EditPrintFolder {
public static void main(String[] args) throws IOException {
if (!Desktop.isDesktopSupported()) {
return;
}
File file = FileSystems.getDefault().getPath(".").toFile();
if (file.isDirectory()) {
if (Desktop.getDesktop().isSupported(Desktop.Action.EDIT)) {
try {
Desktop.getDesktop().edit(file);
throw new RuntimeException("IOException was not thrown");
} catch (IOException ignored) {
// ok
}
}
if (Desktop.getDesktop().isSupported(Desktop.Action.PRINT)) {
try {
Desktop.getDesktop().print(file);
throw new RuntimeException("IOException was not thrown");
} catch (IOException ignored) {
// ok
}
}
}
}
}