mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-19 12:21:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

2004-04-20 Michael Koch <konqueror@gmx.de>

Browse Source 
* javax/print/attribute/EnumSyntax.java
	(getOffset): Made protected.
	* javax/print/attribute/HashAttributeSet.java
	(HashAttributeSet): Likewise.
	* javax/print/attribute/ResolutionSyntax.java
	(getFeedResolution): Fixed typo in exception name.
	(getCrossFeedResolution): Likewise.
	* javax/print/attribute/SetOfIntegerSyntax.java
	(SetOfIntegerSyntax): Fixed HTML entities in javadoc.
	* javax/print/attribute/TextSyntax.java
	(TextSyntax): Handle locale correctly.
	(hashCode): Calc better hashcode value.
	(equals): Fixed @return tag.
	(toString): New method.

From-SVN: r80892
This commit is contained in:
Michael Koch 2004-04-20 10:48:56 +00:00 committed by Michael Koch
parent 0150fc2287
commit 5589f3e5a5
6 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libjava/ChangeLog
View File

@ -1,3 +1,20 @@
2004-04-20 Michael Koch <konqueror@gmx.de>
* javax/print/attribute/EnumSyntax.java
(getOffset): Made protected.
* javax/print/attribute/HashAttributeSet.java
(HashAttributeSet): Likewise.
* javax/print/attribute/ResolutionSyntax.java
(getFeedResolution): Fixed typo in exception name.
(getCrossFeedResolution): Likewise.
* javax/print/attribute/SetOfIntegerSyntax.java
(SetOfIntegerSyntax): Fixed HTML entities in javadoc.
* javax/print/attribute/TextSyntax.java
(TextSyntax): Handle locale correctly.
(hashCode): Calc better hashcode value.
(equals): Fixed @return tag.
(toString): New method.
2004-04-20 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/FileLockImpl.java

2
libjava/javax/print/attribute/EnumSyntax.java
View File

@ -139,7 +139,7 @@ public abstract class EnumSyntax implements Cloneable, Serializable
return null;
}
public int getOffset()
protected int getOffset()
{
return 0;
}

2
libjava/javax/print/attribute/HashAttributeSet.java
View File

@ -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);

4
libjava/javax/print/attribute/ResolutionSyntax.java
View File

@ -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)
{

4
libjava/javax/print/attribute/SetOfIntegerSyntax.java
View File

@ -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 &lt;= upperbound
* and lowerBound &lt; 0
*/
protected SetOfIntegerSyntax(int lowerBound, int upperBound)
{

20
libjava/javax/print/attribute/TextSyntax.java
View File

@ -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;
}
}