Hi,
I am checking in some compatibility fixes pointed out by reverse japi.
2006-02-06 Wolfgang Baer <[EMAIL PROTECTED]>
* javax/print/attribute/standard/Compression.java,
* javax/print/attribute/standard/Finishings.java,
* javax/print/attribute/standard/JobMediaSheets.java,
* javax/print/attribute/standard/JobSheets.java,
* javax/print/attribute/standard/JobState.java,
* javax/print/attribute/standard/JobStateReason.java,
* javax/print/attribute/standard/ReferenceUriSchemesSupported.java,
* javax/print/attribute/standard/PrintQuality.java,
* javax/print/attribute/standard/Media.java,
* javax/print/attribute/standard/MultipleDocumentHandling.java,
* javax/print/attribute/standard/PrinterStateReason.java,
* javax/print/attribute/standard/PDLOverrideSupported.java:
(getName): Make method final.
(getCategory): Likewise.
* javax/print/attribute/standard/MediaSize.java:
(getName): Make method final.
(getCategory): Likewise.
(ISO): Added private default constructor.
(NA): Likewise.
(JIS): Likewise.
(Other): Likewise.
(Engineering): Likewise.
Wolfgang
Index: javax/print/attribute/standard/Compression.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/Compression.java,v
retrieving revision 1.5
diff -u -r1.5 Compression.java
--- javax/print/attribute/standard/Compression.java 30 Nov 2005 18:34:59 -0000 1.5
+++ javax/print/attribute/standard/Compression.java 6 Feb 2006 11:06:21 -0000
@@ -1,5 +1,5 @@
/* Compression.java --
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -91,7 +91,7 @@
*
* @return The class <code>Compression</code> itself.
*/
- public Class getCategory()
+ public final Class getCategory()
{
return Compression.class;
}
@@ -101,7 +101,7 @@
*
* @return The name "compression".
*/
- public String getName()
+ public final String getName()
{
return "compression";
}
Index: javax/print/attribute/standard/Finishings.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/Finishings.java,v
retrieving revision 1.5
diff -u -r1.5 Finishings.java
--- javax/print/attribute/standard/Finishings.java 15 Dec 2005 21:31:33 -0000 1.5
+++ javax/print/attribute/standard/Finishings.java 6 Feb 2006 11:06:21 -0000
@@ -1,5 +1,5 @@
/* Finishings.java --
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -238,7 +238,7 @@
*
* @return the class <code>Finishings</code> itself
*/
- public Class getCategory()
+ public final Class getCategory()
{
return Finishings.class;
}
@@ -248,7 +248,7 @@
*
* @return The name "finishings".
*/
- public String getName()
+ public final String getName()
{
return "finishings";
}
Index: javax/print/attribute/standard/JobMediaSheets.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobMediaSheets.java,v
retrieving revision 1.5
diff -u -r1.5 JobMediaSheets.java
--- javax/print/attribute/standard/JobMediaSheets.java 16 Dec 2005 22:10:08 -0000 1.5
+++ javax/print/attribute/standard/JobMediaSheets.java 6 Feb 2006 11:06:21 -0000
@@ -1,5 +1,5 @@
/* JobMediaSheets.java --
- Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -107,7 +107,7 @@
*
* @return The class <code>JobMediaSheets</code> itself.
*/
- public Class getCategory()
+ public final Class getCategory()
{
return JobMediaSheets.class;
}
@@ -117,7 +117,7 @@
*
* @return The name "job-media-sheets".
*/
- public String getName()
+ public final String getName()
{
return "job-media-sheets";
}
Index: javax/print/attribute/standard/JobSheets.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobSheets.java,v
retrieving revision 1.5
diff -u -r1.5 JobSheets.java
--- javax/print/attribute/standard/JobSheets.java 16 Dec 2005 19:27:47 -0000 1.5
+++ javax/print/attribute/standard/JobSheets.java 6 Feb 2006 11:06:21 -0000
@@ -1,5 +1,5 @@
/* JobSheets.java --
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -88,7 +88,7 @@
*
* @return The class <code>JobSheets</code> itself.
*/
- public Class getCategory()
+ public final Class getCategory()
{
return JobSheets.class;
}
@@ -98,7 +98,7 @@
*
* @return The name "job-sheets".
*/
- public String getName()
+ public final String getName()
{
return "job-sheets";
}
Index: javax/print/attribute/standard/JobState.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobState.java,v
retrieving revision 1.5
diff -u -r1.5 JobState.java
--- javax/print/attribute/standard/JobState.java 16 Dec 2005 19:27:47 -0000 1.5
+++ javax/print/attribute/standard/JobState.java 6 Feb 2006 11:06:21 -0000
@@ -1,5 +1,5 @@
/* JobState.java --
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -137,7 +137,7 @@
*
* @return The class <code>JobState</code> itself.
*/
- public Class getCategory()
+ public final Class getCategory()
{
return JobState.class;
}
@@ -147,7 +147,7 @@
*
* @return The name "job-state".
*/
- public String getName()
+ public final String getName()
{
return "job-state";
}
Index: javax/print/attribute/standard/JobStateReason.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobStateReason.java,v
retrieving revision 1.6
diff -u -r1.6 JobStateReason.java
--- javax/print/attribute/standard/JobStateReason.java 16 Dec 2005 19:27:47 -0000 1.6
+++ javax/print/attribute/standard/JobStateReason.java 6 Feb 2006 11:06:21 -0000
@@ -1,5 +1,5 @@
/* JobStateReason.java --
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -262,7 +262,7 @@
*
* @return The class <code>JobStateReason</code> itself.
*/
- public Class getCategory()
+ public final Class getCategory()
{
return JobStateReason.class;
}
@@ -272,7 +272,7 @@
*
* @return The name "job-state-reason".
*/
- public String getName()
+ public final String getName()
{
return "job-state-reason";
}
Index: javax/print/attribute/standard/ReferenceUriSchemesSupported.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/ReferenceUriSchemesSupported.java,v
retrieving revision 1.5
diff -u -r1.5 ReferenceUriSchemesSupported.java
--- javax/print/attribute/standard/ReferenceUriSchemesSupported.java 16 Dec 2005 19:27:47 -0000 1.5
+++ javax/print/attribute/standard/ReferenceUriSchemesSupported.java 6 Feb 2006 11:06:21 -0000
@@ -1,5 +1,5 @@
/* ReferenceUriSchemesSupported.java --
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -128,7 +128,7 @@
*
* @return The class <code>ReferenceUriSchemesSupported</code> itself.
*/
- public Class getCategory()
+ public final Class getCategory()
{
return ReferenceUriSchemesSupported.class;
}
@@ -138,7 +138,7 @@
*
* @return The name "reference-uri-schemes-supported".
*/
- public String getName()
+ public final String getName()
{
return "reference-uri-schemes-supported";
}
Index: javax/print/attribute/standard/PrintQuality.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/PrintQuality.java,v
retrieving revision 1.5
diff -u -r1.5 PrintQuality.java
--- javax/print/attribute/standard/PrintQuality.java 15 Dec 2005 21:31:33 -0000 1.5
+++ javax/print/attribute/standard/PrintQuality.java 6 Feb 2006 11:06:21 -0000
@@ -1,5 +1,5 @@
/* PrintQuality.java --
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -92,7 +92,7 @@
*
* @return The class <code>PrintQuality</code> itself.
*/
- public Class getCategory()
+ public final Class getCategory()
{
return PrintQuality.class;
}
@@ -102,7 +102,7 @@
*
* @return The name "print-quality".
*/
- public String getName()
+ public final String getName()
{
return "print-quality";
}
Index: javax/print/attribute/standard/Media.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/Media.java,v
retrieving revision 1.6
diff -u -r1.6 Media.java
--- javax/print/attribute/standard/Media.java 19 Dec 2005 11:00:26 -0000 1.6
+++ javax/print/attribute/standard/Media.java 6 Feb 2006 11:06:21 -0000
@@ -1,5 +1,5 @@
/* Media.java --
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -105,7 +105,7 @@
*
* @return The class <code>Media</code> itself.
*/
- public Class getCategory()
+ public final Class getCategory()
{
return Media.class;
}
@@ -115,7 +115,7 @@
*
* @return The name "media".
*/
- public String getName()
+ public final String getName()
{
return "media";
}
Index: javax/print/attribute/standard/MultipleDocumentHandling.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/MultipleDocumentHandling.java,v
retrieving revision 1.6
diff -u -r1.6 MultipleDocumentHandling.java
--- javax/print/attribute/standard/MultipleDocumentHandling.java 15 Dec 2005 21:31:33 -0000 1.6
+++ javax/print/attribute/standard/MultipleDocumentHandling.java 6 Feb 2006 11:06:21 -0000
@@ -1,5 +1,5 @@
/* MultipleDocumentHandling.java --
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -108,7 +108,7 @@
*
* @return The class <code>MultipleDocumentHandling</code> itself.
*/
- public Class getCategory()
+ public final Class getCategory()
{
return MultipleDocumentHandling.class;
}
@@ -118,7 +118,7 @@
*
* @return The name "multiple-document-handling".
*/
- public String getName()
+ public final String getName()
{
return "multiple-document-handling";
}
Index: javax/print/attribute/standard/PrinterStateReason.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/PrinterStateReason.java,v
retrieving revision 1.5
diff -u -r1.5 PrinterStateReason.java
--- javax/print/attribute/standard/PrinterStateReason.java 16 Dec 2005 19:27:47 -0000 1.5
+++ javax/print/attribute/standard/PrinterStateReason.java 6 Feb 2006 11:06:21 -0000
@@ -1,5 +1,5 @@
/* PrinterStateReason.java --
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -293,7 +293,7 @@
*
* @return The class <code>PrintStateReason</code> itself.
*/
- public Class getCategory()
+ public final Class getCategory()
{
return PrinterStateReason.class;
}
@@ -303,7 +303,7 @@
*
* @return The name "printer-state-reason".
*/
- public String getName()
+ public final String getName()
{
return "printer-state-reason";
}
Index: javax/print/attribute/standard/PDLOverrideSupported.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/PDLOverrideSupported.java,v
retrieving revision 1.5
diff -u -r1.5 PDLOverrideSupported.java
--- javax/print/attribute/standard/PDLOverrideSupported.java 15 Dec 2005 21:31:33 -0000 1.5
+++ javax/print/attribute/standard/PDLOverrideSupported.java 6 Feb 2006 11:06:21 -0000
@@ -1,5 +1,5 @@
/* PDLOverrideSupported.java --
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -91,7 +91,7 @@
*
* @return The class <code>PDLOverrideSupported</code> itself.
*/
- public Class getCategory()
+ public final Class getCategory()
{
return PDLOverrideSupported.class;
}
@@ -101,7 +101,7 @@
*
* @return The name "pdl-override-supported".
*/
- public String getName()
+ public final String getName()
{
return "pdl-override-supported";
}
Index: javax/print/attribute/standard/MediaSize.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/MediaSize.java,v
retrieving revision 1.6
diff -u -r1.6 MediaSize.java
--- javax/print/attribute/standard/MediaSize.java 16 Jan 2006 09:09:10 -0000 1.6
+++ javax/print/attribute/standard/MediaSize.java 6 Feb 2006 11:06:22 -0000
@@ -180,7 +180,7 @@
*
* @return The class <code>MediaSize</code> itself.
*/
- public Class getCategory()
+ public final Class getCategory()
{
return MediaSize.class;
}
@@ -281,7 +281,7 @@
*
* @return The name "media-size".
*/
- public String getName()
+ public final String getName()
{
return "media-size";
}
@@ -293,7 +293,11 @@
*/
public static final class ISO
{
-
+ private ISO()
+ {
+ // prevent instantiation
+ }
+
/**
* ISO A0 paper, 841 mm x 1189 mm.
*/
@@ -442,6 +446,11 @@
*/
public static final class NA
{
+ private NA()
+ {
+ // prevent instantiation
+ }
+
/**
* US Legal paper size, 8.5 inch x 14 inch
*/
@@ -557,6 +566,11 @@
*/
public static final class Engineering
{
+ private Engineering()
+ {
+ // prevent instantiation
+ }
+
/**
* ANSI A paper size. 8.5 inch x 11 inch
*/
@@ -595,6 +609,11 @@
*/
public static final class JIS
{
+ private JIS()
+ {
+ // prevent instantiation
+ }
+
/**
* JIS B0 paper. 1030 mm x 1456 mm
* Note: The JIS B-series is not identical to the ISO B-series.
@@ -789,6 +808,11 @@
*/
public static final class Other
{
+ private Other()
+ {
+ // prevent instantiation
+ }
+
/**
* US Executive paper size, 7.25 inch x 10.5 inch
*/
