diff options
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/Makefile.am | 4 | ||||
| -rw-r--r-- | libjava/Makefile.in | 36 | ||||
| -rw-r--r-- | libjava/javax/print/attribute/standard/Chromaticity.java | 86 | ||||
| -rw-r--r-- | libjava/javax/print/attribute/standard/Destination.java | 82 | ||||
| -rw-r--r-- | libjava/javax/print/attribute/standard/MediaPrintableArea.java | 146 | ||||
| -rw-r--r-- | libjava/javax/print/attribute/standard/MediaSize.java | 114 |
7 files changed, 477 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c2678d6..60740f9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2005-02-17 Michael Koch <konqueror@gmx.de> + + * javax/print/attribute/standard/Chromaticity.java, + javax/print/attribute/standard/Destination.java, + javax/print/attribute/standard/MediaPrintableArea.java, + javax/print/attribute/standard/MediaSize.java: New files. + * Makefile.am: Added new files. + * Makefile.in: Regenerated. + 2005-02-17 Andrew John Hughes <gnu_andrew@member.fsf.org> Michael Koch <konqueror@gmx.de> diff --git a/libjava/Makefile.am b/libjava/Makefile.am index abf837d..41117b2 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -2017,6 +2017,10 @@ javax/print/attribute/HashPrintServiceAttributeSet.java \ javax/print/attribute/Attribute.java \ javax/print/attribute/DocAttributeSet.java \ javax/print/attribute/PrintRequestAttributeSet.java \ +javax/print/attribute/standard/Chromaticity.java \ +javax/print/attribute/standard/Destination.java \ +javax/print/attribute/standard/MediaPrintableArea.java \ +javax/print/attribute/standard/MediaSize.java \ javax/print/attribute/standard/NumberOfInterveningJobs.java \ javax/print/attribute/standard/PrinterMakeAndModel.java \ javax/print/attribute/standard/PrinterStateReason.java \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index ca6b28a..b987896 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -2016,6 +2016,10 @@ am__libgcj0_convenience_la_SOURCES_DIST = prims.cc jni.cc exception.cc \ javax/print/attribute/Attribute.java \ javax/print/attribute/DocAttributeSet.java \ javax/print/attribute/PrintRequestAttributeSet.java \ + javax/print/attribute/standard/Chromaticity.java \ + javax/print/attribute/standard/Destination.java \ + javax/print/attribute/standard/MediaPrintableArea.java \ + javax/print/attribute/standard/MediaSize.java \ javax/print/attribute/standard/NumberOfInterveningJobs.java \ javax/print/attribute/standard/PrinterMakeAndModel.java \ javax/print/attribute/standard/PrinterStateReason.java \ @@ -3518,6 +3522,10 @@ am__objects_13 = javax/imageio/ImageWriteParam.lo \ javax/print/attribute/Attribute.lo \ javax/print/attribute/DocAttributeSet.lo \ javax/print/attribute/PrintRequestAttributeSet.lo \ + javax/print/attribute/standard/Chromaticity.lo \ + javax/print/attribute/standard/Destination.lo \ + javax/print/attribute/standard/MediaPrintableArea.lo \ + javax/print/attribute/standard/MediaSize.lo \ javax/print/attribute/standard/NumberOfInterveningJobs.lo \ javax/print/attribute/standard/PrinterMakeAndModel.lo \ javax/print/attribute/standard/PrinterStateReason.lo \ @@ -6294,6 +6302,10 @@ javax/print/attribute/HashPrintServiceAttributeSet.java \ javax/print/attribute/Attribute.java \ javax/print/attribute/DocAttributeSet.java \ javax/print/attribute/PrintRequestAttributeSet.java \ +javax/print/attribute/standard/Chromaticity.java \ +javax/print/attribute/standard/Destination.java \ +javax/print/attribute/standard/MediaPrintableArea.java \ +javax/print/attribute/standard/MediaSize.java \ javax/print/attribute/standard/NumberOfInterveningJobs.java \ javax/print/attribute/standard/PrinterMakeAndModel.java \ javax/print/attribute/standard/PrinterStateReason.java \ @@ -14069,6 +14081,18 @@ javax/print/attribute/standard/$(am__dirstamp): javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp): @$(mkdir_p) javax/print/attribute/standard/$(DEPDIR) @: > javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp) +javax/print/attribute/standard/Chromaticity.lo: \ + javax/print/attribute/standard/$(am__dirstamp) \ + javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp) +javax/print/attribute/standard/Destination.lo: \ + javax/print/attribute/standard/$(am__dirstamp) \ + javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp) +javax/print/attribute/standard/MediaPrintableArea.lo: \ + javax/print/attribute/standard/$(am__dirstamp) \ + javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp) +javax/print/attribute/standard/MediaSize.lo: \ + javax/print/attribute/standard/$(am__dirstamp) \ + javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp) javax/print/attribute/standard/NumberOfInterveningJobs.lo: \ javax/print/attribute/standard/$(am__dirstamp) \ javax/print/attribute/standard/$(DEPDIR)/$(am__dirstamp) @@ -20163,6 +20187,8 @@ mostlyclean-compile: -rm -f javax/print/attribute/URISyntax.lo -rm -f javax/print/attribute/UnmodifiableSetException.$(OBJEXT) -rm -f javax/print/attribute/UnmodifiableSetException.lo + -rm -f javax/print/attribute/standard/Chromaticity.$(OBJEXT) + -rm -f javax/print/attribute/standard/Chromaticity.lo -rm -f javax/print/attribute/standard/ColorSupported.$(OBJEXT) -rm -f javax/print/attribute/standard/ColorSupported.lo -rm -f javax/print/attribute/standard/Compression.$(OBJEXT) @@ -20177,6 +20203,8 @@ mostlyclean-compile: -rm -f javax/print/attribute/standard/DateTimeAtCreation.lo -rm -f javax/print/attribute/standard/DateTimeAtProcessing.$(OBJEXT) -rm -f javax/print/attribute/standard/DateTimeAtProcessing.lo + -rm -f javax/print/attribute/standard/Destination.$(OBJEXT) + -rm -f javax/print/attribute/standard/Destination.lo -rm -f javax/print/attribute/standard/DocumentName.$(OBJEXT) -rm -f javax/print/attribute/standard/DocumentName.lo -rm -f javax/print/attribute/standard/Fidelity.$(OBJEXT) @@ -20223,6 +20251,10 @@ mostlyclean-compile: -rm -f javax/print/attribute/standard/JobStateReasons.lo -rm -f javax/print/attribute/standard/Media.$(OBJEXT) -rm -f javax/print/attribute/standard/Media.lo + -rm -f javax/print/attribute/standard/MediaPrintableArea.$(OBJEXT) + -rm -f javax/print/attribute/standard/MediaPrintableArea.lo + -rm -f javax/print/attribute/standard/MediaSize.$(OBJEXT) + -rm -f javax/print/attribute/standard/MediaSize.lo -rm -f javax/print/attribute/standard/MediaSizeName.$(OBJEXT) -rm -f javax/print/attribute/standard/MediaSizeName.lo -rm -f javax/print/attribute/standard/MultipleDocumentHandling.$(OBJEXT) @@ -23573,6 +23605,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/$(DEPDIR)/TextSyntax.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/$(DEPDIR)/URISyntax.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/$(DEPDIR)/UnmodifiableSetException.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/Chromaticity.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/ColorSupported.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/Compression.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/Copies.Plo@am__quote@ @@ -23580,6 +23613,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/DateTimeAtCompleted.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/DateTimeAtCreation.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/DateTimeAtProcessing.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/Destination.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/DocumentName.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/Fidelity.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/Finishings.Plo@am__quote@ @@ -23603,6 +23637,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/JobStateReason.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/JobStateReasons.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/Media.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/MediaPrintableArea.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/MediaSize.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/MediaSizeName.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/MultipleDocumentHandling.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@javax/print/attribute/standard/$(DEPDIR)/NumberOfDocuments.Plo@am__quote@ diff --git a/libjava/javax/print/attribute/standard/Chromaticity.java b/libjava/javax/print/attribute/standard/Chromaticity.java new file mode 100644 index 0000000..306cc38 --- /dev/null +++ b/libjava/javax/print/attribute/standard/Chromaticity.java @@ -0,0 +1,86 @@ +/* Chromaticity.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.EnumSyntax; +import javax.print.attribute.PrintJobAttribute; +import javax.print.attribute.PrintRequestAttribute; + +/** + * @author Michael Koch (konqueror@gmx.de) + */ +public final class Chromaticity extends EnumSyntax + implements DocAttribute, PrintRequestAttribute, PrintJobAttribute +{ + private static final long serialVersionUID = 4660543931355214012L; + + public static final Chromaticity MONOCHROME = new Chromaticity(0); + public static final Chromaticity COLOR = new Chromaticity(1); + + /** + * Creates a <code>Chromaticity</code> object. + * + * @param value the enum value + */ + protected Chromaticity(int value) + { + super(value); + } + + /** + * Returns category of this class. + * + * @return the class <code>Sides</code> itself + */ + public Class getCategory() + { + return Chromaticity.class; + } + + /** + * Returns the name of this attribute. + * + * @return the name + */ + public String getName() + { + return "chromaticity"; + } +} diff --git a/libjava/javax/print/attribute/standard/Destination.java b/libjava/javax/print/attribute/standard/Destination.java new file mode 100644 index 0000000..6d723cc --- /dev/null +++ b/libjava/javax/print/attribute/standard/Destination.java @@ -0,0 +1,82 @@ +/* Destination.java -- + Copyright (C) 2004, 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.net.URI; + +import javax.print.attribute.PrintJobAttribute; +import javax.print.attribute.PrintRequestAttribute; +import javax.print.attribute.URISyntax; + +/** + * @author Michael Koch (konqueror@gmx.de) + */ +public final class Destination extends URISyntax + implements PrintJobAttribute, PrintRequestAttribute +{ + private static final long serialVersionUID = 6776739171700415321L; + + /** + * Constructs a <code>Destination</code> object. + */ + public Destination(URI uri) + { + super(uri); + } + + /** + * Returns category of this class. + * + * @return the class <code>Destination</code> itself + */ + public Class getCategory() + { + return Destination.class; + } + + /** + * Returns name of this class. + * + * @return the string "printer-uri" + */ + public String getName() + { + return "destination"; + } +} diff --git a/libjava/javax/print/attribute/standard/MediaPrintableArea.java b/libjava/javax/print/attribute/standard/MediaPrintableArea.java new file mode 100644 index 0000000..cc1a07e --- /dev/null +++ b/libjava/javax/print/attribute/standard/MediaPrintableArea.java @@ -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@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; + } +} diff --git a/libjava/javax/print/attribute/standard/MediaSize.java b/libjava/javax/print/attribute/standard/MediaSize.java new file mode 100644 index 0000000..35a6d3e --- /dev/null +++ b/libjava/javax/print/attribute/standard/MediaSize.java @@ -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"; + } +} |