diff options
| author | Michael Koch <konqueror@gmx.de> | 2002-09-16 09:46:37 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2002-09-16 09:46:37 +0000 |
| commit | cf0f53eb6e76976cd7a2211a331cac5732d4a9bf (patch) | |
| tree | 153e40de6d2df8dbf1b4d09c84c431b1df50322f /libjava/java | |
| parent | b423e6fe615f5d0a65bb02ad8dd15457c8871a5c (diff) | |
| download | gcc-cf0f53eb6e76976cd7a2211a331cac5732d4a9bf.zip gcc-cf0f53eb6e76976cd7a2211a331cac5732d4a9bf.tar.gz gcc-cf0f53eb6e76976cd7a2211a331cac5732d4a9bf.tar.bz2 | |
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
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/awt/Toolkit.java | 4 | ||||
| -rw-r--r-- | libjava/java/lang/AssertionError.java | 2 | ||||
| -rw-r--r-- | libjava/java/rmi/server/LogStream.java | 4 | ||||
| -rw-r--r-- | libjava/java/rmi/server/RemoteServer.java | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/libjava/java/awt/Toolkit.java b/libjava/java/awt/Toolkit.java index 7caec22..fb5e020 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 1ce00ae..2bbf81c 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 <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 8ba169f..ffbd3f6 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 ca52d5e..b9cfc4e 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(); } |