7179006: [macosx] Print-to-file doesn't work: printing to the default printer instead.

Reviewed-by: serb

Author: prrace

src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java

@@ -30,13 +30,15 @@
 importjava.awt.geom.Rectangle2D;
 importjava.awt.image.BufferedImage;
 importjava.awt.print.*;
+importjava.net.URI;
 importjava.security.AccessController;
 importjava.security.PrivilegedAction;
 
 importjavax.print.*;
 importjavax.print.attribute.PrintRequestAttributeSet;
 importjavax.print.attribute.HashPrintRequestAttributeSet;
 importjavax.print.attribute.standard.Copies;
+importjavax.print.attribute.standard.Destination;
 importjavax.print.attribute.standard.Media;
 importjavax.print.attribute.standard.MediaPrintableArea;
 importjavax.print.attribute.standard.MediaSize;
@@ -251,6 +253,21 @@ private void setPrintToFile(boolean printToFile) {
 isPrintToFile = printToFile;
  }
 
+privatevoidsetDestinationFile(Stringdest) {
+if (attributes != null && dest != null) {
+try {
+URIdestURI = newURI(dest);
+attributes.add(newDestination(destURI));
+destinationAttr = "" + destURI.getSchemeSpecificPart();
+ } catch (Exceptione) {
+ }
+ }
+ }
+
+privateStringgetDestinationFile() {
+returndestinationAttr;
+ }
+
 @Override
 publicvoidprint(PrintRequestAttributeSetattributes) throwsPrinterException {
 // NOTE: Some of this code is copied from RasterPrinterJob.

src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m

@@ -316,21 +316,25 @@ static void nsPrintInfoToJavaPrinterJob(JNIEnv* env, NSPrintInfo* src, jobject d
 staticJNF_MEMBER_CACHE(jm_setCollated, sjc_CPrinterJob, "setCollated", "(Z)V");
 staticJNF_MEMBER_CACHE(jm_setPageRangeAttribute, sjc_CPrinterJob, "setPageRangeAttribute", "(IIZ)V");
 staticJNF_MEMBER_CACHE(jm_setPrintToFile, sjc_CPrinterJob, "setPrintToFile", "(Z)V");
-
-if (src.jobDisposition == NSPrintSaveJob) {
-JNFCallVoidMethod(env, dstPrinterJob, jm_setPrintToFile, true);
- } else {
-JNFCallVoidMethod(env, dstPrinterJob, jm_setPrintToFile, false);
- }
+staticJNF_MEMBER_CACHE(jm_setDestinationFile, sjc_CPrinterJob, "setDestinationFile", "(Ljava/lang/String;)V");
 
 // get the selected printer's name, and set the appropriate PrintService on the Java side
 NSString *name = [[src printer] name];
  jstring printerName = JNFNSToJavaString(env, name);
 JNFCallVoidMethod(env, dstPrinterJob, jm_setService, printerName);
 
-
 NSMutableDictionary* printingDictionary = [src dictionary];
 
+if (src.jobDisposition == NSPrintSaveJob) {
+JNFCallVoidMethod(env, dstPrinterJob, jm_setPrintToFile, true);
+NSURL *url = [printingDictionary objectForKey:NSPrintJobSavingURL];
+NSString *nsStr = [url absoluteString];
+ jstring str = JNFNSToJavaString(env, nsStr);
+JNFCallVoidMethod(env, dstPrinterJob, jm_setDestinationFile, str);
+ } else {
+JNFCallVoidMethod(env, dstPrinterJob, jm_setPrintToFile, false);
+ }
+
 NSNumber* nsCopies = [printingDictionary objectForKey:NSPrintCopies];
 if ([nsCopies respondsToSelector:@selector(integerValue)])
  {
@@ -384,6 +388,8 @@ static void javaPrinterJobToNSPrintInfo(JNIEnv* env, jobject srcPrinterJob, jobj
 staticJNF_MEMBER_CACHE(jm_getSelectAttrib, sjc_CPrinterJob, "getSelectAttrib", "()I");
 staticJNF_MEMBER_CACHE(jm_getNumberOfPages, jc_Pageable, "getNumberOfPages", "()I");
 staticJNF_MEMBER_CACHE(jm_getPageFormat, sjc_CPrinterJob, "getPageFormatFromAttributes", "()Ljava/awt/print/PageFormat;");
+staticJNF_MEMBER_CACHE(jm_getDestinationFile, sjc_CPrinterJob,
+"getDestinationFile", "()Ljava/lang/String;");
 
 NSMutableDictionary* printingDictionary = [dst dictionary];
 
@@ -423,6 +429,16 @@ static void javaPrinterJobToNSPrintInfo(JNIEnv* env, jobject srcPrinterJob, jobj
 if (page != NULL) {
 javaPageFormatToNSPrintInfo(env, NULL, page, dst);
  }
+
+ jstring dest = JNFCallObjectMethod(env, srcPrinterJob, jm_getDestinationFile);
+if (dest != NULL) {
+ [dst setJobDisposition:NSPrintSaveJob];
+NSString *nsDestStr = JNFJavaToNSString(env, dest);
+NSURL *nsURL = [NSURLfileURLWithPath:nsDestStr isDirectory:NO];
+ [printingDictionary setObject:nsURL forKey:NSPrintJobSavingURL];
+ } else {
+ [dst setJobDisposition:NSPrintSpoolJob];
+ }
 }
 
 /*

test/jdk/java/awt/print/Dialog/PrintDlgApp.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -23,76 +23,86 @@
 
 /*
  @test
- @bug 4865976 7158366
- @summary Pass if it program exits.
+ @key printer
+ @bug 4865976 7158366 7179006
+ @summary Pass if program exits.
  @run main/manual PrintDlgApp
 */
-importjava.awt.*;
-importjava.awt.print.*;
-importjavax.print.attribute.*;
+
+importjava.io.File;
+importjava.net.URI;
+importjava.awt.Color;
+importjava.awt.Graphics;
+importjava.awt.Graphics2D;
+importjava.awt.print.PageFormat;
+importjava.awt.print.Printable;
+importjava.awt.print.PrinterJob;
+importjava.awt.print.PrinterException;
+importjavax.print.attribute.HashPrintRequestAttributeSet;
+importjavax.print.attribute.PrintRequestAttributeSet;
 importjavax.print.attribute.standard.Copies;
 importjavax.print.attribute.standard.Destination;
-importjava.util.Locale;
 
-importjavax.print.*;
+publicclassPrintDlgAppimplementsPrintable {
 
-classPrintDlgAppimplementsPrintable {
-/**
- * Constructor
- */
-publicPrintDlgApp() {
-super();
- }
-/**
- * Starts the application.
- */
-publicstaticvoidmain(java.lang.String[] args) {
-PrintDlgApppd = newPrintDlgApp();
-PrinterJobpj = PrinterJob.getPrinterJob();
-System.out.println(pj);
-PrintRequestAttributeSetpSet = newHashPrintRequestAttributeSet();
-pSet.add(newCopies(1));
-//PageFormat pf = pj.pageDialog(pSet);
-PageFormatpf = newPageFormat();
-System.out.println("Setting Printable...pf = "+pf);
-if (pf == null) {
-return;
- }
-pj.setPrintable(pd,pf);
+publicPrintDlgApp() {}
 
-//try { pj.setPrintService(services[0]); } catch(Exception e) { e.printStackTrace(); }
-pSet.add(newDestination(newjava.io.File("./out.prn").toURI()));
-System.out.println("open PrintDialog..");
-for (inti=0; i<2; i++) {
-if (pj.printDialog(pSet)) {
-try {
-System.out.println("About to print the data ...");
-pj.print(pSet);
-System.out.println("Printed");
- }
-catch (PrinterExceptionpe) {
-pe.printStackTrace();
- }
- }
- }
+publicstaticvoidmain(String[] args) {
+PrinterJobpj = PrinterJob.getPrinterJob();
+if (pj.getPrintService() == null) {
+System.out.println("No printers installed. Skipping test");
+return;
+ }
 
- }
+PrintDlgApppd = newPrintDlgApp();
+PageFormatpf = newPageFormat();
+pj.setPrintable(pd, pf);
+
+PrintRequestAttributeSetpSet = newHashPrintRequestAttributeSet();
+pSet.add(newCopies(1));
+
+Destinationdest = null;
+for (inti=0; i<2; i++) {
+Filefile = newFile("./out"+i+".prn");
+dest = newDestination(file.toURI());
+pSet.add(dest);
+System.out.println("open PrintDialog.");
+if (pj.printDialog(pSet)) {
+// In case tester changes the destination :
+dest = (Destination)pSet.get(Destination.class);
+System.out.println("DEST="+dest);
+if (dest != null) {
+URIuri = dest.getURI();
+file = newFile(uri.getSchemeSpecificPart());
+System.out.println("will be checking for file " + file);
+ }
+try {
+System.out.println("About to print the data ...");
+pj.print(pSet);
+System.out.println("Printed.");
+ }
+catch (PrinterExceptionpe) {
+pe.printStackTrace();
+ }
+ }
+if (dest != null && !file.exists()) {
+thrownewRuntimeException("No file created");
+ }
+ }
+ }
 
-//printable interface
-publicintprint(Graphicsg, PageFormatpf, intpi) throws
-PrinterException {
+publicintprint(Graphicsg, PageFormatpf, intpi) throwsPrinterException {
 
-if (pi > 0) {
-System.out.println("pi is greater than 0");
-returnPrintable.NO_SUCH_PAGE;
- }
-// Simply draw two rectangles
-Graphics2Dg2 = (Graphics2D)g;
-g2.setColor(Color.black);
-g2.translate(pf.getImageableX(), pf.getImageableY());
-g2.drawRect(1,1,200,300);
-g2.drawRect(1,1,25,25);
-System.out.println("print method called "+pi);
-returnPrintable.PAGE_EXISTS;
+if (pi > 0) {
+returnPrintable.NO_SUCH_PAGE;
  }
+// Simply draw two rectangles
+Graphics2Dg2 = (Graphics2D)g;
+g2.setColor(Color.black);
+g2.translate(pf.getImageableX(), pf.getImageableY());
+g2.drawRect(1,1,200,300);
+g2.drawRect(1,1,25,25);
+System.out.println("print method called "+pi);
+returnPrintable.PAGE_EXISTS;
+ }
 }

test/jdk/java/awt/print/PrinterJob/PrintToFileTest.java

@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+/**
+ * @test
+ * @key printer
+ * @bug 7179006
+ * @summary Confirm printing to file works.
+*/
+
+importjava.io.File;
+importjava.net.URI;
+importjava.awt.Color;
+importjava.awt.Graphics;
+importjava.awt.Graphics2D;
+importjava.awt.print.PageFormat;
+importjava.awt.print.Printable;
+importjava.awt.print.PrinterJob;
+importjava.awt.print.PrinterException;
+importjavax.print.attribute.HashPrintRequestAttributeSet;
+importjavax.print.attribute.PrintRequestAttributeSet;
+importjavax.print.attribute.standard.Destination;
+
+publicclassPrintToFileTestimplementsPrintable {
+
+publicPrintToFileTest() {}
+
+publicstaticvoidmain(String[] args) throwsException {
+PrinterJobpj = PrinterJob.getPrinterJob();
+if (pj.getPrintService() == null) {
+System.out.println("No printers installed. Skipping test.");
+return;
+ }
+pj.setPrintable(newPrintToFileTest(), newPageFormat());
+PrintRequestAttributeSetpSet = newHashPrintRequestAttributeSet();
+Filefile = newFile("./out.prn");
+pSet.add(newDestination(file.toURI()));
+pj.print(pSet);
+if (!file.exists()) {
+thrownewRuntimeException("No file created");
+ }
+ }
+
+publicintprint(Graphicsg, PageFormatpf, intpi) throws
+PrinterException {
+
+if (pi > 0) {
+returnPrintable.NO_SUCH_PAGE;
+ }
+Graphics2Dg2 = (Graphics2D)g;
+g2.setColor(Color.black);
+g2.translate(pf.getImageableX(), pf.getImageableY());
+g2.drawRect(1,1,200,300);
+g2.drawRect(1,1,25,25);
+returnPrintable.PAGE_EXISTS;
+ }
+}