procyberian/gcc
2
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

4
libjava/java/awt/Toolkit.java
View file

@ -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;

2
libjava/java/lang/AssertionError.java
View file

@ -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.

4
libjava/java/rmi/server/LogStream.java
View file

@ -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;

2
libjava/java/rmi/server/RemoteServer.java
View file

@ -43,6 +43,8 @@ import java.io.PrintStream;
public abstract class RemoteServer
extends RemoteObject {
private static final long serialVersionUID = -4100238210092549637L;
protected RemoteServer() {
super();
}