6529030: Java Printing: Print range > Selection gets enabled

Reviewed-by: prr, jgodinez

jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java

@@ -1852,12 +1852,14 @@ public final class WPrinterJob extends RasterPrinterJob
             setCollateAttrib(SheetCollate.UNCOLLATED, attributes);
         }
 
-        if ((flags & PD_PAGENUMS) != 0) {
-            attributes.add(SunPageSelection.RANGE);
-        } else if ((flags & PD_SELECTION) != 0) {
-            attributes.add(SunPageSelection.SELECTION);
-        } else {
-            attributes.add(SunPageSelection.ALL);
+        if ((flags & PD_NOSELECTION) != PD_NOSELECTION) {
+            if ((flags & PD_PAGENUMS) != 0) {
+                attributes.add(SunPageSelection.RANGE);
+            } else if ((flags & PD_SELECTION) != 0) {
+                attributes.add(SunPageSelection.SELECTION);
+            } else {
+                attributes.add(SunPageSelection.ALL);
+            }
         }
 
         if ((fields & DM_ORIENTATION) != 0) {

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

@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2016, 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 6529030
+ * @summary  Verifies if Java Printing: Selection radiobutton gets enabled.
+ * @requires (os.family == "windows")
+ * @run main/manual PrintDlgSelectionAttribTest
+ */
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.print.Printable;
+import java.awt.print.PageFormat;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+
+public class PrintDlgSelectionAttribTest {
+
+    private static Thread mainThread;
+    private static boolean testPassed;
+    private static boolean testGeneratedInterrupt;
+    private static PrinterJob printJob;
+
+    public static void print() {
+
+        // Set working printable to print pages
+        printJob.setPrintable(new Printable() {
+            public int print(Graphics graphics, PageFormat pageFormat,
+                    int pageIndex) throws PrinterException {
+                return NO_SUCH_PAGE;
+            }
+        });
+
+        // Display Print dialog
+        if (!printJob.printDialog()) {
+            System.out.println("\tPrinting canceled by user");
+            return;
+        }
+
+        try {
+            printJob.print();
+        } catch (PrinterException e) {
+        }
+    }
+
+    public static void printTest() {
+        printJob = PrinterJob.getPrinterJob();
+        System.out.println(" -=- Starting printing #1 -=-");
+        print();
+        System.out.println(" -=- Starting printing #2 -=-");
+        print();
+    }
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            doTest(PrintDlgSelectionAttribTest::printTest);
+        });
+        mainThread = Thread.currentThread();
+        try {
+            Thread.sleep(30000);
+        } catch (InterruptedException e) {
+            if (!testPassed && testGeneratedInterrupt) {
+                throw new RuntimeException(""
+                        + "Selection radio button is enabled in print dialog");
+            }
+        }
+        if (!testGeneratedInterrupt) {
+            throw new RuntimeException("user has not executed the test");
+        }
+    }
+
+    public static synchronized void pass() {
+        testPassed = true;
+        testGeneratedInterrupt = true;
+        mainThread.interrupt();
+    }
+
+    public static synchronized void fail() {
+        testPassed = false;
+        testGeneratedInterrupt = true;
+        mainThread.interrupt();
+    }
+
+    private static void doTest(Runnable action) {
+        String description
+                = " Visual inspection of print dialog is required.\n"
+                + " Initially, a print dialog will be shown.\n "
+                + " Please verify Selection radio button is disabled.\n"
+                + " Press OK. Then 2nd print dialog will be shown.\n"
+                + " Please verify the Selection radio button is disabled\n"
+                + " in 2nd print dialog. If disabled, press PASS else press fail";
+
+        final JDialog dialog = new JDialog();
+        dialog.setTitle("printSelectionTest");
+        JTextArea textArea = new JTextArea(description);
+        textArea.setEditable(false);
+        final JButton testButton = new JButton("Start Test");
+        final JButton passButton = new JButton("PASS");
+        passButton.setEnabled(false);
+        passButton.addActionListener((e) -> {
+            dialog.dispose();
+            pass();
+        });
+        final JButton failButton = new JButton("FAIL");
+        failButton.setEnabled(false);
+        failButton.addActionListener((e) -> {
+            dialog.dispose();
+            fail();
+        });
+        testButton.addActionListener((e) -> {
+            testButton.setEnabled(false);
+            action.run();
+            passButton.setEnabled(true);
+            failButton.setEnabled(true);
+        });
+        JPanel mainPanel = new JPanel(new BorderLayout());
+        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);
+    }
+}