Index: javax/print/attribute/EnumSyntax.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/EnumSyntax.java,v retrieving revision 1.1 diff -u -b -B -r1.1 EnumSyntax.java --- javax/print/attribute/EnumSyntax.java 21 Dec 2003 15:56:38 -0000 1.1 +++ javax/print/attribute/EnumSyntax.java 10 Jan 2004 22:05:04 -0000 @@ -122,7 +122,7 @@ * * @return the enumeration values as strings */ - public String[] getStringTable() + protected String[] getStringTable() { return null; } @@ -134,7 +134,7 @@ * * @return the enumeration values */ - public EnumSyntax[] getEnumValueTable() + protected EnumSyntax[] getEnumValueTable() { return null; } Index: javax/print/attribute/standard/JobKOctetsProcessed.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobKOctetsProcessed.java,v retrieving revision 1.1 diff -u -b -B -r1.1 JobKOctetsProcessed.java --- javax/print/attribute/standard/JobKOctetsProcessed.java 6 Jan 2004 13:48:52 -0000 1.1 +++ javax/print/attribute/standard/JobKOctetsProcessed.java 10 Jan 2004 22:05:04 -0000 @@ -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 @@ 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; Index: javax/print/attribute/standard/JobMediaSheetsCompleted.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.java,v retrieving revision 1.1 diff -u -b -B -r1.1 JobMediaSheetsCompleted.java --- javax/print/attribute/standard/JobMediaSheetsCompleted.java 6 Jan 2004 13:48:52 -0000 1.1 +++ javax/print/attribute/standard/JobMediaSheetsCompleted.java 10 Jan 2004 22:05:04 -0000 @@ -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 @@ /** * @author Michael Koch */ -public class JobMediaSheetsCompleted extends IntegerSyntax +public final class JobMediaSheetsCompleted extends IntegerSyntax implements PrintJobAttribute { private static final long serialVersionUID = 1739595973810840475L; Index: javax/print/attribute/standard/OutputDeviceAssigned.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/OutputDeviceAssigned.java,v retrieving revision 1.1 diff -u -b -B -r1.1 OutputDeviceAssigned.java --- javax/print/attribute/standard/OutputDeviceAssigned.java 9 Jan 2004 11:26:42 -0000 1.1 +++ javax/print/attribute/standard/OutputDeviceAssigned.java 10 Jan 2004 22:05:04 -0000 @@ -86,10 +86,10 @@ /** * 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"; } } Index: javax/print/attribute/standard/RequestingUserName.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/RequestingUserName.java,v retrieving revision 1.1 diff -u -b -B -r1.1 RequestingUserName.java --- javax/print/attribute/standard/RequestingUserName.java 9 Jan 2004 11:26:42 -0000 1.1 +++ javax/print/attribute/standard/RequestingUserName.java 10 Jan 2004 22:05:04 -0000 @@ -44,7 +44,7 @@ public final class RequestingUserName extends TextSyntax implements PrintRequestAttribute { - private static final long serialVersionUID = 4660359192078689545L; + private static final long serialVersionUID = -2683049894310331454L; /** * Creates a RequestingUserName object.