From 162fd675e5647239cc88413481f23b87e688a756 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sat, 10 Jan 2004 22:16:01 +0000 Subject: 2004-01-10 Michael Koch * 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. From-SVN: r75655 --- libjava/ChangeLog | 14 ++++++++++++++ libjava/javax/print/attribute/EnumSyntax.java | 4 ++-- .../print/attribute/standard/JobKOctetsProcessed.java | 5 ++--- .../print/attribute/standard/JobMediaSheetsCompleted.java | 4 ++-- .../print/attribute/standard/OutputDeviceAssigned.java | 4 ++-- .../javax/print/attribute/standard/RequestingUserName.java | 2 +- 6 files changed, 23 insertions(+), 10 deletions(-) (limited to 'libjava') diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b62d3b9..d8fd65b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,19 @@ 2004-01-10 Michael Koch + * 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 + * 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 c5a096c..4a87c97 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 76d3d6d..42de240 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 849e942..7812781 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 155b6c7..a26cb27 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 6805fe8..f71028b 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 RequestingUserName object. -- cgit v1.1