changeset 60044:3bc4fdc6fae9

7131400: [macosx] Desktop.edit(a directory) should throw IOException Reviewed-by: pbansal, aivanov
author serb
date Mon, 22 Jun 2020 06:48:26 +0100
parents b1bd79b486bc
children b6d22e7369b9
files src/java.desktop/share/classes/java/awt/Desktop.java test/jdk/java/awt/Desktop/EditPrintFolder.java
diffstat 2 files changed, 69 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/share/classes/java/awt/Desktop.java	Wed Jun 10 12:43:22 2020 +0530
+++ b/src/java.desktop/share/classes/java/awt/Desktop.java	Mon Jun 22 06:48:26 2020 +0100
@@ -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 @@
         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 @@
         }
         checkActionSupport(Action.PRINT);
         checkFileValidation(file);
-
+        if (file.isDirectory()) {
+            throw new IOException(file.getPath() + " is a directory");
+        }
         peer.print(file);
     }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/Desktop/EditPrintFolder.java	Mon Jun 22 06:48:26 2020 +0100
@@ -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
+                }
+            }
+        }
+    }
+}