5080098: Page Range must be disabled on the common print dlg for Non serv-formatted flvrs
Reviewed-by: prr, jdv
--- a/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java Tue Aug 09 10:17:51 2016 +0300
+++ b/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java Tue Aug 09 13:22:58 2016 +0530
@@ -977,6 +977,7 @@
private JFormattedTextField tfRangeFrom, tfRangeTo;
private JLabel lblRangeTo;
private boolean prSupported;
+ private boolean prPgRngSupported;
public PrintRangePanel() {
super();
@@ -1090,7 +1091,7 @@
public void focusGained(FocusEvent e) {}
private void setupRangeWidgets() {
- boolean rangeEnabled = (rbPages.isSelected() && prSupported);
+ boolean rangeEnabled = (rbPages.isSelected() && prPgRngSupported);
tfRangeFrom.setEnabled(rangeEnabled);
tfRangeTo.setEnabled(rangeEnabled);
lblRangeTo.setEnabled(rangeEnabled);
@@ -1136,6 +1137,9 @@
if (psCurrent.isAttributeCategorySupported(prCategory) ||
isAWT) {
prSupported = true;
+ prPgRngSupported = psCurrent.isAttributeValueSupported(prAll,
+ docFlavor,
+ asCurrent);
}
SunPageSelection select = SunPageSelection.ALL;
@@ -1175,7 +1179,7 @@
tfRangeFrom.setValue(min);
tfRangeTo.setValue(max);
rbAll.setEnabled(prSupported);
- rbPages.setEnabled(prSupported);
+ rbPages.setEnabled(prPgRngSupported);
setupRangeWidgets();
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/print/attribute/ServiceDlgPageRangeTest.java Tue Aug 09 13:22:58 2016 +0530
@@ -0,0 +1,170 @@
+/*
+ * 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 5080098
+ * @summary Verify if PageRanges option is disabled for Non service-formatted
+ * flavors.
+ * @run main/manual ServiceDlgPageRangeTest
+ */
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import javax.print.DocFlavor;
+import javax.print.PrintService;
+import javax.print.PrintServiceLookup;
+import javax.print.ServiceUI;
+import javax.print.attribute.Attribute;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.standard.PageRanges;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+
+public class ServiceDlgPageRangeTest {
+
+ private static Thread mainThread;
+ private static boolean testPassed;
+ private static boolean testGeneratedInterrupt;
+ private static DocFlavor flavor = DocFlavor.INPUT_STREAM.JPEG;
+ private static PrintService services[];
+
+ /**
+ * Starts the application.
+ */
+ public static void printTest() {
+
+ System.out.println("\nDefault print service: " +
+ PrintServiceLookup.lookupDefaultPrintService());
+ System.out.println("is flavor: "+flavor+" supported? "+
+ services[0].isDocFlavorSupported(flavor));
+ System.out.println("is Page Ranges category supported? "+
+ services[0].isAttributeCategorySupported(PageRanges.class));
+ System.out.println("is PageRanges[2] value supported ? "+
+ services[0].isAttributeValueSupported(
+ new PageRanges(2), flavor, null));
+
+ HashPrintRequestAttributeSet prSet = new HashPrintRequestAttributeSet();
+ //prSet.add(new PageRanges(2));
+ PrintService selService = ServiceUI.printDialog(null, 200, 200,
+ services, services[0], flavor, prSet);
+
+ System.out.println("\nSelected Values\n");
+ Attribute attr[] = prSet.toArray();
+ for (int x = 0; x < attr.length; x ++) {
+ System.out.println("Attribute: " + attr[x].getName() +
+ " Value: " + attr[x]);
+ }
+ }
+
+ /**
+ * Starts the application.
+ */
+ public static void main(java.lang.String[] args) throws Exception {
+ services = PrintServiceLookup.lookupPrintServices(flavor, null);
+
+ if (services.length == 0) {
+ System.out.println("No print service found!!");
+ return;
+ }
+ SwingUtilities.invokeAndWait(() -> {
+ doTest(ServiceDlgPageRangeTest::printTest);
+ });
+ mainThread = Thread.currentThread();
+ try {
+ Thread.sleep(600000);
+ } catch (InterruptedException e) {
+ if (!testPassed && testGeneratedInterrupt) {
+ throw new RuntimeException("PageRanges option is not disabled "
+ + "for for Non serv-formatted flvrs");
+ }
+ }
+ 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"
+ + " A print dialog will be shown.\n "
+ + " Please verify Pages(From/To) option is disabled.\n"
+ + " Press Cancel to close the print dialog.\n"
+ + " If Pages(From/To) option is 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);
+ dialog.addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosing(WindowEvent e) {
+ System.out.println("main dialog closing");
+ testGeneratedInterrupt = false;
+ mainThread.interrupt();
+ }
+ });
+ }
+}