From cf0f53eb6e76976cd7a2211a331cac5732d4a9bf Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Mon, 16 Sep 2002 09:46:37 +0000 Subject: [PATCH] AssertionError.java: Merge with classpath, fixes HTML. 2002-09-16 Michael Koch * 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 --- libjava/ChangeLog | 22 +++++++++++++++++++-- libjava/java/awt/Toolkit.java | 4 ++-- libjava/java/lang/AssertionError.java | 2 +- libjava/java/rmi/server/LogStream.java | 4 ++-- libjava/java/rmi/server/RemoteServer.java | 2 ++ libjava/javax/naming/BinaryRefAddr.java | 12 ++++++------ libjava/javax/naming/NamingException.java | 2 +- libjava/javax/naming/RefAddr.java | 24 +++++++++++------------ 8 files changed, 46 insertions(+), 26 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ebc2dbfc384..5a31586d244 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,21 @@ +2002-09-16 Michael Koch + + * 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. + 2002-09-15 Adam Megacz * java/net/natPlainSocketImpl.cc: #ifdef-shielded socket timeouts, @@ -15,8 +33,8 @@ * java/net/DatagramPacket.java (DatagramPacket): Added linebreak for 80 chars per line. * java/net/JarURLConection.java - (getInputStream, getJarEntry): Likewise. - * java/net/SocketPermission.java + (getInputStreami, getJarEntry): Likewise. + * java/net/SocketPErmission.java (SocketPermission class docu, implies): Likewise. * java/net/URLClassLoader.java (findResources): Likewise. * java/net/URLConnection.java: Reindendet remark for 80 chars per line diff --git a/libjava/java/awt/Toolkit.java b/libjava/java/awt/Toolkit.java index 7caec22dca9..fb5e020a29e 100644 --- a/libjava/java/awt/Toolkit.java +++ b/libjava/java/awt/Toolkit.java @@ -96,11 +96,11 @@ public abstract class Toolkit { /** The default toolkit name. */ private static String default_toolkit_name - = "gnu.java.awt.peer.gtk.GtkToolkit"; + = "gnu.awt.gtk.GtkToolkit"; /** * The toolkit in use. Once we load it, we don't ever change it - * if the awt.toolkit propert is set. + * if the awt.toolkit property is set. */ private static Toolkit toolkit; diff --git a/libjava/java/lang/AssertionError.java b/libjava/java/lang/AssertionError.java index 1ce00aee7af..2bbf81cac97 100644 --- a/libjava/java/lang/AssertionError.java +++ b/libjava/java/lang/AssertionError.java @@ -42,7 +42,7 @@ package java.lang; * An assertion error normally occurs as a result of the assert * statement added in JDK 1.4, to indicate that an assertion failed. There * are enough constructors to ensure that - * new AssertionError(expression will work for all + * new AssertionError(expression) will work for all * espressions, regardless of type, as if the error message were given by * the string "" + expression. This extends Error, * because you usually do not want to inadvertently trap an assertion failure. diff --git a/libjava/java/rmi/server/LogStream.java b/libjava/java/rmi/server/LogStream.java index 8ba169f83b8..ffbd3f67e71 100644 --- a/libjava/java/rmi/server/LogStream.java +++ b/libjava/java/rmi/server/LogStream.java @@ -45,8 +45,8 @@ public class LogStream extends PrintStream { public static final int SILENT = 0; -public static final int BRIEF = 1; -public static final int VERBOSE = 2; +public static final int BRIEF = 10; +public static final int VERBOSE = 20; private static PrintStream defStream; diff --git a/libjava/java/rmi/server/RemoteServer.java b/libjava/java/rmi/server/RemoteServer.java index ca52d5eb757..b9cfc4e898e 100644 --- a/libjava/java/rmi/server/RemoteServer.java +++ b/libjava/java/rmi/server/RemoteServer.java @@ -43,6 +43,8 @@ import java.io.PrintStream; public abstract class RemoteServer extends RemoteObject { +private static final long serialVersionUID = -4100238210092549637L; + protected RemoteServer() { super(); } diff --git a/libjava/javax/naming/BinaryRefAddr.java b/libjava/javax/naming/BinaryRefAddr.java index 8d8d44d9bd4..29ca33d6ca2 100644 --- a/libjava/javax/naming/BinaryRefAddr.java +++ b/libjava/javax/naming/BinaryRefAddr.java @@ -97,17 +97,17 @@ public class BinaryRefAddr extends RefAddr * the addrType is the same as this addrType and the bytes of the * content are the same. */ - public boolean equals (Object o) + public boolean equal(Object o) { if (o instanceof BinaryRefAddr) { BinaryRefAddr refAddr = (BinaryRefAddr) o; if (this.getType().equals(refAddr.getType())) - { - byte[] c1 = (byte[]) this.getContent(); - byte[] c2 = (byte[]) refAddr.getContent(); - return Arrays.equals(c1, c2); - } + { + byte[] c1 = (byte[]) this.getContent(); + byte[] c2 = (byte[]) refAddr.getContent(); + return Arrays.equals(c1, c2); + } } return false; } diff --git a/libjava/javax/naming/NamingException.java b/libjava/javax/naming/NamingException.java index a377041ae83..6c0f0172dc1 100644 --- a/libjava/javax/naming/NamingException.java +++ b/libjava/javax/naming/NamingException.java @@ -47,7 +47,7 @@ import java.io.PrintWriter; * NamingException), the part of the Name that * could be resolved (including the Object it resolved to) * and the part of the Name that could not be resolved when - * the exception occurred. + * the exception occured. * * @since 1.3 * @author Anthony Green (green@redhat.com) diff --git a/libjava/javax/naming/RefAddr.java b/libjava/javax/naming/RefAddr.java index 2bccdfab8c0..9ed504f760d 100644 --- a/libjava/javax/naming/RefAddr.java +++ b/libjava/javax/naming/RefAddr.java @@ -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; } -- 2.30.2