diff options
author | Wolfgang Baer <WBaer@gmx.de> | 2006-01-24 20:42:30 +0000 |
---|---|---|
committer | Wolfgang Baer <WBaer@gmx.de> | 2006-01-24 20:42:30 +0000 |
commit | 23f3deee2f9c855cf21dcd831f7a49086d4e8155 (patch) | |
tree | 948c2747d02ec9db46034ce8e3d50ac7663200b8 | |
parent | 51c6bfbe9eaa9a098521cf83340f54619196d2f2 (diff) | |
download | classpath-23f3deee2f9c855cf21dcd831f7a49086d4e8155.tar.gz |
2006-01-24 Wolfgang Baer <WBaer@gmx.de>
* javax/print/SimpleDoc.java: Make class final.
* javax/print/attribute/standard/PrinterIsAcceptingJobs.java: Likewise.
* javax/print/attribute/DateTimeSyntax.java:
(toString): New overridden method.
* javax/print/attribute/standard/JobStateReasons.java:
(add): Use the super.add method to avoid recursion.
* javax/print/attribute/standard/PrinterStateReasons.java:
(put): Use the super.put method to avoid recursion.
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | javax/print/SimpleDoc.java | 2 | ||||
-rw-r--r-- | javax/print/attribute/DateTimeSyntax.java | 10 | ||||
-rw-r--r-- | javax/print/attribute/standard/JobStateReasons.java | 2 | ||||
-rw-r--r-- | javax/print/attribute/standard/PrinterIsAcceptingJobs.java | 2 | ||||
-rw-r--r-- | javax/print/attribute/standard/PrinterStateReasons.java | 2 |
6 files changed, 25 insertions, 4 deletions
@@ -1,3 +1,14 @@ +2006-01-24 Wolfgang Baer <WBaer@gmx.de> + + * javax/print/SimpleDoc.java: Make class final. + * javax/print/attribute/standard/PrinterIsAcceptingJobs.java: Likewise. + * javax/print/attribute/DateTimeSyntax.java: + (toString): New overridden method. + * javax/print/attribute/standard/JobStateReasons.java: + (add): Use the super.add method to avoid recursion. + * javax/print/attribute/standard/PrinterStateReasons.java: + (put): Use the super.put method to avoid recursion. + 2006-01-24 Robert Schuster <robertschuster@fsfe.org> * java/beans/XMLEncoder.java: diff --git a/javax/print/SimpleDoc.java b/javax/print/SimpleDoc.java index fca958dbf..a49406bcb 100644 --- a/javax/print/SimpleDoc.java +++ b/javax/print/SimpleDoc.java @@ -60,7 +60,7 @@ import javax.print.attribute.DocAttributeSet; * * @author Wolfgang Baer (WBaer@gmx.de) */ -public class SimpleDoc implements Doc +public final class SimpleDoc implements Doc { private final Object printData; private final DocFlavor flavor; diff --git a/javax/print/attribute/DateTimeSyntax.java b/javax/print/attribute/DateTimeSyntax.java index d59193265..8cff70219 100644 --- a/javax/print/attribute/DateTimeSyntax.java +++ b/javax/print/attribute/DateTimeSyntax.java @@ -102,4 +102,14 @@ public abstract class DateTimeSyntax implements Cloneable, Serializable { return value.hashCode(); } + + /** + * Returns the string representation for this object. + * + * @return The string representation. + */ + public String toString() + { + return value.toString(); + } } diff --git a/javax/print/attribute/standard/JobStateReasons.java b/javax/print/attribute/standard/JobStateReasons.java index 9dbca0cd5..32f942b6b 100644 --- a/javax/print/attribute/standard/JobStateReasons.java +++ b/javax/print/attribute/standard/JobStateReasons.java @@ -131,7 +131,7 @@ public final class JobStateReasons extends HashSet if (o == null) throw new NullPointerException("reason is null"); - return add((JobStateReason) o); + return super.add((JobStateReason) o); } /** diff --git a/javax/print/attribute/standard/PrinterIsAcceptingJobs.java b/javax/print/attribute/standard/PrinterIsAcceptingJobs.java index 51f96c11d..96dbc57ce 100644 --- a/javax/print/attribute/standard/PrinterIsAcceptingJobs.java +++ b/javax/print/attribute/standard/PrinterIsAcceptingJobs.java @@ -55,7 +55,7 @@ import javax.print.attribute.PrintServiceAttribute; * @author Michael Koch (konqueror@gmx.de) * @author Wolfgang Baer (WBaer@gmx.de) */ -public class PrinterIsAcceptingJobs extends EnumSyntax +public final class PrinterIsAcceptingJobs extends EnumSyntax implements PrintServiceAttribute { private static final long serialVersionUID = -5052010680537678061L; diff --git a/javax/print/attribute/standard/PrinterStateReasons.java b/javax/print/attribute/standard/PrinterStateReasons.java index 67f160d42..40c6f1b71 100644 --- a/javax/print/attribute/standard/PrinterStateReasons.java +++ b/javax/print/attribute/standard/PrinterStateReasons.java @@ -178,7 +178,7 @@ public final class PrinterStateReasons extends HashMap if (severity == null) throw new NullPointerException("severity is null"); - return put((PrinterStateReason) reason, (Severity) severity); + return super.put((PrinterStateReason) reason, (Severity) severity); } /** |