FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AssertionError.java: Merge with classpath, fixes HTML.

Browse source 
2002-09-16  Michael Koch  <konqueror@gmx.de>

	* java/lang/AssertionError.java:
	Merge with classpath, fixes HTML.
	* java/rmi/server/LogStream.java:
	Merge with classpath, fixes some constants.
	* java/net/server/RemoteServer.java:
	Merge with classpath, adds serialVersionUID.
	* javax/naming/BinaryRefAddr.java:
	Merge with classpath, s/equal/equals/.
	* javax/naming/NamingException.java:
	Merge with classpath, fixed typo.
	* javax/naming/RefAddr.java:
	Merge with classpath, s/equal/equals/.
	* java/awt/Toolkit.java:
	s/gnu.java.awt.peer.gtk.GtkToolkit/gnu.awt.gtk.GtkToolkit/
	and typo fixed.

From-SVN: r57187
This commit is contained in:
Michael Koch 2002-09-16 09:46:37 +00:00 • committed by Michael Koch
parent b423e6fe61
commit cf0f53eb6e
8 changed files with 46 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libjava/javax/naming/RefAddr.java
View file

@ -71,9 +71,9 @@ public abstract class RefAddr implements Serializable
*/
protected RefAddr(String addrType)
{
if (addrType == null)
throw new NullPointerException("addrType cannot be null");
if (addrType == null)
throw new NullPointerException("addrType cannot be null");
this.addrType = addrType;
}
@ -98,20 +98,20 @@ public abstract class RefAddr implements Serializable
* is the same as this addrType and the content is equals to the
* content of this object.
*/
public boolean equals (Object o)
public boolean equal(Object o)
{
if (o instanceof RefAddr)
{
RefAddr refAddr = (RefAddr) o;
if (this.getType().equals(refAddr.getType()))
{
Object c1 = this.getContent();
Object c2 = refAddr.getContent();
if (c1 == null)
return c2 == null;
else
return c1.equals(c2);
}
{
Object c1 = this.getContent();
Object c2 = refAddr.getContent();
if (c1 == null)
return c2 == null;
else
return c1.equals(c2);
}
}
return false;
}