[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: priting fixes
Kaffe CVS
cvs-commits at kaffe.org
Sat Jan 22 11:16:44 PST 2005
PatchSet 5900
Date: 2005/01/22 19:03:59
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: priting fixes
2005-01-22 Dalibor Topic <robilad at kaffe.org>
Resynced with GNU Classpath.
2005-01-20 Michael Koch <konqueror at gmx.de>
* javax/print/attribute/standard/Chromaticity.java
(serialVersionUID): Fixed value.
* javax/print/attribute/standard/Destination.java
(serialVersionUID): Fixed value.
* javax/print/attribute/standard/MediaPrintableArea.java,
javax/print/attribute/standard/MediaSize.java:
New files.
Members:
ChangeLog:1.3439->1.3440
libraries/javalib/all.files:1.78->1.79
libraries/javalib/javax/print/attribute/standard/Chromaticity.java:1.1->1.2
libraries/javalib/javax/print/attribute/standard/Destination.java:1.1->1.2
libraries/javalib/javax/print/attribute/standard/MediaPrintableArea.java:INITIAL->1.1
libraries/javalib/javax/print/attribute/standard/MediaSize.java:INITIAL->1.1
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3439 kaffe/ChangeLog:1.3440
--- kaffe/ChangeLog:1.3439 Sat Jan 22 19:00:01 2005
+++ kaffe/ChangeLog Sat Jan 22 19:03:59 2005
@@ -2,6 +2,20 @@
Resynced with GNU Classpath.
+ 2005-01-20 Michael Koch <konqueror at gmx.de>
+
+ * javax/print/attribute/standard/Chromaticity.java
+ (serialVersionUID): Fixed value.
+ * javax/print/attribute/standard/Destination.java
+ (serialVersionUID): Fixed value.
+ * javax/print/attribute/standard/MediaPrintableArea.java,
+ javax/print/attribute/standard/MediaSize.java:
+ New files.
+
+2005-01-22 Dalibor Topic <robilad at kaffe.org>
+
+ Resynced with GNU Classpath.
+
2005-01-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
* java/util/Currency.java:
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.78 kaffe/libraries/javalib/all.files:1.79
--- kaffe/libraries/javalib/all.files:1.78 Sat Jan 22 18:34:49 2005
+++ kaffe/libraries/javalib/all.files Sat Jan 22 19:04:03 2005
@@ -2741,6 +2741,8 @@
javax/print/attribute/standard/JobStateReason.java
javax/print/attribute/standard/JobStateReasons.java
javax/print/attribute/standard/Media.java
+javax/print/attribute/standard/MediaPrintableArea.java
+javax/print/attribute/standard/MediaSize.java
javax/print/attribute/standard/MediaSizeName.java
javax/print/attribute/standard/MultipleDocumentHandling.java
javax/print/attribute/standard/NumberOfDocuments.java
Index: kaffe/libraries/javalib/javax/print/attribute/standard/Chromaticity.java
diff -u kaffe/libraries/javalib/javax/print/attribute/standard/Chromaticity.java:1.1 kaffe/libraries/javalib/javax/print/attribute/standard/Chromaticity.java:1.2
--- kaffe/libraries/javalib/javax/print/attribute/standard/Chromaticity.java:1.1 Tue Jan 18 14:59:11 2005
+++ kaffe/libraries/javalib/javax/print/attribute/standard/Chromaticity.java Sat Jan 22 19:04:06 2005
@@ -49,7 +49,7 @@
public final class Chromaticity extends EnumSyntax
implements DocAttribute, PrintRequestAttribute, PrintJobAttribute
{
- private static final long serialVersionUID = -6890309414893262822L;
+ private static final long serialVersionUID = 4660543931355214012L;
public static final Chromaticity MONOCHROME = new Chromaticity(0);
public static final Chromaticity COLOR = new Chromaticity(1);
Index: kaffe/libraries/javalib/javax/print/attribute/standard/Destination.java
diff -u kaffe/libraries/javalib/javax/print/attribute/standard/Destination.java:1.1 kaffe/libraries/javalib/javax/print/attribute/standard/Destination.java:1.2
--- kaffe/libraries/javalib/javax/print/attribute/standard/Destination.java:1.1 Tue Jan 18 14:59:11 2005
+++ kaffe/libraries/javalib/javax/print/attribute/standard/Destination.java Sat Jan 22 19:04:06 2005
@@ -1,5 +1,5 @@
/* Destination.java --
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -50,7 +50,7 @@
public final class Destination extends URISyntax
implements PrintJobAttribute, PrintRequestAttribute
{
- private static final long serialVersionUID = 7923912792485606497L;
+ private static final long serialVersionUID = 6776739171700415321L;
/**
* Constructs a <code>Destination</code> object.
===================================================================
Checking out kaffe/libraries/javalib/javax/print/attribute/standard/MediaPrintableArea.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/javax/print/attribute/standard/MediaPrintableArea.java,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/javax/print/attribute/standard/MediaPrintableArea.java Sat Jan 22 19:16:42 2005
@@ -0,0 +1,146 @@
+/* MediaPrintableArea.java --
+ Copyright (C) 2005 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.attribute.standard;
+
+import javax.print.attribute.DocAttribute;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+/**
+ * @author Michael Koch (konqueror at gmx.de)
+ */
+public final class MediaPrintableArea
+ implements DocAttribute, PrintJobAttribute, PrintRequestAttribute
+{
+ private static final long serialVersionUID = -1597171464050795793L;
+
+ public static final int INCH = 25400;
+ public static final int MM = 1000;
+
+ private float x;
+ private float y;
+ private float width;
+ private float height;
+
+ /**
+ * Creates a new <code>MediaPrintableArea</code> object.
+ *
+ * @throws IllegalArgumentException if x i< 0 or y i< 0 or w i<= 0
+ * or h i<= 0 or units i< 1
+ */
+ public MediaPrintableArea(float x, float y, float w, float h, int units)
+ {
+ if (x < 0.0f || y < 0.0f || w <= 0.0f || h <= 0.0f)
+ throw new IllegalArgumentException();
+
+ this.x = x;
+ this.y = y;
+ this.width = w;
+ this.height = h;
+ }
+
+ /**
+ * Creates a new <code>MediaPrintableArea</code> object.
+ *
+ * @throws IllegalArgumentException if x i< 0 or y i< 0 or w i<= 0
+ * or h i<= 0 or units i< 1
+ */
+ public MediaPrintableArea(int x, int y, int w, int h, int units)
+ {
+ if (x < 0 || y < 0 || w <= 0 || h <= 0)
+ throw new IllegalArgumentException();
+
+ this.x = x;
+ this.y = y;
+ this.width = w;
+ this.height = h;
+ }
+
+ /**
+ * Returns category of this class.
+ *
+ * @return the class <code>MediaPrintableArea</code> itself
+ */
+ public Class getCategory()
+ {
+ return MediaPrintableArea.class;
+ }
+
+ /**
+ * Returns name of this class.
+ *
+ * @return the string "media-printable-area"
+ */
+ public String getName()
+ {
+ return "media-printable-area";
+ }
+
+ public float getHeight(int units)
+ {
+ if (units < 1)
+ throw new IllegalArgumentException();
+
+ return height * units;
+ }
+
+ public float getWidth(int units)
+ {
+ if (units < 1)
+ throw new IllegalArgumentException();
+
+ return width * units;
+ }
+
+ public float getX(int units)
+ {
+ if (units < 1)
+ throw new IllegalArgumentException();
+
+ return x * units;
+ }
+
+ public float getY(int units)
+ {
+ if (units < 1)
+ throw new IllegalArgumentException();
+
+ return y * units;
+ }
+}
===================================================================
Checking out kaffe/libraries/javalib/javax/print/attribute/standard/MediaSize.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/javax/print/attribute/standard/MediaSize.java,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/javax/print/attribute/standard/MediaSize.java Sat Jan 22 19:16:44 2005
@@ -0,0 +1,114 @@
+/* MediaSize.java --
+ Copyright (C) 2005 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.attribute.standard;
+
+import java.util.ArrayList;
+
+import javax.print.attribute.Attribute;
+import javax.print.attribute.Size2DSyntax;
+
+public class MediaSize extends Size2DSyntax
+ implements Attribute
+{
+ private static final long serialVersionUID = -1967958664615414771L;
+
+ private static ArrayList mediaCache = new ArrayList();
+
+ private MediaSizeName media;
+
+ public MediaSize(float x, float y, int units)
+ {
+ super(x, y, units);
+ }
+
+ public MediaSize(float x, float y, int units, MediaSizeName media)
+ {
+ super(x, y, units);
+ this.media = media;
+ }
+
+ public MediaSize(int x, int y, int units)
+ {
+ super(x, y, units);
+ }
+
+ public MediaSize(int x, int y, int units, MediaSizeName media)
+ {
+ super(x, y, units);
+ this.media = media;
+ }
+
+ /**
+ * Returns category of this class.
+ *
+ * @return the class <code>MediaSize</code> itself
+ */
+ public Class getCategory()
+ {
+ return MediaSize.class;
+ }
+
+ public static MediaSize getMediaSizeForName(MediaSizeName media)
+ {
+ for (int i = 0; i < mediaCache.size(); i++)
+ {
+ MediaSize size = (MediaSize) mediaCache.get(i);
+
+ if (size.getMediaSizeName().equals(media))
+ return size;
+ }
+
+ return null;
+ }
+
+ public MediaSizeName getMediaSizeName()
+ {
+ return media;
+ }
+
+ /**
+ * Returns name of this class.
+ *
+ * @return the string "media-size"
+ */
+ public String getName()
+ {
+ return "media-size";
+ }
+}
More information about the kaffe
mailing list