diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-10 22:16:01 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-10 22:16:01 +0000 |
| commit | 1eac63a132d3bd34db5d84abb05480ffd0af1287 (patch) | |
| tree | d57705c8528826d142c60c39668ea14150ea7cc0 /libjava | |
| parent | 55e7a051ef4f03dbd3aaee2d732e88c1e747b286 (diff) | |
2004-01-10 Michael Koch <konqueror@gmx.de>
* javax/print/attribute/EnumSyntax.java
(getStringTable): Made protected.
(getEnumValueTable): Likewise.
* javax/print/attribute/standard/JobKOctetsProcessed.java
(JobKOctetsProcessed): Don't implement PrintRequestAttribute.
* javax/print/attribute/standard/JobMediaSheetsCompleted.java
(JobMediaSheetsCompleted): Made class final.
* javax/print/attribute/standard/OutputDeviceAssigned.java
(getName): Fixed typo.
* javax/print/attribute/standard/RequestingUserName.java
(serialVersionUID): Fixed value.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75655 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
6 files changed, 23 insertions, 10 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b62d3b9f043..d8fd65bb3ef 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,19 @@ 2004-01-10 Michael Koch <konqueror@gmx.de> + * javax/print/attribute/EnumSyntax.java + (getStringTable): Made protected. + (getEnumValueTable): Likewise. + * javax/print/attribute/standard/JobKOctetsProcessed.java + (JobKOctetsProcessed): Don't implement PrintRequestAttribute. + * javax/print/attribute/standard/JobMediaSheetsCompleted.java + (JobMediaSheetsCompleted): Made class final. + * javax/print/attribute/standard/OutputDeviceAssigned.java + (getName): Fixed typo. + * javax/print/attribute/standard/RequestingUserName.java + (serialVersionUID): Fixed value. + +2004-01-10 Michael Koch <konqueror@gmx.de> + * javax/swing/plaf/basic/BasicButtonUI.java, javax/swing/plaf/basic/BasicCheckBoxUI.java, javax/swing/plaf/basic/BasicListUI.java, diff --git a/libjava/javax/print/attribute/EnumSyntax.java b/libjava/javax/print/attribute/EnumSyntax.java index c5a096c2fe6..4a87c975a6f 100644 --- a/libjava/javax/print/attribute/EnumSyntax.java +++ b/libjava/javax/print/attribute/EnumSyntax.java @@ -122,7 +122,7 @@ public abstract class EnumSyntax implements Cloneable, Serializable * * @return the enumeration values as strings */ - public String[] getStringTable() + protected String[] getStringTable() { return null; } @@ -134,7 +134,7 @@ public abstract class EnumSyntax implements Cloneable, Serializable * * @return the enumeration values */ - public EnumSyntax[] getEnumValueTable() + protected EnumSyntax[] getEnumValueTable() { return null; } diff --git a/libjava/javax/print/attribute/standard/JobKOctetsProcessed.java b/libjava/javax/print/attribute/standard/JobKOctetsProcessed.java index 76d3d6d3388..42de24028d4 100644 --- a/libjava/javax/print/attribute/standard/JobKOctetsProcessed.java +++ b/libjava/javax/print/attribute/standard/JobKOctetsProcessed.java @@ -1,5 +1,5 @@ /* JobKOctetsProcessed.java -- - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,13 +39,12 @@ package javax.print.attribute.standard; import javax.print.attribute.IntegerSyntax; import javax.print.attribute.PrintJobAttribute; -import javax.print.attribute.PrintRequestAttribute; /** * @author Michael Koch */ public final class JobKOctetsProcessed extends IntegerSyntax - implements PrintJobAttribute, PrintRequestAttribute + implements PrintJobAttribute { private static final long serialVersionUID = -6265238509657881806L; diff --git a/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.java b/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.java index 849e942c3da..78127811138 100644 --- a/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.java +++ b/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.java @@ -1,5 +1,5 @@ /* JobMediaSheetsCompleted.java -- - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,7 +43,7 @@ import javax.print.attribute.PrintJobAttribute; /** * @author Michael Koch */ -public class JobMediaSheetsCompleted extends IntegerSyntax +public final class JobMediaSheetsCompleted extends IntegerSyntax implements PrintJobAttribute { private static final long serialVersionUID = 1739595973810840475L; diff --git a/libjava/javax/print/attribute/standard/OutputDeviceAssigned.java b/libjava/javax/print/attribute/standard/OutputDeviceAssigned.java index 155b6c752e7..a26cb271da7 100644 --- a/libjava/javax/print/attribute/standard/OutputDeviceAssigned.java +++ b/libjava/javax/print/attribute/standard/OutputDeviceAssigned.java @@ -86,10 +86,10 @@ public final class OutputDeviceAssigned extends TextSyntax /** * Returns name of this class. * - * @return the string "output-device-assigened" + * @return the string "output-device-assigned" */ public final String getName() { - return "output-device-assigened"; + return "output-device-assigned"; } } diff --git a/libjava/javax/print/attribute/standard/RequestingUserName.java b/libjava/javax/print/attribute/standard/RequestingUserName.java index 6805fe86e7f..f71028bc6d7 100644 --- a/libjava/javax/print/attribute/standard/RequestingUserName.java +++ b/libjava/javax/print/attribute/standard/RequestingUserName.java @@ -44,7 +44,7 @@ import javax.print.attribute.TextSyntax; public final class RequestingUserName extends TextSyntax implements PrintRequestAttribute { - private static final long serialVersionUID = 4660359192078689545L; + private static final long serialVersionUID = -2683049894310331454L; /** * Creates a <code>RequestingUserName</code> object. |