changeset 6119:dc0aeab104f0

8012381: [macosx] Collation selection ignored when printing on MacOSX Reviewed-by: jchen, prr
author jgodinez
date Mon, 03 Jun 2013 09:50:35 -0700
parents b5393be7f815
children 4fdf087a50ae
files src/solaris/classes/sun/print/IPPPrintService.java test/java/awt/print/PrinterJob/Collate2DPrintingTest.java
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/solaris/classes/sun/print/IPPPrintService.java	Mon Jun 03 15:35:00 2013 +0200
+++ b/src/solaris/classes/sun/print/IPPPrintService.java	Mon Jun 03 09:50:35 2013 -0700
@@ -1023,6 +1023,13 @@
 
             // this is already supported in UnixPrintJob
             catList.add(Destination.class);
+
+            // It is unfortunate that CUPS doesn't provide a way to query
+            // if printer supports collation but since most printers
+            // now supports collation and that most OS has a way
+            // of setting it, it is a safe assumption to just always
+            // include SheetCollate as supported attribute.
+            catList.add(SheetCollate.class);
         }
 
         // With the assumption that  Chromaticity is equivalent to
--- a/test/java/awt/print/PrinterJob/Collate2DPrintingTest.java	Mon Jun 03 15:35:00 2013 +0200
+++ b/test/java/awt/print/PrinterJob/Collate2DPrintingTest.java	Mon Jun 03 09:50:35 2013 -0700
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 6362683
+ * @bug 6362683 8012381
  * @summary Collation should work.
  * @run main/manual Collate2DPrintingTest
  */