changeset 10832:d077f4094685

8061267: PrinterJob: Specified Page Ranges not displayed in Windows Native Print Dialog Reviewed-by: bae, jgodinez
author prr
date Fri, 17 Oct 2014 15:55:02 -0700
parents 996134af077b
children 1afa10d86648
files src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp test/java/awt/print/PrinterJob/PageRangesDlgTest.java
diffstat 2 files changed, 95 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp	Tue Oct 14 14:29:21 2014 -0700
+++ b/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp	Fri Oct 17 15:55:02 2014 -0700
@@ -771,6 +771,17 @@
     jint maxPage = env->CallIntMethod(printCtrl,
                                       AwtPrintControl::getMaxPageID);
     pd.nMaxPage = (maxPage <= (jint)((WORD)-1)) ? (WORD)maxPage : (WORD)-1;
+    // In the event that the application displays the dialog before
+    // installing a Printable, but sets a page range, then max page will be 1
+    // since the default state of a PrinterJob is an empty "Book" Pageable.
+    // Windows pops up an error dialog in such a case which isn't very
+    // forthcoming about the exact problem.
+    // So if we detect this fix up such a problem here.
+    if (pd.nMinPage > pd.nFromPage) pd.nMinPage = pd.nFromPage;
+    if (pd.nMaxPage < pd.nToPage) pd.nMaxPage = pd.nToPage;
+    if (pd.nFromPage > pd.nMinPage || pd.nToPage < pd.nMaxPage) {
+      pd.Flags |= PD_PAGENUMS;
+    }
 
     if (env->CallBooleanMethod(printCtrl,
                                AwtPrintControl::getDestID)) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/awt/print/PrinterJob/PageRangesDlgTest.java	Fri Oct 17 15:55:02 2014 -0700
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2014, 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 8061267
+ * @summary The specified page range should be displayed in the dialog
+ * @run main/manual=yesno PageRangesDlgTest
+ */
+
+import javax.print.*;
+import javax.print.attribute.*;
+import javax.print.attribute.standard.*;
+import java.awt.*;
+import java.awt.print.*;
+
+public class PageRangesDlgTest implements Printable {
+
+    static String[] instr = {
+     "This test is to check that the print dialog displays the specified",
+     "page ranges. You must have a printer installed for this test.",
+     "It is valid only on dialogs which support page ranges",
+     "In each dialog, check that a page range of 2 to 3 is requested",
+     "Optionally press Print instead of Cancel, and verify that the",
+     "correct number/set of pages is printed",
+    };
+
+    public static void main(String args[]) throws Exception {
+        for (int i=0;i<instr.length;i++) {
+            System.out.println(instr[i]);
+        }
+        PrinterJob job = PrinterJob.getPrinterJob();
+        if (job.getPrintService() == null) {
+           System.out.println("No printers. Test cannot continue.");
+           return;
+        }
+        job.setPrintable(new PageRangesDlgTest());
+        PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet();
+        aset.add(new PageRanges(2,3));
+        if (job.printDialog(aset)) {
+           job.print(aset);
+        }
+
+        job = PrinterJob.getPrinterJob();
+        job.setPrintable(new PageRangesDlgTest());
+        aset.add(DialogTypeSelection.NATIVE);
+        if (job.printDialog()) {
+            job.print();
+        }
+    }
+
+    public int print(Graphics g, PageFormat pf, int pi)
+                     throws PrinterException  {
+
+        System.out.println("pi="+pi);
+        if (pi >= 5) {
+            return NO_SUCH_PAGE;
+        }
+
+        g.drawString("Page : " + (pi+1), 200, 200);
+
+        return PAGE_EXISTS;
+    }
+}