# HG changeset patch
# User jgodinez
# Date 1369845960 25200
# Node ID d76d0c992e34f44b987b6a0837cc3c7f46c2fb7f
# Parent  b727bb0815d72ec76fdb6d9daf93b9b54df01aa3
8012381: [macosx]Unable to print out the defined page for 2D_PrintingTiger/JTablePrintPageRangesTest
Reviewed-by: jchen, prr

diff -r b727bb0815d7 -r d76d0c992e34 jdk/src/solaris/classes/sun/print/IPPPrintService.java
--- a/jdk/src/solaris/classes/sun/print/IPPPrintService.java	Wed May 29 09:18:55 2013 -0700
+++ b/jdk/src/solaris/classes/sun/print/IPPPrintService.java	Wed May 29 09:46:00 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
diff -r b727bb0815d7 -r d76d0c992e34 jdk/test/java/awt/print/PrinterJob/Collate2DPrintingTest.java
--- a/jdk/test/java/awt/print/PrinterJob/Collate2DPrintingTest.java	Wed May 29 09:18:55 2013 -0700
+++ b/jdk/test/java/awt/print/PrinterJob/Collate2DPrintingTest.java	Wed May 29 09:46:00 2013 -0700
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 6362683
+ * @bug 6362683 8012381
  * @summary Collation should work.
  * @run main/manual Collate2DPrintingTest
  */