* The rectangular printable area is defined thus: The (x,y) origin is * positioned at the top-left of the paper in portrait mode regardless of the - * orientation specified in the requesting context. For example a printable area - * for A4 paper in portrait or landscape orientation will have height - * {@literal >} width. + * orientation specified in the requesting context. *
* A printable area attribute's values are stored internally as integers in * units of micrometers (µm), where 1 micrometer = 10-6 meter = diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java b/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java index 57c0d305809..b5ea11cf4c6 100644 --- a/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java +++ b/src/java.desktop/share/classes/javax/print/attribute/standard/MediaSize.java @@ -36,7 +36,7 @@ import javax.print.attribute.Size2DSyntax; * Class {@code MediaSize} is a two-dimensional size valued printing attribute * class that indicates the dimensions of the medium in a portrait orientation, * with the {@code X} dimension running along the bottom edge and the {@code Y} - * dimension running along the left edge. Thus, the {@code Y} dimension must be + * dimension running along the left edge. For most media, the {@code Y} dimension will be * greater than or equal to the {@code X} dimension. Class {@code MediaSize} * declares many standard media size values, organized into nested classes for * ISO, JIS, North American, engineering, and other media. @@ -77,13 +77,10 @@ public class MediaSize extends Size2DSyntax implements Attribute { * @param units unit conversion factor, e.g. {@code Size2DSyntax.INCH} or * {@code Size2DSyntax.MM} * @throws IllegalArgumentException if {@code x < 0} or {@code y < 0} or - * {@code units < 1} or {@code x > y} + * {@code units < 1} */ public MediaSize(float x, float y,int units) { super (x, y, units); - if (x > y) { - throw new IllegalArgumentException("X dimension > Y dimension"); - } sizeVector.add(this); } @@ -95,13 +92,10 @@ public class MediaSize extends Size2DSyntax implements Attribute { * @param units unit conversion factor, e.g. {@code Size2DSyntax.INCH} or * {@code Size2DSyntax.MM} * @throws IllegalArgumentException if {@code x < 0} or {@code y < 0} or - * {@code units < 1} or {@code x > y} + * {@code units < 1} */ public MediaSize(int x, int y,int units) { super (x, y, units); - if (x > y) { - throw new IllegalArgumentException("X dimension > Y dimension"); - } sizeVector.add(this); } @@ -115,13 +109,10 @@ public class MediaSize extends Size2DSyntax implements Attribute { * {@code Size2DSyntax.MM} * @param media a media name to associate with this {@code MediaSize} * @throws IllegalArgumentException if {@code x < 0} or {@code y < 0} or - * {@code units < 1} or {@code x > y} + * {@code units < 1} */ public MediaSize(float x, float y,int units, MediaSizeName media) { super (x, y, units); - if (x > y) { - throw new IllegalArgumentException("X dimension > Y dimension"); - } if (media != null && mediaMap.get(media) == null) { mediaName = media; mediaMap.put(mediaName, this); @@ -138,13 +129,10 @@ public class MediaSize extends Size2DSyntax implements Attribute { * {@code Size2DSyntax.MM} * @param media a media name to associate with this {@code MediaSize} * @throws IllegalArgumentException if {@code x < 0} or {@code y < 0} or - * {@code units < 1} or {@code x > y} + * {@code units < 1} */ public MediaSize(int x, int y,int units, MediaSizeName media) { super (x, y, units); - if (x > y) { - throw new IllegalArgumentException("X dimension > Y dimension"); - } if (media != null && mediaMap.get(media) == null) { mediaName = media; mediaMap.put(mediaName, this); diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/OrientationRequested.java b/src/java.desktop/share/classes/javax/print/attribute/standard/OrientationRequested.java index 00e3de4a1de..26885fc1a7d 100644 --- a/src/java.desktop/share/classes/javax/print/attribute/standard/OrientationRequested.java +++ b/src/java.desktop/share/classes/javax/print/attribute/standard/OrientationRequested.java @@ -73,16 +73,17 @@ public final class OrientationRequested extends EnumSyntax private static final long serialVersionUID = -4447437289862822276L; /** - * The content will be imaged across the short edge of the medium. + * The content will be imaged across the default orientation of the medium. + * For almost all media this means across the short edge. */ public static final OrientationRequested PORTRAIT = new OrientationRequested(3); /** - * The content will be imaged across the long edge of the medium. Landscape - * is defined to be a rotation of the print-stream page to be imaged by +90 + * Landscape is defined to be a rotation of the print-stream page to be imaged by +90 * degrees with respect to the medium (i.e. anti-clockwise) from the - * portrait orientation. Note: The +90 direction was chosen because + * portrait orientation. For almost all media this means across the long edge. + * Note: The +90 direction was chosen because * simple finishing on the long edge is the same edge whether portrait or * landscape. */ @@ -90,7 +91,7 @@ public final class OrientationRequested extends EnumSyntax LANDSCAPE = new OrientationRequested(4); /** - * The content will be imaged across the long edge of the medium, but in the + * The content will be imaged similarly, but in the * opposite manner from landscape. Reverse-landscape is defined to be a * rotation of the print-stream page to be imaged by -90 degrees with * respect to the medium (i.e. clockwise) from the portrait orientation. @@ -102,7 +103,7 @@ public final class OrientationRequested extends EnumSyntax REVERSE_LANDSCAPE = new OrientationRequested(5); /** - * The content will be imaged across the short edge of the medium, but in + * The content will be imaged similarly to, but in * the opposite manner from portrait. Reverse-portrait is defined to be a * rotation of the print-stream page to be imaged by 180 degrees with * respect to the medium from the portrait orientation. Note: The diff --git a/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java b/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java index 04772f29858..d5173c181c4 100644 --- a/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java +++ b/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java @@ -206,14 +206,7 @@ class CustomMediaSizeName extends MediaSizeName { if (value.getStandardMedia() == null) { // add this new custom media size name to MediaSize array if ((width > 0.0) && (length > 0.0)) { - try { - new MediaSize(width, length, Size2DSyntax.INCH, value); - } catch (IllegalArgumentException e) { - /* PDF printer in Linux for Ledger paper causes - "IllegalArgumentException: X dimension > Y dimension". - We rotate based on IPP spec. */ - new MediaSize(length, width, Size2DSyntax.INCH, value); - } + new MediaSize(width, length, Size2DSyntax.INCH, value); } } } diff --git a/test/jdk/javax/print/attribute/MediaSizeTest.java b/test/jdk/javax/print/attribute/MediaSizeTest.java new file mode 100644 index 00000000000..91d8ed19178 --- /dev/null +++ b/test/jdk/javax/print/attribute/MediaSizeTest.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2026, 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 8041911 + * @summary Test that MediaSize with non-standard portrait dimensions is OK +*/ + +import javax.print.attribute.standard.MediaSize; +import static javax.print.attribute.standard.MediaSize.INCH; + +public class MediaSizeTest { + + public static void main(String args[]) { + new MediaSize(0, 0, INCH); + new MediaSize(1, 1, INCH); + new MediaSize(2, 1, INCH); + new MediaSize(1, 2, INCH); + } +}