archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 01:54:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8165947: One more page printed before the test page with OpenJDK

Browse source 
8166259: One more banner page printed before the test page

Reviewed-by: prr, jdv
This commit is contained in:
Prasanta Sadhukhan 2016-09-26 14:47:41 +05:30
parent 8d81ec63b2
commit e319d259e6
2 changed files with 188 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
View file

@ -1282,12 +1282,6 @@ public abstract class RasterPrinterJob extends PrinterJob {
JobSheets jobSheets = (JobSheets)attributes.get(JobSheets.class);
if (jobSheets != null) {
noJobSheet = jobSheets == JobSheets.NONE;
} else {
JobSheets js = (JobSheets)getPrintService().
getDefaultAttributeValue(JobSheets.class);
if (js != null && js.equals(JobSheets.NONE)) {
noJobSheet = true;
}
}
JobName jobName = (JobName)attributes.get(JobName.class);
@ -1487,6 +1481,22 @@ public abstract class RasterPrinterJob extends PrinterJob {
throw new PrinterException("Printer is not accepting job.");
}
/*
* Check the default job-sheet value on underlying platform. If IPP
* reports job-sheets=none, then honour that and modify noJobSheet since
* by default, noJobSheet is false which mean jdk will print banner page.
* This is because if "attributes" is null (if user directly calls print()
* without specifying any attributes and without showing printdialog) then
* setAttribute will return without changing noJobSheet value.
* Also, we do this before setAttributes() call so as to allow the user
* to override this via explicitly adding JobSheets attributes to
* PrintRequestAttributeSet while calling print(attributes)
*/
JobSheets js = (JobSheets)psvc.getDefaultAttributeValue(JobSheets.class);
if (js != null && js.equals(JobSheets.NONE)) {
noJobSheet = true;
}
if ((psvc instanceof SunPrinterJobService) &&
((SunPrinterJobService)psvc).usesClass(getClass())) {
setAttributes(attributes);

172
jdk/test/java/awt/print/PrinterJob/TestCheckSystemDefaultBannerOption.java Normal file
View file

@ -0,0 +1,172 @@
/*
* 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 8165947
* @summary Verifies System default banner page option is honoured by jdk
* @requires (os.family == "linux" | os.family == "solaris")
* @run main/manual TestCheckSystemDefaultBannerOption
*/
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.PageFormat;
import java.awt.print.Printable;
import static java.awt.print.Printable.NO_SUCH_PAGE;
import static java.awt.print.Printable.PAGE_EXISTS;
import java.awt.print.PrinterException;
import java.awt.print.PrinterJob;
import javax.print.attribute.standard.JobSheets;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JPanel;
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
public class TestCheckSystemDefaultBannerOption implements Printable {
private static Thread mainThread;
private static boolean testPassed;
private static boolean testGeneratedInterrupt;
private static boolean noJobSheet = false;
private static PrinterJob job = null;
public static void main (String[] args) throws Exception {
job = PrinterJob.getPrinterJob();
if (job.getPrintService() == null) {
System.out.println("No printers. Test cannot continue");
return;
}
// check system default banner option and let user know what to expect
JobSheets js = (JobSheets)job.getPrintService().
getDefaultAttributeValue(JobSheets.class);
if (js != null && js.equals(JobSheets.NONE)) {
noJobSheet = true;
}
SwingUtilities.invokeAndWait(() -> {
doTest(TestCheckSystemDefaultBannerOption::printTest);
});
mainThread = Thread.currentThread();
try {
Thread.sleep(60000);
} catch (InterruptedException e) {
if (!testPassed && testGeneratedInterrupt) {
String banner = noJobSheet ? "Banner page" : " No Banner page";
throw new RuntimeException(banner + " is printed");
}
}
if (!testGeneratedInterrupt) {
throw new RuntimeException("user has not executed the test");
}
}
private static void printTest() {
job.setPrintable(new TestCheckSystemDefaultBannerOption());
try {
job.print();
} catch (PrinterException e) {
e.printStackTrace();
}
}
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 banner = null;
if (noJobSheet) {
banner = "No Banner page";
} else {
banner = "Banner page";
}
String description
= " A testpage will be sent to printer. \n"
+ " Please check if " + banner + " is printed \n"
+ " along with testpage.\n "
+ " If " + banner + " is printed, 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();
}
});
}
@Override
public int print(Graphics g, PageFormat pf, int pi)
throws PrinterException {
System.out.println("pi = " + pi);
g.drawString("Testing", 100, 100);
if (pi == 1)
return NO_SUCH_PAGE;
return PAGE_EXISTS;
}
}