This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
little classpath merge
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Mon, 16 Sep 2002 11:47:57 +0200
- Subject: little classpath merge
Hello list,
while waiting for my NetworkInterface approval I merged some things from
classpath to fix some little things. Patch attached.
Michael
Index: java/lang/AssertionError.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/AssertionError.java,v
retrieving revision 1.1
diff -u -b -r1.1 AssertionError.java
--- java/lang/AssertionError.java 11 Jun 2002 17:33:22 -0000 1.1
+++ java/lang/AssertionError.java 16 Sep 2002 09:45:21 -0000
@@ -42,7 +42,7 @@
* 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.
Index: java/rmi/server/LogStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/LogStream.java,v
retrieving revision 1.2
diff -u -b -r1.2 LogStream.java
--- java/rmi/server/LogStream.java 22 Jan 2002 22:40:29 -0000 1.2
+++ java/rmi/server/LogStream.java 16 Sep 2002 09:45:21 -0000
@@ -45,8 +45,8 @@
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;
Index: java/rmi/server/RemoteServer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/RemoteServer.java,v
retrieving revision 1.2
diff -u -b -r1.2 RemoteServer.java
--- java/rmi/server/RemoteServer.java 22 Jan 2002 22:40:29 -0000 1.2
+++ java/rmi/server/RemoteServer.java 16 Sep 2002 09:45:21 -0000
@@ -43,6 +43,8 @@
public abstract class RemoteServer
extends RemoteObject {
+private static final long serialVersionUID = -4100238210092549637L;
+
protected RemoteServer() {
super();
}
Index: javax/naming/BinaryRefAddr.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/BinaryRefAddr.java,v
retrieving revision 1.3
diff -u -b -r1.3 BinaryRefAddr.java
--- javax/naming/BinaryRefAddr.java 22 Jan 2002 22:40:42 -0000 1.3
+++ javax/naming/BinaryRefAddr.java 16 Sep 2002 09:45:21 -0000
@@ -97,7 +97,7 @@
* 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)
{
Index: javax/naming/NamingException.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/NamingException.java,v
retrieving revision 1.4
diff -u -b -r1.4 NamingException.java
--- javax/naming/NamingException.java 22 Jan 2002 22:40:42 -0000 1.4
+++ javax/naming/NamingException.java 16 Sep 2002 09:45:22 -0000
@@ -47,7 +47,7 @@
* <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)
Index: javax/naming/RefAddr.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/RefAddr.java,v
retrieving revision 1.4
diff -u -b -r1.4 RefAddr.java
--- javax/naming/RefAddr.java 22 Jan 2002 22:40:42 -0000 1.4
+++ javax/naming/RefAddr.java 16 Sep 2002 09:45:22 -0000
@@ -98,7 +98,7 @@
* 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)
{
Index: java/awt/Toolkit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Toolkit.java,v
retrieving revision 1.16
diff -u -b -r1.16 Toolkit.java
--- java/awt/Toolkit.java 9 Aug 2002 04:26:14 -0000 1.16
+++ java/awt/Toolkit.java 16 Sep 2002 09:45:22 -0000
@@ -96,11 +96,11 @@
{
/** 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;
[52;1H[?1l>[?1049lVim: Error reading input, exiting...
Vim: Finished.
[52;1H