This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
| Other format: | [Raw text] | |
Hi,
This imports all the work that Michael Koch did on the javax.print and
subpackages in GNU Classpath.
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.
This also makes mauve (CVS) compile again.
[Sadly it seems the test results are pretty bad :{
See also the results that Andreas Tobler posted:
http://gcc.gnu.org/ml/gcc-testresults/2004-05/msg00675.html]
The attached diff isn't that big because I left out all the (52) new
files.
Committed.
Cheers,
Mark
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.376
diff -u -r1.376 Makefile.am
--- Makefile.am 15 May 2004 17:50:08 -0000 1.376
+++ Makefile.am 15 May 2004 20:28:32 -0000
@@ -1856,6 +1856,21 @@
javax/naming/ldap/UnsolicitedNotificationEvent.java \
javax/naming/ldap/UnsolicitedNotificationListener.java \
javax/naming/OperationNotSupportedException.java \
+javax/print/AttributeException.java \
+javax/print/CancelablePrintJob.java \
+javax/print/Doc.java \
+javax/print/DocFlavor.java \
+javax/print/DocPrintJob.java \
+javax/print/FlavorException.java \
+javax/print/MultiDoc.java \
+javax/print/MultiDocPrintJob.java \
+javax/print/MultiDocPrintService.java \
+javax/print/PrintException.java \
+javax/print/PrintService.java \
+javax/print/PrintServiceLookup.java \
+javax/print/ServiceUIFactory.java \
+javax/print/StreamPrintService.java \
+javax/print/URIException.java \
javax/print/attribute/Attribute.java \
javax/print/attribute/AttributeSet.java \
javax/print/attribute/AttributeSetUtilities.java \
@@ -1882,36 +1897,77 @@
javax/print/attribute/TextSyntax.java \
javax/print/attribute/UnmodifiableSetException.java \
javax/print/attribute/URISyntax.java \
+javax/print/attribute/standard/ColorSupported.java \
+javax/print/attribute/standard/Compression.java \
javax/print/attribute/standard/Copies.java \
+javax/print/attribute/standard/CopiesSupported.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/Fidelity.java \
+javax/print/attribute/standard/Finishings.java \
javax/print/attribute/standard/JobHoldUntil.java \
javax/print/attribute/standard/JobImpressions.java \
javax/print/attribute/standard/JobImpressionsCompleted.java \
+javax/print/attribute/standard/JobImpressionsSupported.java \
javax/print/attribute/standard/JobKOctets.java \
javax/print/attribute/standard/JobKOctetsProcessed.java \
+javax/print/attribute/standard/JobKOctetsSupported.java \
javax/print/attribute/standard/JobMediaSheets.java \
javax/print/attribute/standard/JobMediaSheetsCompleted.java \
+javax/print/attribute/standard/JobMediaSheetsSupported.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/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/NumberOfDocuments.java \
javax/print/attribute/standard/NumberOfInterveningJobs.java \
javax/print/attribute/standard/NumberUp.java \
+javax/print/attribute/standard/NumberUpSupported.java \
+javax/print/attribute/standard/OrientationRequested.java \
javax/print/attribute/standard/OutputDeviceAssigned.java \
+javax/print/attribute/standard/PDLOverrideSupported.java \
+javax/print/attribute/standard/PageRanges.java \
javax/print/attribute/standard/PagesPerMinute.java \
javax/print/attribute/standard/PagesPerMinuteColor.java \
+javax/print/attribute/standard/PresentationDirection.java \
+javax/print/attribute/standard/PrintQuality.java \
javax/print/attribute/standard/PrinterInfo.java \
+javax/print/attribute/standard/PrinterIsAcceptingJobs.java \
javax/print/attribute/standard/PrinterLocation.java \
javax/print/attribute/standard/PrinterMakeAndModel.java \
javax/print/attribute/standard/PrinterMessageFromOperator.java \
+javax/print/attribute/standard/PrinterMoreInfo.java \
+javax/print/attribute/standard/PrinterMoreInfoManufacturer.java \
javax/print/attribute/standard/PrinterName.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/QueuedJobCount.java \
+javax/print/attribute/standard/ReferenceUriSchemesSupported.java \
javax/print/attribute/standard/RequestingUserName.java \
+javax/print/attribute/standard/Severity.java \
+javax/print/attribute/standard/SheetCollate.java \
+javax/print/attribute/standard/Sides.java \
+javax/print/event/PrintEvent.java \
+javax/print/event/PrintJobAdapter.java \
+javax/print/event/PrintJobAttributeEvent.java \
+javax/print/event/PrintJobAttributeListener.java \
+javax/print/event/PrintJobEvent.java \
+javax/print/event/PrintJobListener.java \
+javax/print/event/PrintServiceAttributeEvent.java \
+javax/print/event/PrintServiceAttributeListener.java \
javax/security/auth/x500/X500Principal.java \
javax/sql/ConnectionEvent.java \
javax/sql/ConnectionEventListener.java \
Index: javax/print/attribute/AttributeSetUtilities.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/AttributeSetUtilities.java,v
retrieving revision 1.2
diff -u -r1.2 AttributeSetUtilities.java
--- javax/print/attribute/AttributeSetUtilities.java 23 Dec 2003 10:21:31 -0000 1.2
+++ javax/print/attribute/AttributeSetUtilities.java 15 May 2004 20:28:32 -0000
@@ -1,5 +1,5 @@
/* AttributeSetUtilities.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -427,7 +427,7 @@
* Verifies that the category of attribute is equals to category.
*
* @param category the category the atteribute should be
- * @param attribtue the attribute to verify
+ * @param attribute the attribute to verify
*
* @exception IllegalArgumentException if the categories are not equal
* @exception NullPointerException if category is null
Index: javax/print/attribute/HashAttributeSet.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/HashAttributeSet.java,v
retrieving revision 1.3
diff -u -r1.3 HashAttributeSet.java
--- javax/print/attribute/HashAttributeSet.java 20 Apr 2004 10:48:56 -0000 1.3
+++ javax/print/attribute/HashAttributeSet.java 15 May 2004 20:28:32 -0000
@@ -1,5 +1,5 @@
/* HashAttributeSet.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -232,7 +232,7 @@
*
* @param category the category to test for
*
- * @result true if the category exists in this attribute set, false otherwise.
+ * @return true if the category exists in this attribute set, false otherwise.
*/
public boolean containsKey(Class category)
{
@@ -244,7 +244,7 @@
*
* @param attribute the attribute to test for
*
- * @result true if the attribute exists in this attribute set,
+ * @return true if the attribute exists in this attribute set,
* false otherwise.
*/
public boolean containsValue(Attribute attribute)
@@ -257,7 +257,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/IntegerSyntax.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/IntegerSyntax.java,v
retrieving revision 1.1
diff -u -r1.1 IntegerSyntax.java
--- javax/print/attribute/IntegerSyntax.java 21 Dec 2003 11:10:54 -0000 1.1
+++ javax/print/attribute/IntegerSyntax.java 15 May 2004 20:28:32 -0000
@@ -1,5 +1,5 @@
/* IntegerSyntax.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -90,7 +90,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/ResolutionSyntax.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/ResolutionSyntax.java,v
retrieving revision 1.3
diff -u -r1.3 ResolutionSyntax.java
--- javax/print/attribute/ResolutionSyntax.java 20 Apr 2004 10:48:56 -0000 1.3
+++ javax/print/attribute/ResolutionSyntax.java 15 May 2004 20:28:32 -0000
@@ -1,5 +1,5 @@
/* ResolutionSyntax.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -86,7 +86,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
@@ -111,7 +111,6 @@
if (units < 1)
throw new IllegalArgumentException("units may not be less then 1");
- int rount = units / 2;
return (crossFeedResolution + units) / units;
}
@@ -137,7 +136,6 @@
if (units < 1)
throw new IllegalArgumentException("units may not be less then 1");
- int rount = units / 2;
return (crossFeedResolution + units) / units;
}
Index: javax/print/attribute/SetOfIntegerSyntax.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/SetOfIntegerSyntax.java,v
retrieving revision 1.3
diff -u -r1.3 SetOfIntegerSyntax.java
--- javax/print/attribute/SetOfIntegerSyntax.java 20 Apr 2004 10:48:56 -0000 1.3
+++ javax/print/attribute/SetOfIntegerSyntax.java 15 May 2004 20:28:32 -0000
@@ -1,5 +1,5 @@
/* SetOfIntegerSyntax.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -199,7 +199,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/TextSyntax.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/TextSyntax.java,v
retrieving revision 1.2
diff -u -r1.2 TextSyntax.java
--- javax/print/attribute/TextSyntax.java 20 Apr 2004 10:48:56 -0000 1.2
+++ javax/print/attribute/TextSyntax.java 15 May 2004 20:28:32 -0000
@@ -121,6 +121,6 @@
*/
public String toString()
{
- return value;
+ return getValue();
}
}
Index: javax/print/attribute/standard/Copies.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/Copies.java,v
retrieving revision 1.2
diff -u -r1.2 Copies.java
--- javax/print/attribute/standard/Copies.java 27 Dec 2003 14:21:08 -0000 1.2
+++ javax/print/attribute/standard/Copies.java 15 May 2004 20:28:32 -0000
@@ -69,7 +69,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/DateTimeAtCompleted.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/DateTimeAtCompleted.java,v
retrieving revision 1.1
diff -u -r1.1 DateTimeAtCompleted.java
--- javax/print/attribute/standard/DateTimeAtCompleted.java 6 Jan 2004 13:48:52 -0000 1.1
+++ javax/print/attribute/standard/DateTimeAtCompleted.java 15 May 2004 20:28:32 -0000
@@ -1,5 +1,5 @@
/* DateTimeAtCompleted.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -41,6 +41,10 @@
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class DateTimeAtCompleted extends DateTimeSyntax
implements PrintJobAttribute
{
@@ -63,7 +67,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/DateTimeAtCreation.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/DateTimeAtCreation.java,v
retrieving revision 1.1
diff -u -r1.1 DateTimeAtCreation.java
--- javax/print/attribute/standard/DateTimeAtCreation.java 6 Jan 2004 13:48:52 -0000 1.1
+++ javax/print/attribute/standard/DateTimeAtCreation.java 15 May 2004 20:28:32 -0000
@@ -1,5 +1,5 @@
/* DateTimeAtCreation.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -41,6 +41,10 @@
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class DateTimeAtCreation extends DateTimeSyntax
implements PrintJobAttribute
{
@@ -63,7 +67,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/DateTimeAtProcessing.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/DateTimeAtProcessing.java,v
retrieving revision 1.1
diff -u -r1.1 DateTimeAtProcessing.java
--- javax/print/attribute/standard/DateTimeAtProcessing.java 6 Jan 2004 13:48:52 -0000 1.1
+++ javax/print/attribute/standard/DateTimeAtProcessing.java 15 May 2004 20:28:32 -0000
@@ -1,5 +1,5 @@
/* DateTimeAtProcessing.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -41,6 +41,10 @@
import javax.print.attribute.DateTimeSyntax;
import javax.print.attribute.PrintJobAttribute;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class DateTimeAtProcessing extends DateTimeSyntax
implements PrintJobAttribute
{
@@ -63,7 +67,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/DocumentName.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/DocumentName.java,v
retrieving revision 1.1
diff -u -r1.1 DocumentName.java
--- javax/print/attribute/standard/DocumentName.java 9 Jan 2004 11:26:42 -0000 1.1
+++ javax/print/attribute/standard/DocumentName.java 15 May 2004 20:28:32 -0000
@@ -41,6 +41,10 @@
import javax.print.attribute.DocAttribute;
import javax.print.attribute.TextSyntax;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class DocumentName extends TextSyntax
implements DocAttribute
{
@@ -63,7 +67,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/JobHoldUntil.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobHoldUntil.java,v
retrieving revision 1.1
diff -u -r1.1 JobHoldUntil.java
--- javax/print/attribute/standard/JobHoldUntil.java 9 Jan 2004 11:26:42 -0000 1.1
+++ javax/print/attribute/standard/JobHoldUntil.java 15 May 2004 20:28:32 -0000
@@ -42,6 +42,9 @@
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class JobHoldUntil extends DateTimeSyntax
implements PrintJobAttribute, PrintRequestAttribute
{
@@ -64,7 +67,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/JobImpressions.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobImpressions.java,v
retrieving revision 1.2
diff -u -r1.2 JobImpressions.java
--- javax/print/attribute/standard/JobImpressions.java 27 Dec 2003 14:21:08 -0000 1.2
+++ javax/print/attribute/standard/JobImpressions.java 15 May 2004 20:28:32 -0000
@@ -69,7 +69,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/JobImpressionsCompleted.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobImpressionsCompleted.java,v
retrieving revision 1.1
diff -u -r1.1 JobImpressionsCompleted.java
--- javax/print/attribute/standard/JobImpressionsCompleted.java 6 Jan 2004 13:48:52 -0000 1.1
+++ javax/print/attribute/standard/JobImpressionsCompleted.java 15 May 2004 20:28:32 -0000
@@ -1,5 +1,5 @@
/* JobImpressionsCompleted.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -41,7 +41,7 @@
import javax.print.attribute.PrintJobAttribute;
/**
- * @author Michael Koch
+ * @author Michael Koch (konqueror@gmx.de)
*/
public final class JobImpressionsCompleted extends IntegerSyntax
implements PrintJobAttribute
@@ -68,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/JobKOctets.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobKOctets.java,v
retrieving revision 1.1
diff -u -r1.1 JobKOctets.java
--- javax/print/attribute/standard/JobKOctets.java 6 Jan 2004 13:48:52 -0000 1.1
+++ javax/print/attribute/standard/JobKOctets.java 15 May 2004 20:28:32 -0000
@@ -69,7 +69,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/JobKOctetsProcessed.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobKOctetsProcessed.java,v
retrieving revision 1.2
diff -u -r1.2 JobKOctetsProcessed.java
--- javax/print/attribute/standard/JobKOctetsProcessed.java 10 Jan 2004 22:16:01 -0000 1.2
+++ javax/print/attribute/standard/JobKOctetsProcessed.java 15 May 2004 20:28:32 -0000
@@ -68,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/JobMediaSheets.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobMediaSheets.java,v
retrieving revision 1.2
diff -u -r1.2 JobMediaSheets.java
--- javax/print/attribute/standard/JobMediaSheets.java 27 Dec 2003 14:21:08 -0000 1.2
+++ javax/print/attribute/standard/JobMediaSheets.java 15 May 2004 20:28:32 -0000
@@ -69,7 +69,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/JobMediaSheetsCompleted.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.java,v
retrieving revision 1.2
diff -u -r1.2 JobMediaSheetsCompleted.java
--- javax/print/attribute/standard/JobMediaSheetsCompleted.java 10 Jan 2004 22:16:01 -0000 1.2
+++ javax/print/attribute/standard/JobMediaSheetsCompleted.java 15 May 2004 20:28:32 -0000
@@ -68,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/JobMessageFromOperator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobMessageFromOperator.java,v
retrieving revision 1.1
diff -u -r1.1 JobMessageFromOperator.java
--- javax/print/attribute/standard/JobMessageFromOperator.java 9 Jan 2004 11:26:42 -0000 1.1
+++ javax/print/attribute/standard/JobMessageFromOperator.java 15 May 2004 20:28:32 -0000
@@ -41,6 +41,10 @@
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.TextSyntax;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class JobMessageFromOperator extends TextSyntax
implements PrintJobAttribute
{
@@ -63,7 +67,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/JobName.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobName.java,v
retrieving revision 1.1
diff -u -r1.1 JobName.java
--- javax/print/attribute/standard/JobName.java 9 Jan 2004 11:26:42 -0000 1.1
+++ javax/print/attribute/standard/JobName.java 15 May 2004 20:28:32 -0000
@@ -42,6 +42,10 @@
import javax.print.attribute.PrintRequestAttribute;
import javax.print.attribute.TextSyntax;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class JobName extends TextSyntax
implements PrintJobAttribute, PrintRequestAttribute
{
@@ -64,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/JobOriginatingUserName.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobOriginatingUserName.java,v
retrieving revision 1.1
diff -u -r1.1 JobOriginatingUserName.java
--- javax/print/attribute/standard/JobOriginatingUserName.java 9 Jan 2004 11:26:42 -0000 1.1
+++ javax/print/attribute/standard/JobOriginatingUserName.java 15 May 2004 20:28:32 -0000
@@ -41,6 +41,10 @@
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.TextSyntax;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class JobOriginatingUserName extends TextSyntax
implements PrintJobAttribute
{
@@ -63,7 +67,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/JobPriority.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobPriority.java,v
retrieving revision 1.1
diff -u -r1.1 JobPriority.java
--- javax/print/attribute/standard/JobPriority.java 23 Dec 2003 11:55:29 -0000 1.1
+++ javax/print/attribute/standard/JobPriority.java 15 May 2004 20:28:32 -0000
@@ -1,5 +1,5 @@
/* JobPriority.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -41,6 +41,10 @@
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.PrintRequestAttribute;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class JobPriority extends IntegerSyntax
implements PrintJobAttribute, PrintRequestAttribute
{
@@ -66,7 +70,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/JobPrioritySupported.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobPrioritySupported.java,v
retrieving revision 1.1
diff -u -r1.1 JobPrioritySupported.java
--- javax/print/attribute/standard/JobPrioritySupported.java 6 Jan 2004 13:48:52 -0000 1.1
+++ javax/print/attribute/standard/JobPrioritySupported.java 15 May 2004 20:28:32 -0000
@@ -1,5 +1,5 @@
/* JobPrioritySupported.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -40,6 +40,10 @@
import javax.print.attribute.IntegerSyntax;
import javax.print.attribute.SupportedValuesAttribute;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class JobPrioritySupported extends IntegerSyntax
implements SupportedValuesAttribute
{
@@ -65,7 +69,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/NumberOfDocuments.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/NumberOfDocuments.java,v
retrieving revision 1.2
diff -u -r1.2 NumberOfDocuments.java
--- javax/print/attribute/standard/NumberOfDocuments.java 27 Dec 2003 14:21:08 -0000 1.2
+++ javax/print/attribute/standard/NumberOfDocuments.java 15 May 2004 20:28:32 -0000
@@ -68,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/NumberOfInterveningJobs.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.java,v
retrieving revision 1.2
diff -u -r1.2 NumberOfInterveningJobs.java
--- javax/print/attribute/standard/NumberOfInterveningJobs.java 27 Dec 2003 14:21:08 -0000 1.2
+++ javax/print/attribute/standard/NumberOfInterveningJobs.java 15 May 2004 20:28:32 -0000
@@ -1,5 +1,5 @@
/* NumberOfInterveningJobs.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -49,7 +49,7 @@
private static final long serialVersionUID = 2568141124844982746L;
/**
- * Creates a <code>QueuedJobCount</code> object.
+ * Creates a <code>NumberOfInterveningJobs</code> object.
*
* @param value the number of intervening jobs
*
@@ -68,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/NumberUp.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/NumberUp.java,v
retrieving revision 1.1
diff -u -r1.1 NumberUp.java
--- javax/print/attribute/standard/NumberUp.java 23 Dec 2003 11:55:29 -0000 1.1
+++ javax/print/attribute/standard/NumberUp.java 15 May 2004 20:28:32 -0000
@@ -68,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/OutputDeviceAssigned.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/OutputDeviceAssigned.java,v
retrieving revision 1.2
diff -u -r1.2 OutputDeviceAssigned.java
--- javax/print/attribute/standard/OutputDeviceAssigned.java 10 Jan 2004 22:16:01 -0000 1.2
+++ javax/print/attribute/standard/OutputDeviceAssigned.java 15 May 2004 20:28:32 -0000
@@ -41,6 +41,9 @@
import javax.print.attribute.PrintJobAttribute;
import javax.print.attribute.TextSyntax;
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class OutputDeviceAssigned extends TextSyntax
implements PrintJobAttribute
{
@@ -63,7 +66,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/PagesPerMinute.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/PagesPerMinute.java,v
retrieving revision 1.2
diff -u -r1.2 PagesPerMinute.java
--- javax/print/attribute/standard/PagesPerMinute.java 27 Dec 2003 14:21:08 -0000 1.2
+++ javax/print/attribute/standard/PagesPerMinute.java 15 May 2004 20:28:32 -0000
@@ -68,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/PagesPerMinuteColor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/PagesPerMinuteColor.java,v
retrieving revision 1.2
diff -u -r1.2 PagesPerMinuteColor.java
--- javax/print/attribute/standard/PagesPerMinuteColor.java 27 Dec 2003 14:21:08 -0000 1.2
+++ javax/print/attribute/standard/PagesPerMinuteColor.java 15 May 2004 20:28:32 -0000
@@ -68,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
Index: javax/print/attribute/standard/PrinterInfo.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/PrinterInfo.java,v
retrieving revision 1.1
diff -u -r1.1 PrinterInfo.java
--- javax/print/attribute/standard/PrinterInfo.java 9 Jan 2004 11:26:42 -0000 1.1
+++ javax/print/attribute/standard/PrinterInfo.java 15 May 2004 20:28:32 -0000
@@ -41,6 +41,10 @@
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class PrinterInfo extends TextSyntax
implements PrintServiceAttribute
{
@@ -50,6 +54,7 @@
* Creates a <code>PrinterInfo</code> object.
*
* @param printerInfo the printer info
+ * @param locale the locale of the info, null means default locale
*
* @exception NullPointerException if printerInfo is null
*/
@@ -63,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
@@ -78,7 +83,7 @@
*
* @return the class <code>PrinterInfo</code> itself
*/
- public final Class getCategory()
+ public Class getCategory()
{
return PrinterInfo.class;
}
@@ -88,7 +93,7 @@
*
* @return the string "printer-info"
*/
- public final String getName()
+ public String getName()
{
return "printer-info";
}
Index: javax/print/attribute/standard/PrinterLocation.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/PrinterLocation.java,v
retrieving revision 1.1
diff -u -r1.1 PrinterLocation.java
--- javax/print/attribute/standard/PrinterLocation.java 9 Jan 2004 11:26:42 -0000 1.1
+++ javax/print/attribute/standard/PrinterLocation.java 15 May 2004 20:28:32 -0000
@@ -41,6 +41,9 @@
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class PrinterLocation extends TextSyntax
implements PrintServiceAttribute
{
@@ -50,6 +53,7 @@
* Creates a <code>PrinterLocation</code> object.
*
* @param printerLocation the printer location
+ * @param locale the locale of the location, null means default locale
*
* @exception NullPointerException if printerLocation is null
*/
@@ -63,7 +67,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
@@ -78,7 +82,7 @@
*
* @return the class <code>PrinterLocation</code> itself
*/
- public final Class getCategory()
+ public Class getCategory()
{
return PrinterLocation.class;
}
@@ -88,7 +92,7 @@
*
* @return the string "printer-location"
*/
- public final String getName()
+ public String getName()
{
return "printer-location";
}
Index: javax/print/attribute/standard/PrinterMakeAndModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/PrinterMakeAndModel.java,v
retrieving revision 1.1
diff -u -r1.1 PrinterMakeAndModel.java
--- javax/print/attribute/standard/PrinterMakeAndModel.java 9 Jan 2004 11:26:42 -0000 1.1
+++ javax/print/attribute/standard/PrinterMakeAndModel.java 15 May 2004 20:28:32 -0000
@@ -41,6 +41,9 @@
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class PrinterMakeAndModel extends TextSyntax
implements PrintServiceAttribute
{
@@ -50,6 +53,7 @@
* Creates a <code>PrinterMakeAndModel</code> object.
*
* @param makeAndModel the make and model string
+ * @param locale the locale of the make and model, null means default locale
*
* @exception NullPointerException if makeAndModel is null
*/
@@ -63,7 +67,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
@@ -78,7 +82,7 @@
*
* @return the class <code>PrinterMakeAndModel</code> itself
*/
- public final Class getCategory()
+ public Class getCategory()
{
return PrinterMakeAndModel.class;
}
@@ -88,7 +92,7 @@
*
* @return the string "printer-make-and-model"
*/
- public final String getName()
+ public String getName()
{
return "printer-make-and-model";
}
Index: javax/print/attribute/standard/PrinterMessageFromOperator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.java,v
retrieving revision 1.1
diff -u -r1.1 PrinterMessageFromOperator.java
--- javax/print/attribute/standard/PrinterMessageFromOperator.java 9 Jan 2004 11:26:42 -0000 1.1
+++ javax/print/attribute/standard/PrinterMessageFromOperator.java 15 May 2004 20:28:32 -0000
@@ -41,6 +41,10 @@
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class PrinterMessageFromOperator extends TextSyntax
implements PrintServiceAttribute
{
@@ -50,6 +54,7 @@
* Creates a <code>PrinterMessageFromOperator</code> object.
*
* @param message the message
+ * @param locale the locale of the message, null means default locale
*
* @exception NullPointerException if message is null
*/
@@ -63,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
@@ -78,7 +83,7 @@
*
* @return the class <code>PrinterMessageFromOperator</code> itself
*/
- public final Class getCategory()
+ public Class getCategory()
{
return PrinterMessageFromOperator.class;
}
@@ -88,7 +93,7 @@
*
* @return the string "printer-message-from-operator"
*/
- public final String getName()
+ public String getName()
{
return "printer-message-from-operator";
}
Index: javax/print/attribute/standard/PrinterName.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/PrinterName.java,v
retrieving revision 1.1
diff -u -r1.1 PrinterName.java
--- javax/print/attribute/standard/PrinterName.java 9 Jan 2004 11:26:42 -0000 1.1
+++ javax/print/attribute/standard/PrinterName.java 15 May 2004 20:28:32 -0000
@@ -41,6 +41,10 @@
import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.TextSyntax;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class PrinterName extends TextSyntax
implements PrintServiceAttribute
{
@@ -50,6 +54,7 @@
* Creates a <code>PrinterName</code> object.
*
* @param printerName the printer name
+ * @param locale the locale of the name, null means default locale
*
* @exception NullPointerException if printerName is null
*/
@@ -63,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
@@ -78,7 +83,7 @@
*
* @return the class <code>PrinterName</code> itself
*/
- public final Class getCategory()
+ public Class getCategory()
{
return PrinterName.class;
}
@@ -88,7 +93,7 @@
*
* @return the string "printer-name"
*/
- public final String getName()
+ public String getName()
{
return "printer-name";
}
Index: javax/print/attribute/standard/QueuedJobCount.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/QueuedJobCount.java,v
retrieving revision 1.2
diff -u -r1.2 QueuedJobCount.java
--- javax/print/attribute/standard/QueuedJobCount.java 27 Dec 2003 14:21:08 -0000 1.2
+++ javax/print/attribute/standard/QueuedJobCount.java 15 May 2004 20:28:32 -0000
@@ -68,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
@@ -83,7 +83,7 @@
*
* @return the class <code>QueuedJobCount</code> itself
*/
- public final Class getCategory()
+ public Class getCategory()
{
return QueuedJobCount.class;
}
@@ -93,7 +93,7 @@
*
* @return the string "queued-job-count"
*/
- public final String getName()
+ public String getName()
{
return "queued-job-count";
}
Index: javax/print/attribute/standard/RequestingUserName.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/RequestingUserName.java,v
retrieving revision 1.2
diff -u -r1.2 RequestingUserName.java
--- javax/print/attribute/standard/RequestingUserName.java 10 Jan 2004 22:16:01 -0000 1.2
+++ javax/print/attribute/standard/RequestingUserName.java 15 May 2004 20:28:32 -0000
@@ -41,6 +41,10 @@
import javax.print.attribute.PrintRequestAttribute;
import javax.print.attribute.TextSyntax;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
public final class RequestingUserName extends TextSyntax
implements PrintRequestAttribute
{
@@ -50,6 +54,7 @@
* Creates a <code>RequestingUserName</code> object.
*
* @param userName the job name
+ * @param locale the locale of the user, null means default locale
*
* @exception NullPointerException if userName is null
*/
@@ -63,7 +68,7 @@
*
* @param obj the object to test
*
- * @returns true if both objects are equal, false otherwise.
+ * @return true if both objects are equal, false otherwise.
*/
public boolean equals(Object obj)
{
@@ -74,21 +79,21 @@
}
/**
- * Returns category of this class.
+ * Returns category of this attribute.
*
* @return the class <code>RequestingUserName</code> itself
*/
- public final Class getCategory()
+ public Class getCategory()
{
return RequestingUserName.class;
}
/**
- * Returns name of this class.
+ * Returns name of this attribute.
*
* @return the string "requesting-user-name"
*/
- public final String getName()
+ public String getName()
{
return "requesting-user-name";
}
Attachment:
signature.asc
Description: This is a digitally signed message part
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |