# HG changeset patch # User psadhukhan # Date 1538645628 -19800 # Node ID f49c340e3f390863e9fb7af795f339affd86fa7d # Parent 651c3558ae2b6330c9190db85d6a10cf2b43118d 8211055: Provide print to a file (PDF) feature even when printer was not connected Reviewed-by: prr diff -r 651c3558ae2b -r f49c340e3f39 src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java --- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java Thu Oct 04 14:56:03 2018 +0530 +++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java Thu Oct 04 15:03:48 2018 +0530 @@ -246,18 +246,22 @@ } } + boolean isPrintToFile = false; + private void setPrintToFile(boolean printToFile) { + isPrintToFile = printToFile; + } + @Override public void print(PrintRequestAttributeSet attributes) throws PrinterException { // NOTE: Some of this code is copied from RasterPrinterJob. - // this code uses javax.print APIs // this will make it print directly to the printer // this will not work if the user clicks on the "Preview" button // However if the printer is a StreamPrintService, its the right path. PrintService psvc = getPrintService(); - if (psvc == null) { + if (psvc == null && !isPrintToFile) { throw new PrinterException("No print service found."); } diff -r 651c3558ae2b -r f49c340e3f39 src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m Thu Oct 04 14:56:03 2018 +0530 +++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m Thu Oct 04 15:03:48 2018 +0530 @@ -315,6 +315,14 @@ static JNF_MEMBER_CACHE(jm_setCopiesAttribute, sjc_CPrinterJob, "setCopiesAttribute", "(I)V"); static JNF_MEMBER_CACHE(jm_setCollated, sjc_CPrinterJob, "setCollated", "(Z)V"); static JNF_MEMBER_CACHE(jm_setPageRangeAttribute, sjc_CPrinterJob, "setPageRangeAttribute", "(IIZ)V"); + static JNF_MEMBER_CACHE(jm_setPrintToFile, sjc_CPrinterJob, "setPrintToFile", "(Z)V"); + + NSPrintJobDispositionValue jobDisposition = [src jobDisposition]; + if (jobDisposition == NSPrintSaveJob) { + JNFCallVoidMethod(env, dstPrinterJob, jm_setPrintToFile, true); + } else { + JNFCallVoidMethod(env, dstPrinterJob, jm_setPrintToFile, false); + } // get the selected printer's name, and set the appropriate PrintService on the Java side NSString *name = [[src printer] name]; diff -r 651c3558ae2b -r f49c340e3f39 test/jdk/java/awt/print/PrinterJob/TestSaveFileWithoutPrinter.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/awt/print/PrinterJob/TestSaveFileWithoutPrinter.java Thu Oct 04 15:03:48 2018 +0530 @@ -0,0 +1,218 @@ +/* + * Copyright (c) 2018, 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 8211055 + @summary Verifies "print to file" works even when there is no printer + @requires (os.family == "mac") + @run main/manual TestSaveFileWithoutPrinter + */ + +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.Graphics; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.print.Printable; +import java.awt.print.PageFormat; +import java.awt.print.PrinterException; +import java.awt.print.PrinterJob; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextArea; +import javax.swing.SwingUtilities; +import javax.swing.Timer; +import javax.swing.WindowConstants; + +public class TestSaveFileWithoutPrinter implements Printable { + private static final CountDownLatch testEndedSignal = new CountDownLatch(1); + private static final int testTimeout = 300000; + private static volatile String testFailureMsg; + private static volatile boolean testPassed; + private static volatile boolean testFinished; + private static PrinterJob job; + + public static void main(String[] args) { + job = PrinterJob.getPrinterJob(); + if (job.getPrintService() != null) { + System.out.println("This test requires no printers to be installed. Exiting."); + return; + } + SwingUtilities.invokeLater(() -> createAndShowTestDialog()); + + try { + if (!testEndedSignal.await(testTimeout, TimeUnit.MILLISECONDS)) { + throw new RuntimeException(String.format( + "Test timeout '%d ms' elapsed.", testTimeout)); + } + if (!testPassed) { + String failureMsg = testFailureMsg; + if ((failureMsg != null) && (!failureMsg.trim().isEmpty())) { + throw new RuntimeException(failureMsg); + } else { + throw new RuntimeException("Test failed."); + } + } + } catch (InterruptedException ie) { + throw new RuntimeException(ie); + } finally { + testFinished = true; + } + } + + private static void doTest() { + job.setPrintable(new TestSaveFileWithoutPrinter()); + if (job.printDialog()) { + try { + job.print(); + } catch (PrinterException pe) { + throw new RuntimeException(pe); + } + } + } + + private static void pass() { + testPassed = true; + testEndedSignal.countDown(); + } + + private static void fail(String failureMsg) { + testFailureMsg = failureMsg; + testPassed = false; + testEndedSignal.countDown(); + } + + private static String convertMillisToTimeStr(int millis) { + if (millis < 0) { + return "00:00:00"; + } + int hours = millis / 3600000; + int minutes = (millis - hours * 3600000) / 60000; + int seconds = (millis - hours * 3600000 - minutes * 60000) / 1000; + return String.format("%02d:%02d:%02d", hours, minutes, seconds); + } + + private static void createAndShowTestDialog() { + String description = + " To run this test it is required to delete any installed printers.\r\n" + + "\r\n" + + " 1. Verify that saving file via \"Save as PDF\" results in saving file\r\n" + + " even if there is no installed printer.\r\n" + + " 2. Click on \"Start Test\" button.\r\n" + + " 3. In the shown print dialog select \"Save as PDF\" in PDF drop-down list\r\n" + + " 4. Another dialog opens prompting for filename, enter any filename and press \"Save\".\r\n" + + "\r\n" + + " If the file is saved without any PrinterException, click on \"PASS\"\r\n" + + " button, otherwise click on \"FAIL\" button."; + + final JDialog dialog = new JDialog(); + dialog.setTitle("SaveFileWithoutPrinter"); + dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); + dialog.addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + dialog.dispose(); + fail("Main dialog was closed."); + } + }); + + final JLabel testTimeoutLabel = new JLabel(String.format( + "Test timeout: %s", convertMillisToTimeStr(testTimeout))); + final long startTime = System.currentTimeMillis(); + final Timer timer = new Timer(0, null); + timer.setDelay(1000); + timer.addActionListener((e) -> { + int leftTime = testTimeout - (int) (System.currentTimeMillis() - startTime); + if ((leftTime < 0) || testFinished) { + timer.stop(); + dialog.dispose(); + } + testTimeoutLabel.setText(String.format( + "Test timeout: %s", convertMillisToTimeStr(leftTime))); + }); + timer.start(); + + JTextArea textArea = new JTextArea(description); + textArea.setEditable(false); + + final JButton testButton = new JButton("Start Test"); + final JButton passButton = new JButton("PASS"); + final JButton failButton = new JButton("FAIL"); + testButton.addActionListener((e) -> { + testButton.setEnabled(false); + new Thread(() -> { + try { + doTest(); + + SwingUtilities.invokeLater(() -> { + passButton.setEnabled(true); + failButton.setEnabled(true); + }); + } catch (Throwable t) { + t.printStackTrace(); + dialog.dispose(); + fail("Exception occurred in a thread executing the test."); + } + }).start(); + }); + passButton.setEnabled(false); + passButton.addActionListener((e) -> { + dialog.dispose(); + pass(); + }); + failButton.setEnabled(false); + failButton.addActionListener((e) -> { + dialog.dispose(); + fail("PrinterException thrown."); + }); + + JPanel mainPanel = new JPanel(new BorderLayout()); + JPanel labelPanel = new JPanel(new FlowLayout()); + labelPanel.add(testTimeoutLabel); + mainPanel.add(labelPanel, BorderLayout.NORTH); + mainPanel.add(textArea, BorderLayout.CENTER); + JPanel buttonPanel = new JPanel(new FlowLayout()); + buttonPanel.add(testButton); + buttonPanel.add(passButton); + buttonPanel.add(failButton); + mainPanel.add(buttonPanel, BorderLayout.SOUTH); + dialog.add(mainPanel); + + dialog.pack(); + dialog.setVisible(true); + } + + @Override + public int print(Graphics g, PageFormat pf, int pageIndex) + throws PrinterException { + if (pageIndex == 0) { + return Printable.PAGE_EXISTS; + } else { + return Printable.NO_SUCH_PAGE; + } + } +}