AssertionError.java: Merge with classpath, fixes HTML.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ebc2dbfc384cde22901228b138b90fe2bd32f9b3..5a31586d244dc6a0288abe0235a53698f502c48b 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,21 @@
+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.
+
 2002-09-15  Adam Megacz <adam@xwt.org>
        
        * 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 7caec22dca95834ee1843fabe09f26e564d3b12c..fb5e020a29ef55b117247fb202b15a1da330018e 100644 (file)
--- 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 1ce00aee7af86c0b8bc9fe69a13d890872430efe..2bbf81cac97e78d832e3a4e0feeb664ecefca6ff 100644 (file)
--- 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 <code>assert</code>
  * statement added in JDK 1.4, to indicate that an assertion failed. There
  * are enough constructors to ensure that
- * <code>new AssertionError(<em>expression</em)</code> will work for all
+ * <code>new AssertionError(<em>expression</em>)</code> will work for all
  * espressions, regardless of type, as if the error message were given by
  * the string <code>"" + <em>expression</em></code>. 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 8ba169f83b89996b3c266d6aedbe851f00c7714e..ffbd3f67e71c9c96c543d030c1f020a82920afec 100644 (file)
--- 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 ca52d5eb757713c974a4232aa0f6c1784f3827ee..b9cfc4e898e6dc3b3f41071cd6888f32d4410127 100644 (file)
--- 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 8d8d44d9bd4c9b155dd7b85792c290d8d459bce3..29ca33d6ca29f705d643c4c6e17b8032350b3458 100644 (file)
--- 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 a377041ae83b59b7369b62ef0c2362157d08db6f..6c0f0172dc14f98c983b5805559992b0a250f405 100644 (file)
--- a/libjava/javax/naming/NamingException.java
+++ b/libjava/javax/naming/NamingException.java
@@ -47,7 +47,7 @@ import java.io.PrintWriter;
  * <code>NamingException</code>), the part of the <code>Name</code> that
  * could be resolved (including the <code>Object</code> it resolved to)
  * and the part of the <code>Name</code> 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 2bccdfab8c043637ff1816633db1f2cb40e72293..9ed504f760d1f3ba0b079d31e51115a970e08479 100644 (file)
--- 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;
   }