changeset 14601:43cc5deb748a

7161283: [macosx]filedialog didn't pop up for awt test InvalidParametersNativeTest Reviewed-by: serb, rchamyal
author psadhukhan
date Fri, 06 Nov 2015 19:13:16 +0300
parents 298d3fe64572
children d7a1ecbf9318
files src/java.desktop/share/classes/sun/print/PrintJob2D.java test/java/awt/PrintJob/PrinterException.java
diffstat 2 files changed, 53 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/share/classes/sun/print/PrintJob2D.java	Thu Nov 05 14:08:51 2015 +0300
+++ b/src/java.desktop/share/classes/sun/print/PrintJob2D.java	Fri Nov 06 19:13:16 2015 +0300
@@ -631,7 +631,7 @@
 
         String printerName = jobAttributes.getPrinter();
         if (printerName != null && printerName != ""
-            && !printerName.equals(pServ.getName())) {
+            && pServ != null && !printerName.equals(pServ.getName())) {
 
             // Search for the given printerName in the list of PrintServices
             PrintService []services = PrinterJob.lookupPrintServices();
@@ -648,7 +648,7 @@
         }
 
         DestinationType dest = jobAttributes.getDestination();
-        if (dest == DestinationType.FILE &&
+        if (dest == DestinationType.FILE && pServ != null &&
             pServ.isAttributeCategorySupported(Destination.class)) {
 
             String fileName = jobAttributes.getFileName();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/awt/PrintJob/PrinterException.java	Fri Nov 06 19:13:16 2015 +0300
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+/*
+ * @test
+ * @bug 7161283
+ * @summary  Toolkit.getPrintJob throws NPE if no printer available
+ * @run main PrinterException
+ */
+import java.awt.Frame;
+import java.awt.JobAttributes;
+import java.awt.PrintJob;
+import java.awt.Toolkit;
+
+public class PrinterException {
+    public static void main(String[] args) {
+        Toolkit tk = Toolkit.getDefaultToolkit();
+        PrintJob pj = null;
+
+        int[][] pageRange = new int[][]{new int[]{1,1}};
+        JobAttributes ja = new JobAttributes(1,
+                java.awt.JobAttributes.DefaultSelectionType.ALL,
+                JobAttributes.DestinationType.FILE, JobAttributes.DialogType.NATIVE,
+                "", Integer.MAX_VALUE, 1,
+                JobAttributes.MultipleDocumentHandlingType.SEPARATE_DOCUMENTS_UNCOLLATED_COPIES,
+                 pageRange, "", JobAttributes.SidesType.ONE_SIDED);
+        Frame testFrame = new Frame("print");
+        if (tk != null) {
+            pj = tk.getPrintJob(testFrame, null, ja, null);
+        }
+    }
+}