diff options
Diffstat (limited to 'libjava/javax')
5 files changed, 20 insertions, 12 deletions
diff --git a/libjava/javax/print/attribute/EnumSyntax.java b/libjava/javax/print/attribute/EnumSyntax.java index 4a87c97..aa82ccc 100644 --- a/libjava/javax/print/attribute/EnumSyntax.java +++ b/libjava/javax/print/attribute/EnumSyntax.java @@ -139,7 +139,7 @@ public abstract class EnumSyntax implements Cloneable, Serializable return null; } - public int getOffset() + protected int getOffset() { return 0; } diff --git a/libjava/javax/print/attribute/HashAttributeSet.java b/libjava/javax/print/attribute/HashAttributeSet.java index 63b4105..af5b3d1 100644 --- a/libjava/javax/print/attribute/HashAttributeSet.java +++ b/libjava/javax/print/attribute/HashAttributeSet.java @@ -151,7 +151,7 @@ public class HashAttributeSet implements AttributeSet, Serializable * @exception ClassCastException if any element of attributes is not an * interface of interfaceName */ - public HashAttributeSet(AttributeSet attributes, Class interfaceName) + protected HashAttributeSet(AttributeSet attributes, Class interfaceName) { this(interfaceName); diff --git a/libjava/javax/print/attribute/ResolutionSyntax.java b/libjava/javax/print/attribute/ResolutionSyntax.java index 592d995..4eba854 100644 --- a/libjava/javax/print/attribute/ResolutionSyntax.java +++ b/libjava/javax/print/attribute/ResolutionSyntax.java @@ -104,7 +104,7 @@ public abstract class ResolutionSyntax * * @return the resolution * - * @exception IllegalArgumenException if units < 1 + * @exception IllegalArgumentException if units < 1 */ public int getCrossFeedResolution(int units) { @@ -130,7 +130,7 @@ public abstract class ResolutionSyntax * * @return the resolution * - * @exception IllegalArgumenException if units < 1 + * @exception IllegalArgumentException if units < 1 */ public int getFeedResolution(int units) { diff --git a/libjava/javax/print/attribute/SetOfIntegerSyntax.java b/libjava/javax/print/attribute/SetOfIntegerSyntax.java index d4e7fde..7c02212 100644 --- a/libjava/javax/print/attribute/SetOfIntegerSyntax.java +++ b/libjava/javax/print/attribute/SetOfIntegerSyntax.java @@ -148,8 +148,8 @@ public abstract class SetOfIntegerSyntax * @param lowerBound the lower bound value * @param upperBound the upper bound value * - * @exception IllegalArgumentException if lowerBound <= uppbound - * and lowerBound < 0 + * @exception IllegalArgumentException if lowerBound <= upperbound + * and lowerBound < 0 */ protected SetOfIntegerSyntax(int lowerBound, int upperBound) { diff --git a/libjava/javax/print/attribute/TextSyntax.java b/libjava/javax/print/attribute/TextSyntax.java index 51909be..ebad88b 100644 --- a/libjava/javax/print/attribute/TextSyntax.java +++ b/libjava/javax/print/attribute/TextSyntax.java @@ -1,5 +1,5 @@ /* TextSyntax.java -- - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -57,12 +57,12 @@ public abstract class TextSyntax implements Cloneable, Serializable * @param value the value for this syntax * @param locale the locale to use * - * @exception NullPointerException if value is null + * @exception NullPointerException if value and/or locale is null */ protected TextSyntax(String value, Locale locale) { - if (value == null) - throw new NullPointerException("value may not be null"); + if (value == null || locale == null) + throw new NullPointerException("value and/or locale may not be null"); this.value = value; this.locale = locale; @@ -95,7 +95,7 @@ public abstract class TextSyntax implements Cloneable, Serializable */ public int hashCode() { - return value.hashCode() + locale.hashCode(); + return value.hashCode() ^ locale.hashCode(); } /** @@ -103,7 +103,7 @@ public abstract class TextSyntax implements Cloneable, Serializable * * @param obj the object to test * - * @returns true if both objects are equal, false otherwise. + * @return true if both objects are equal, false otherwise. */ public boolean equals(Object obj) { @@ -115,4 +115,12 @@ public abstract class TextSyntax implements Cloneable, Serializable return (value.equals(tmp.getValue()) && locale.equals(tmp.getLocale())); } + + /** + * Returns a string representing the object. + */ + public String toString() + { + return value; + } } |