[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small cleanups in javax.print

Kaffe CVS cvs-commits at kaffe.org
Sun Oct 24 11:16:29 PDT 2004


PatchSet 5356 
Date: 2004/10/24 18:12:17
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small cleanups in javax.print

2004-10-24  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/javax/print/DocFlavor.java,
        libraries/javalib/javax/print/attribute/standard/JobStateReason.java,
        libraries/javalib/javax/print/attribute/standard/MultipleDocumentHandling.java:
        Resynced with GNU Classpath.

        2004-10-23  Michael Koch  <konqueror at gmx.de>

        * javax/print/DocFlavor.java,
        javax/print/attribute/standard/JobStateReason.java,
        javax/print/attribute/standard/MultipleDocumentHandling.java:
        Added missing constants.

Members: 
	ChangeLog:1.2908->1.2909 
	libraries/javalib/javax/print/DocFlavor.java:1.1->1.2 
	libraries/javalib/javax/print/attribute/standard/JobStateReason.java:1.2->1.3 
	libraries/javalib/javax/print/attribute/standard/MultipleDocumentHandling.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2908 kaffe/ChangeLog:1.2909
--- kaffe/ChangeLog:1.2908	Sun Oct 24 17:26:17 2004
+++ kaffe/ChangeLog	Sun Oct 24 18:12:17 2004
@@ -1,5 +1,19 @@
 2004-10-24  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/javax/print/DocFlavor.java,
+	libraries/javalib/javax/print/attribute/standard/JobStateReason.java,
+	libraries/javalib/javax/print/attribute/standard/MultipleDocumentHandling.java:
+        Resynced with GNU Classpath.
+
+	2004-10-23  Michael Koch  <konqueror at gmx.de>
+
+        * javax/print/DocFlavor.java,
+        javax/print/attribute/standard/JobStateReason.java,
+        javax/print/attribute/standard/MultipleDocumentHandling.java:
+        Added missing constants.
+
+2004-10-24  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/lang/Character.java:
 	Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/javax/print/DocFlavor.java
diff -u kaffe/libraries/javalib/javax/print/DocFlavor.java:1.1 kaffe/libraries/javalib/javax/print/DocFlavor.java:1.2
--- kaffe/libraries/javalib/javax/print/DocFlavor.java:1.1	Tue May 18 20:23:09 2004
+++ kaffe/libraries/javalib/javax/print/DocFlavor.java	Sun Oct 24 18:12:22 2004
@@ -88,6 +88,9 @@
   {
     private static final long serialVersionUID = -8720590903724405128L;
     
+    public static final DocFlavor.CHAR_ARRAY TEXT_HTML = new CHAR_ARRAY("text/html; charset=utf-16");
+    public static final DocFlavor.CHAR_ARRAY TEXT_PLAIN = new CHAR_ARRAY("text/plain; charset=utf-16");
+
     public CHAR_ARRAY(String mimeType)
     {
       super(mimeType, "[C");
@@ -133,6 +136,9 @@
     extends DocFlavor
   {
     private static final long serialVersionUID = 7100295812579351567L;
+
+    public static final DocFlavor.READER TEXT_HTML = new READER("text/html; charset=utf-16");
+    public static final DocFlavor.READER TEXT_PLAIN = new READER("text/plain; charset=utf-16");
     
     public READER(String mimeType)
     {
@@ -147,6 +153,10 @@
     extends DocFlavor
   {
     private static final long serialVersionUID = 6181337766266637256L;
+
+    public static final DocFlavor.SERVICE_FORMATTED PAGEABLE = new SERVICE_FORMATTED("java.awt.print.Pageable");
+    public static final DocFlavor.SERVICE_FORMATTED PRINTABLE = new SERVICE_FORMATTED("java.awt.print.Printable");
+    public static final DocFlavor.SERVICE_FORMATTED RENDERABLE_IMAGE = new SERVICE_FORMATTED("java.awt.image.renderable.RenderableImage");
     
     public SERVICE_FORMATTED(String className)
     {
@@ -161,6 +171,9 @@
     extends DocFlavor
   {
     private static final long serialVersionUID = 4414407504887034035L;
+
+    public static final DocFlavor.STRING TEXT_HTML = new STRING("text/html; charset=utf-16");
+    public static final DocFlavor.STRING TEXT_PLAIN = new STRING("text/plain; charset=utf-16");
     
     public STRING(String mimeType)
     {
@@ -175,6 +188,26 @@
     extends DocFlavor
   {
     private static final long serialVersionUID = 2936725788144902062L;
+
+    public static final DocFlavor.URL AUTOSENSE = new URL("application/octet-stream");
+    public static final DocFlavor.URL GIF = new URL("image/gif");
+    public static final DocFlavor.URL JPEG = new URL("image/jpeg");
+    public static final DocFlavor.URL PCL = new URL("application/vnd.hp-PCL");
+    public static final DocFlavor.URL PDF = new URL("application/pdf");
+    public static final DocFlavor.URL PNG = new URL("image/png");
+    public static final DocFlavor.URL POSTSCRIPT = new URL("application/postscript");
+    public static final DocFlavor.URL TEXT_HTML_HOST = new URL("text/html");
+    public static final DocFlavor.URL TEXT_HTML_US_ASCII = new URL("text/html; charset=us-ascii");
+    public static final DocFlavor.URL TEXT_HTML_UTF_16 = new URL("text/html; charset=utf-16");
+    public static final DocFlavor.URL TEXT_HTML_UTF_16BE = new URL("text/html; charset=utf-16be");
+    public static final DocFlavor.URL TEXT_HTML_UTF_16LE = new URL("text/html; charset=utf-16le");
+    public static final DocFlavor.URL TEXT_HTML_UTF_8 = new URL("text/html; charset=utf-8");
+    public static final DocFlavor.URL TEXT_PLAIN_HOST = new URL("text/plain");
+    public static final DocFlavor.URL TEXT_PLAIN_US_ASCII = new URL("text/plain; charset=us-ascii");
+    public static final DocFlavor.URL TEXT_PLAIN_UTF_16 = new URL("text/plain; charset=utf-16");
+    public static final DocFlavor.URL TEXT_PLAIN_UTF_16BE = new URL("text/plain; charset=utf-16be");
+    public static final DocFlavor.URL TEXT_PLAIN_UTF_16LE = new URL("text/plain; charset=utf-16le");
+    public static final DocFlavor.URL TEXT_PLAIN_UTF_8 = new URL("text/plain; charset=utf-8");
     
     public URL(String mimeType)
     {
Index: kaffe/libraries/javalib/javax/print/attribute/standard/JobStateReason.java
diff -u kaffe/libraries/javalib/javax/print/attribute/standard/JobStateReason.java:1.2 kaffe/libraries/javalib/javax/print/attribute/standard/JobStateReason.java:1.3
--- kaffe/libraries/javalib/javax/print/attribute/standard/JobStateReason.java:1.2	Sat Oct 23 16:09:37 2004
+++ kaffe/libraries/javalib/javax/print/attribute/standard/JobStateReason.java	Sun Oct 24 18:12:24 2004
@@ -49,7 +49,35 @@
 {
   private static final long serialVersionUID = -8765894420449009168L;
 
-  public static final JobStateReason ABORTED_BY_SYSTEM = new JobStateReason(1);
+  public static final JobStateReason JOB_INCOMING = new JobStateReason(0);
+  public static final JobStateReason JOB_DATA_INSUFFICIENT = new JobStateReason(1);
+  public static final JobStateReason DOCUMENT_ACCESS_ERROR = new JobStateReason(2);
+  public static final JobStateReason SUBMISSION_INTERRUPTED = new JobStateReason(3);
+  public static final JobStateReason JOB_OUTGOING = new JobStateReason(4);
+  public static final JobStateReason JOB_HOLD_UNTIL_SPECIFIED = new JobStateReason(5);
+  public static final JobStateReason RESOURCES_ARE_NOT_READY = new JobStateReason(6);
+  public static final JobStateReason PRINTER_STOPPED_PARTLY = new JobStateReason(7);
+  public static final JobStateReason PRINTER_STOPPED = new JobStateReason(8);
+  public static final JobStateReason JOB_INTERPRETING = new JobStateReason(9);
+  public static final JobStateReason JOB_QUEUED = new JobStateReason(10);
+  public static final JobStateReason JOB_TRANSFORMING = new JobStateReason(11);
+  public static final JobStateReason JOB_QUEUED_FOR_MARKER = new JobStateReason(12);
+  public static final JobStateReason JOB_PRINTING = new JobStateReason(13);
+  public static final JobStateReason JOB_CANCELED_BY_USER = new JobStateReason(14);
+  public static final JobStateReason JOB_CANCELED_BY_OPERATOR = new JobStateReason(15);
+  public static final JobStateReason JOB_CANCELED_AT_DEVICE = new JobStateReason(16);
+  public static final JobStateReason ABORTED_BY_SYSTEM = new JobStateReason(17);
+  public static final JobStateReason UNSUPPORTED_COMPRESSION = new JobStateReason(18);
+  public static final JobStateReason COMPRESSION_ERROR = new JobStateReason(19);
+  public static final JobStateReason UNSUPPORTED_DOCUMENT_FORMAT = new JobStateReason(20);
+  public static final JobStateReason DOCUMENT_FORMAT_ERROR = new JobStateReason(21);
+  public static final JobStateReason PROCESSING_TO_STOP_POINT = new JobStateReason(22);
+  public static final JobStateReason SERVICE_OFF_LINE = new JobStateReason(23);
+  public static final JobStateReason JOB_COMPLETED_SUCCESSFULLY = new JobStateReason(24);
+  public static final JobStateReason JOB_COMPLETED_WITH_WARNINGS = new JobStateReason(25);
+  public static final JobStateReason JOB_COMPLETED_WITH_ERRORS = new JobStateReason(26);
+  public static final JobStateReason JOB_RESTARTABLE = new JobStateReason(27);
+  public static final JobStateReason QUEUED_IN_DEVICE = new JobStateReason(28);
 
   /**
    * Constructs a <code>JobStateReason</code> object.
Index: kaffe/libraries/javalib/javax/print/attribute/standard/MultipleDocumentHandling.java
diff -u kaffe/libraries/javalib/javax/print/attribute/standard/MultipleDocumentHandling.java:1.2 kaffe/libraries/javalib/javax/print/attribute/standard/MultipleDocumentHandling.java:1.3
--- kaffe/libraries/javalib/javax/print/attribute/standard/MultipleDocumentHandling.java:1.2	Sat Oct 23 16:09:37 2004
+++ kaffe/libraries/javalib/javax/print/attribute/standard/MultipleDocumentHandling.java	Sun Oct 24 18:12:24 2004
@@ -50,12 +50,18 @@
 {
   private static final long serialVersionUID = 8098326460746413466L;
 
+  public static final MultipleDocumentHandling SINGLE_DOCUMENT =
+    new MultipleDocumentHandling(0);
+  public static final MultipleDocumentHandling SEPARATE_DOCUMENTS_UNCOLLATED_COPIES =
+    new MultipleDocumentHandling(1);
   public static final MultipleDocumentHandling SEPARATE_DOCUMENTS_COLLATED_COPIES =
     new MultipleDocumentHandling(2);
+  public static final MultipleDocumentHandling SINGLE_DOCUMENT_NEW_SHEET =
+    new MultipleDocumentHandling(3);
 
-    /**
-     * Constructs a <code>MultipleDocumentHandling</code> object.
-     */
+  /**
+   * Constructs a <code>MultipleDocumentHandling</code> object.
+   */
   protected MultipleDocumentHandling(int value)
   {
     super(value);




More information about the kaffe mailing list