6789262: getPageFormat doesn't apply PrintRequestAttributeSet specified
Reviewed-by: prr, jdv
--- a/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintService.java Mon Jul 04 11:04:18 2016 +0300
+++ b/jdk/src/java.desktop/windows/classes/sun/print/Win32PrintService.java Mon Jul 04 17:10:29 2016 +0530
@@ -759,10 +759,18 @@
private boolean isSupportedMediaPrintableArea(MediaPrintableArea mpa) {
getMediaPrintables(null);
+ int units = MediaPrintableArea.INCH;
if (mediaPrintables != null) {
for (int i=0; i<mediaPrintables.length; i++) {
- if (mpa.equals(mediaPrintables[i])) {
+ if ((mpa.getX(units) >= mediaPrintables[i].getX(units)) &&
+ (mpa.getY(units) >= mediaPrintables[i].getY(units)) &&
+ (mpa.getX(units) + mpa.getWidth(units) <=
+ mediaPrintables[i].getX(units) +
+ mediaPrintables[i].getWidth(units)) &&
+ (mpa.getY(units) + mpa.getHeight(units) <=
+ mediaPrintables[i].getY(units) +
+ mediaPrintables[i].getHeight(units))) {
return true;
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/print/PrinterJob/TestPgfmtSetMPA.java Mon Jul 04 17:10:29 2016 +0530
@@ -0,0 +1,72 @@
+/*
+ * 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 6789262
+ * @summary Verifies if getPageFormat returns correct mediaprintable value
+ * @run main TestPgfmtSetMPA
+ */
+import java.awt.print.PageFormat;
+import java.awt.print.PrinterJob;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.standard.MediaPrintableArea;
+
+public class TestPgfmtSetMPA {
+
+ public static void main(String args[]) {
+ PrinterJob job;
+
+ job = PrinterJob.getPrinterJob();
+
+ PrintRequestAttributeSet pras = new HashPrintRequestAttributeSet();
+
+ // Here you could see the PageFormat with an empty PrintRequestAttributeSet
+ PageFormat pf2 = job.getPageFormat(pras);
+ System.out.println((pf2.getImageableX() / 72f) + " "
+ + (pf2.getImageableY() / 72f) + " "
+ + (pf2.getImageableWidth() / 72f) + " "
+ + (pf2.getImageableHeight() / 72f)
+ );
+
+ // Set left margin to 2.0
+ pras.add(new MediaPrintableArea(2.0f,
+ (float)(pf2.getImageableY() / 72f),
+ (float) ((pf2.getImageableWidth() / 72f) - 1.0f),
+ (float) (pf2.getImageableHeight() / 72f),
+ MediaPrintableArea.INCH));
+
+ pf2 = job.getPageFormat(pras);
+ System.out.println((pf2.getImageableX() / 72f) + " "
+ + (pf2.getImageableY() / 72f) + " "
+ + (pf2.getImageableWidth() / 72f) + " "
+ + (pf2.getImageableHeight() / 72f)
+ );
+
+ // check if returned left margin of imageable area is 2.0 as set earlier
+ if (pf2.getImageableX() / 72f != 2.0f) {
+ throw new RuntimeException("getPageFormat doesn't apply specified "
+ + "MediaPrintableArea attribute");
+ }
+ }
+}