[multiple changes]

2004-05-15  Mark Wielaard  <mark@klomp.org>

       * Makefile.am (ordinary_java_source_files): Add new javax.print
       classes.
       * Makefile.in: Regenerated.

2004-05-15  Michael Koch  <konqueror@gmx.de>

       * javax/print/attribute/standard/DateTimeAtCompleted.java,
       javax/print/attribute/standard/DateTimeAtCreation.java,
       javax/print/attribute/standard/DateTimeAtProcessing.java,
       javax/print/attribute/standard/DocumentName.java,
       javax/print/attribute/standard/JobHoldUntil.java,
       javax/print/attribute/standard/JobImpressionsCompleted.java,
       javax/print/attribute/standard/JobMessageFromOperator.java,
       javax/print/attribute/standard/JobName.java,
       javax/print/attribute/standard/JobOriginatingUserName.java,
       javax/print/attribute/standard/JobPriority.java,
       javax/print/attribute/standard/JobPrioritySupported.java,
       javax/print/attribute/standard/NumberOfInterveningJobs.java,
       javax/print/attribute/standard/OutputDeviceAssigned.java,
       javax/print/attribute/standard/PrinterInfo.java,
       javax/print/attribute/standard/PrinterLocation.java,
       javax/print/attribute/standard/PrinterMakeAndModel.java,
       javax/print/attribute/standard/PrinterMessageFromOperator.java,
       javax/print/attribute/standard/PrinterName.java,
       javax/print/attribute/standard/QueuedJobCount.java,
       javax/print/attribute/standard/RequestingUserName.java:
       Fixed javadocs all over.

2004-05-15  Michael Koch  <konqueror@gmx.de>

       * javax/print/DocFlavor.java,
       javax/print/attribute/standard/ColorSupported.java,
       javax/print/attribute/standard/Compression.java,
       javax/print/attribute/standard/CopiesSupported.java,
       javax/print/attribute/standard/Fidelity.java,
       javax/print/attribute/standard/Finishings.java,
       javax/print/attribute/standard/JobImpressionsSupported.java,
       javax/print/attribute/standard/JobKOctetsSupported.java,
       javax/print/attribute/standard/JobMediaSheetsSupported.java,
       javax/print/attribute/standard/JobSheets.java,
       javax/print/attribute/standard/JobState.java,
       javax/print/attribute/standard/JobStateReason.java,
       javax/print/attribute/standard/JobStateReasons.java,
       javax/print/attribute/standard/Media.java,
       javax/print/attribute/standard/MediaSizeName.java,
       javax/print/attribute/standard/MultipleDocumentHandling.java,
       javax/print/attribute/standard/NumberUpSupported.java,
       javax/print/attribute/standard/OrientationRequested.java,
       javax/print/attribute/standard/PDLOverrideSupported.java,
       javax/print/attribute/standard/PageRanges.java,
       javax/print/attribute/standard/PresentationDirection.java,
       javax/print/attribute/standard/PrintQuality.java,
       javax/print/attribute/standard/PrinterIsAcceptingJobs.java,
       javax/print/attribute/standard/PrinterMoreInfo.java,
       javax/print/attribute/standard/PrinterMoreInfoManufacturer.java,
       javax/print/attribute/standard/PrinterResolution.java,
       javax/print/attribute/standard/PrinterState.java,
       javax/print/attribute/standard/PrinterStateReason.java,
       javax/print/attribute/standard/PrinterStateReasons.java,
       javax/print/attribute/standard/PrinterURI.java,
       javax/print/attribute/standard/ReferenceUriSchemesSupported.java,
       javax/print/attribute/standard/Severity.java,
       javax/print/attribute/standard/SheetCollate.java,
       javax/print/attribute/standard/Sides.java:
       Added serialVersionUID and removed final keyword where it doenst
       belong.

2004-05-15  Michael Koch  <konqueror@gmx.de>

       * javax/print/PrintServiceLookup.java: New file.

2004-05-15  Michael Koch  <konqueror@gmx.de>

       * javax/print/DocFlavor.java:
       Implemented all flavor classes.

2004-05-15  Michael Koch  <konqueror@gmx.de>

       * javax/print/attribute/standard/ColorSupported.java,
       javax/print/attribute/standard/Compression.java,
       javax/print/attribute/standard/CopiesSupported.java,
       javax/print/attribute/standard/Fidelity.java,
       javax/print/attribute/standard/Finishings.java,
       javax/print/attribute/standard/JobImpressionsSupported.java,
       javax/print/attribute/standard/JobKOctetsSupported.java,
       javax/print/attribute/standard/JobMediaSheetsSupported.java,
       javax/print/attribute/standard/JobSheets.java,
       javax/print/attribute/standard/JobState.java,
       javax/print/attribute/standard/JobStateReason.java,
       javax/print/attribute/standard/JobStateReasons.java,
       javax/print/attribute/standard/Media.java,
       javax/print/attribute/standard/MediaSizeName.java,
       javax/print/attribute/standard/MultipleDocumentHandling.java,
       javax/print/attribute/standard/NumberUpSupported.java,
       javax/print/attribute/standard/OrientationRequested.java,
       javax/print/attribute/standard/PDLOverrideSupported.java,
       javax/print/attribute/standard/PageRanges.java,
       javax/print/attribute/standard/PresentationDirection.java,
       javax/print/attribute/standard/PrintQuality.java,
       javax/print/attribute/standard/PrinterIsAcceptingJobs.java,
       javax/print/attribute/standard/PrinterMoreInfo.java,
       javax/print/attribute/standard/PrinterMoreInfoManufacturer.java,
       javax/print/attribute/standard/PrinterResolution.java,
       javax/print/attribute/standard/PrinterState.java,
       javax/print/attribute/standard/PrinterStateReason.java,
       javax/print/attribute/standard/PrinterStateReasons.java,
       javax/print/attribute/standard/PrinterURI.java,
       javax/print/attribute/standard/ReferenceUriSchemesSupported.java,
       javax/print/attribute/standard/Severity.java,
       javax/print/attribute/standard/SheetCollate.java,
       javax/print/attribute/standard/Sides.java: New files.

2004-05-15  Michael Koch  <konqueror@gmx.de>

       * javax/print/Doc.java
       (getPrintData): Throws IOException.
       (getReaderForText): Likewise.
       (getStreamForBytes): Likewise.
       * javax/print/DocFlavor.java:
       Fixed filename in copyright.
       (serialVersionUID): New field.
       * javax/print/ServiceUIFactory.java:
       Made all constants final.
       * javax/print/AttributeException.java
       javax/print/MultiDoc.java
       javax/print/MultiDocPrintJob.java
       javax/print/MultiDocPrintService.java
       javax/print/StreamPrintService.java
       javax/print/URIException.java: New files.
       * javax/print/Makefile.am
       (EXTRA_DIST): Added all new files.

2004-05-15  Michael Koch  <konqueror@gmx.de>

       * javax/print/attribute/standard/Copies.java,
       javax/print/attribute/standard/DateTimeAtCompleted.java,
       javax/print/attribute/standard/DateTimeAtCreation.java,
       javax/print/attribute/standard/DateTimeAtProcessing.java,
       javax/print/attribute/standard/DocumentName.java,
       javax/print/attribute/standard/JobHoldUntil.java,
       javax/print/attribute/standard/JobImpressions.java,
       javax/print/attribute/standard/JobImpressionsCompleted.java,
       javax/print/attribute/standard/JobKOctets.java,
       javax/print/attribute/standard/JobKOctetsProcessed.java,
       javax/print/attribute/standard/JobMediaSheets.java,
       javax/print/attribute/standard/JobMediaSheetsCompleted.java,
       javax/print/attribute/standard/JobMessageFromOperator.java,
       javax/print/attribute/standard/JobName.java,
       javax/print/attribute/standard/JobOriginatingUserName.java,
       javax/print/attribute/standard/JobPriority.java,
       javax/print/attribute/standard/JobPrioritySupported.java,
       javax/print/attribute/standard/NumberOfDocuments.java,
       javax/print/attribute/standard/NumberOfInterveningJobs.java,
       javax/print/attribute/standard/NumberUp.java,
       javax/print/attribute/standard/OutputDeviceAssigned.java,
       javax/print/attribute/standard/PagesPerMinute.java,
       javax/print/attribute/standard/PagesPerMinuteColor.java:
       Fixed @return tag all over.

2004-05-15  Michael Koch  <konqueror@gmx.de>

       * javax/print/attribute/AttributeSetUtilities.java
       (verifyCategoryForValue): Fixed typo in javadoc.
       * javax/print/attribute/HashAttributeSet.java
       (containsKey): Fixed @return tag.
       (comtainsValue): Likewise.
       (equals): Likewise.
       * javax/print/attribute/IntegerSyntax.java
       (equals): Likewise.
       * javax/print/attribute/ResolutionSyntax.java
       (equals): Likewise.
       (getCrossFeedResolution): Removed unused code.
       (getFeedResolution): Likewise.
       * javax/print/attribute/SetOfIntegerSyntax.java
       (SetOfIntegerSyntax): Fixed HTML entities in javadoc.
       (equals): Fixed @return tag.
       * javax/print/attribute/TextSyntax.java
       (TextSyntax): Take locale into account.
       (hashCode): Better implementation.

2004-05-15  Michael Koch  <konqueror@gmx.de>

       * javax/print/CancelablePrintJob.java,
       javax/print/Doc.java,
       javax/print/DocFlavor.java,
       javax/print/DocPrintJob.java,
       javax/print/FlavorException.java,
       javax/print/PrintException.java,
       javax/print/PrintService.java,
       javax/print/ServiceUIFactory.java: New files.

From-SVN: r81901

1 files changed, 287 insertions, 0 deletions

diff --git a/libjava/javax/print/DocFlavor.java b/libjava/javax/print/DocFlavor.java
new file mode 100644
index 0000000..96e9842
--- /dev/null
+++ b/libjava/javax/print/DocFlavor.java
@@ -0,0 +1,287 @@
+/* DocFlavor.java --
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.print;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class DocFlavor implements Cloneable, Serializable
+{
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class BYTE_ARRAY
+    extends DocFlavor
+  {
+    public static final BYTE_ARRAY AUTOSENSE = new BYTE_ARRAY("application/octet-stream");
+    public static final BYTE_ARRAY GIF = new BYTE_ARRAY("image/gif");
+    public static final BYTE_ARRAY JPEG = new BYTE_ARRAY("image/jpeg");
+    public static final BYTE_ARRAY PCL = new BYTE_ARRAY("application/vnd.hp-PCL");
+    public static final BYTE_ARRAY PDF = new BYTE_ARRAY("application/pdf");
+    public static final BYTE_ARRAY PNG = new BYTE_ARRAY("image/png");
+    public static final BYTE_ARRAY POSTSCRIPT = new BYTE_ARRAY("application/postscript");
+    public static final BYTE_ARRAY TEXT_HTML_HOST = new BYTE_ARRAY("text/html");
+    public static final BYTE_ARRAY TEXT_HTML_US_ASCII = new BYTE_ARRAY("text/html; charset=us-ascii");
+    public static final BYTE_ARRAY TEXT_HTML_UTF_16 = new BYTE_ARRAY("text/html; charset=utf-16");
+    public static final BYTE_ARRAY TEXT_HTML_UTF_16BE = new BYTE_ARRAY("text/html; charset=utf-16be");
+    public static final BYTE_ARRAY TEXT_HTML_UTF_16LE = new BYTE_ARRAY("text/html; charset=utf-16le");
+    public static final BYTE_ARRAY TEXT_HTML_UTF_8 = new BYTE_ARRAY("text/html; charset=utf-8");
+    public static final BYTE_ARRAY TEXT_PLAIN_HOST = new BYTE_ARRAY("text/plain");
+    public static final BYTE_ARRAY TEXT_PLAIN_US_ASCII = new BYTE_ARRAY("text/plain; charset=us-ascii");
+    public static final BYTE_ARRAY TEXT_PLAIN_UTF_16 = new BYTE_ARRAY("text/plain; charset=utf-16");
+    public static final BYTE_ARRAY TEXT_PLAIN_UTF_16BE = new BYTE_ARRAY("text/plain; charset=utf-16be");
+    public static final BYTE_ARRAY TEXT_PLAIN_UTF_16LE = new BYTE_ARRAY("text/plain; charset=utf-16le");
+    public static final BYTE_ARRAY TEXT_PLAIN_UTF_8 = new BYTE_ARRAY("text/plain; charset=utf-8");
+    
+    public BYTE_ARRAY(String mimeType)
+    {
+      super(mimeType, "[B");
+    }
+  }
+  
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class CHAR_ARRAY
+    extends DocFlavor
+  {
+    private static final long serialVersionUID = -8720590903724405128L;
+    
+    public CHAR_ARRAY(String mimeType)
+    {
+      super(mimeType, "[C");
+    }
+  }
+  
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class INPUT_STREAM
+    extends DocFlavor
+  {
+    public static final INPUT_STREAM AUTOSENSE = new INPUT_STREAM("application/octet-stream");
+    public static final INPUT_STREAM GIF = new INPUT_STREAM("image/gif");
+    public static final INPUT_STREAM JPEG = new INPUT_STREAM("image/jpeg");
+    public static final INPUT_STREAM PCL = new INPUT_STREAM("application/vnd.hp-PCL");
+    public static final INPUT_STREAM PDF = new INPUT_STREAM("application/pdf");
+    public static final INPUT_STREAM PNG = new INPUT_STREAM("image/png");
+    public static final INPUT_STREAM POSTSCRIPT = new INPUT_STREAM("application/postscript");
+    public static final INPUT_STREAM TEXT_HTML_HOST = new INPUT_STREAM("text/html");
+    public static final INPUT_STREAM TEXT_HTML_US_ASCII = new INPUT_STREAM("text/html; charset=us-ascii");
+    public static final INPUT_STREAM TEXT_HTML_UTF_16 = new INPUT_STREAM("text/html; charset=utf-16");
+    public static final INPUT_STREAM TEXT_HTML_UTF_16BE = new INPUT_STREAM("text/html; charset=utf-16be");
+    public static final INPUT_STREAM TEXT_HTML_UTF_16LE = new INPUT_STREAM("text/html; charset=utf-16le");
+    public static final INPUT_STREAM TEXT_HTML_UTF_8 = new INPUT_STREAM("text/html; charset=utf-8");
+    public static final INPUT_STREAM TEXT_PLAIN_HOST = new INPUT_STREAM("text/plain");
+    public static final INPUT_STREAM TEXT_PLAIN_US_ASCII = new INPUT_STREAM("text/plain; charset=us-ascii");
+    public static final INPUT_STREAM TEXT_PLAIN_UTF_16 = new INPUT_STREAM("text/plain; charset=utf-16");
+    public static final INPUT_STREAM TEXT_PLAIN_UTF_16BE = new INPUT_STREAM("text/plain; charset=utf-16be");
+    public static final INPUT_STREAM TEXT_PLAIN_UTF_16LE = new INPUT_STREAM("text/plain; charset=utf-16le");
+    public static final INPUT_STREAM TEXT_PLAIN_UTF_8 = new INPUT_STREAM("text/plain; charset=utf-8");
+    
+    public INPUT_STREAM(String mimeType)
+    {
+      super(mimeType, "java.io.InputStream");
+    }
+  }
+  
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class READER
+    extends DocFlavor
+  {
+    private static final long serialVersionUID = 7100295812579351567L;
+    
+    public READER(String mimeType)
+    {
+      super(mimeType, "java.io.Reader");
+    }
+  }
+  
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class SERVICE_FORMATTED
+    extends DocFlavor
+  {
+    private static final long serialVersionUID = 6181337766266637256L;
+    
+    public SERVICE_FORMATTED(String className)
+    {
+      super("application/x-java-jvm-local-objectref", className);
+    }
+  }
+  
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class STRING
+    extends DocFlavor
+  {
+    private static final long serialVersionUID = 4414407504887034035L;
+    
+    public STRING(String mimeType)
+    {
+      super(mimeType, "java.lang.String");
+    }
+  }
+  
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class URL
+    extends DocFlavor
+  {
+    private static final long serialVersionUID = 2936725788144902062L;
+    
+    public URL(String mimeType)
+    {
+      super(mimeType, "java.net.URL");
+    }
+  }
+  
+  private static final long serialVersionUID = -4512080796965449721L;
+  
+  public static final String hostEncoding = "US-ASCII";
+
+  private String mediaSubtype;
+  private String mediaType;
+  private String className;
+  private HashMap params = new HashMap();
+  
+  public DocFlavor(String mimeType, String className)
+  {
+    if (mimeType == null || className == null)
+      throw new NullPointerException();
+
+    parseMimeType(mimeType);
+    this.className = className;
+  }
+
+  private void parseMimeType(String mimeType)
+  {
+    // FIXME: This method is know to be not completely correct, but it works for now.
+    
+    int pos = mimeType.indexOf(';');
+
+    if (pos != -1)
+      {
+	String tmp = mimeType.substring(pos + 2);
+	mimeType = mimeType.substring(0, pos);
+	pos = tmp.indexOf('=');
+	params.put(tmp.substring(0, pos), tmp.substring(pos + 1));
+      }
+
+    pos = mimeType.indexOf('/');
+
+    if (pos == -1)
+      throw new IllegalArgumentException();
+
+    mediaType = mimeType.substring(0, pos);
+    mediaSubtype = mimeType.substring(pos + 1);
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (! (obj instanceof DocFlavor))
+      return false;
+
+    DocFlavor tmp = (DocFlavor) obj;
+
+    return (getMimeType().equals(tmp.getMimeType())
+	    && getRepresentationClassName().equals(tmp.getRepresentationClassName()));
+  }
+
+  public String getMediaSubtype()
+  {
+    return mediaSubtype;
+  }
+
+  public String getMediaType()
+  {
+    return mediaType;
+  }
+
+  public String getMimeType()
+  {
+    // FIXME: Check if this algorithm is correct.
+    
+    String mimeType = getMediaType() + "/" + getMediaSubtype();
+    Iterator it = params.entrySet().iterator();
+
+    while (it.hasNext())
+      {
+	Map.Entry entry = (Map.Entry) it.next();
+	mimeType += "; " + entry.getKey() + "=\"" + entry.getValue() + "\"";
+      }
+
+    return mimeType;
+  }
+
+  public String getParameter(String paramName)
+  {
+    if (paramName == null)
+      throw new NullPointerException();
+    
+    return (String) params.get(paramName); 
+  }
+
+  public String getRepresentationClassName()
+  {
+    return className;
+  }
+
+  public int hashCode()
+  {
+    return ((mediaType.hashCode()
+	     * mediaSubtype.hashCode()
+	     * className.hashCode()) ^ params.hashCode());
+  }
+
+  public String toString()
+  {
+    return getMimeType();
+  }
+}