summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>2001-10-31 00:48:17 +0000
committerjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>2001-10-31 00:48:17 +0000
commitdaca25b853b52ea5035f6979a325fe030df38870 (patch)
tree5308302766b87f978a067f91b79c6b91b4198025
parentc7fa332ec5a2c47c72a24f79164954b343776688 (diff)
downloadppe42-gcc-daca25b853b52ea5035f6979a325fe030df38870.tar.gz
ppe42-gcc-daca25b853b52ea5035f6979a325fe030df38870.zip
* HACKING, gnu/gcj/xlib/Pixmap.java, gnu/gcj/xlib/XException.java,
gnu/java/rmi/rmic/RMIC.java, java/awt/Window.java, java/awt/AWTEvent.java, java/io/ByteArrayOutputStream.java, java/io/CharConversionException.java, java/io/PipedInputStream.java, java/io/PipedReader.java, java/io/PrintWriter.java, java/io/WriteAbortedException.java, java/io/natFileWin32.cc, java/lang/Class.h, java/lang/natClassLoader.cc, java/lang/natObject.cc, java/lang/Package.java, java/net/BindException.java, java/net/ConnectException.java, java/net/ProtocolException.java, java/net/SocketException.java, java/net/UnknownServiceException.java, java/security/cert/X509Certificate.java, java/security/interfaces/DSAKey.java, java/security/SecureRandom.java, java/security/SignedObject.java, java/sql/DatabaseMetaData.java, java/text/DecimalFormatSymbols.java, java/util/jar/Attributes.java, java/util/jar/JarEntry.java, java/util/jar/JarInputStream.java, java/util/jar/JarOutputStream.java, java/util/Calendar.java, java/util/Collections.java, java/util/GregorianCalendar.java, java/util/HashMap.java, java/util/List.java, java/util/Properties.java, java/util/Timer.java, java/util/Vector.java, java/util/WeakHashMap.java, javax/naming/NamingException.java, testsuite/libjava.lang/Thread_Wait.java, org/xml/sax/helpers/DefaultHandler.java, org/xml/sax/HandlerBase.java, org/xml/sax/SAXParseException.java, ChangeLog, acinclude.m4, aclocal.m4, posix-threads.cc: Fix spelling errors. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46665 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libjava/ChangeLog42
-rw-r--r--libjava/HACKING2
-rw-r--r--libjava/acinclude.m46
-rw-r--r--libjava/aclocal.m46
-rwxr-xr-xlibjava/configure4
-rw-r--r--libjava/gnu/gcj/xlib/Pixmap.java2
-rw-r--r--libjava/gnu/gcj/xlib/XException.java2
-rw-r--r--libjava/gnu/java/rmi/rmic/RMIC.java2
-rw-r--r--libjava/java/awt/AWTEvent.java2
-rw-r--r--libjava/java/awt/Window.java2
-rw-r--r--libjava/java/io/ByteArrayOutputStream.java2
-rw-r--r--libjava/java/io/CharConversionException.java2
-rw-r--r--libjava/java/io/PipedInputStream.java2
-rw-r--r--libjava/java/io/PipedReader.java2
-rw-r--r--libjava/java/io/PrintWriter.java2
-rw-r--r--libjava/java/io/WriteAbortedException.java2
-rw-r--r--libjava/java/io/natFileWin32.cc2
-rw-r--r--libjava/java/lang/Class.h2
-rw-r--r--libjava/java/lang/Package.java2
-rw-r--r--libjava/java/lang/natClassLoader.cc2
-rw-r--r--libjava/java/lang/natObject.cc2
-rw-r--r--libjava/java/net/BindException.java4
-rw-r--r--libjava/java/net/ConnectException.java4
-rw-r--r--libjava/java/net/ProtocolException.java4
-rw-r--r--libjava/java/net/SocketException.java4
-rw-r--r--libjava/java/net/UnknownServiceException.java2
-rw-r--r--libjava/java/security/SecureRandom.java4
-rw-r--r--libjava/java/security/SignedObject.java6
-rw-r--r--libjava/java/security/cert/X509Certificate.java2
-rw-r--r--libjava/java/security/interfaces/DSAKey.java2
-rw-r--r--libjava/java/sql/DatabaseMetaData.java10
-rw-r--r--libjava/java/text/DecimalFormatSymbols.java2
-rw-r--r--libjava/java/util/Calendar.java8
-rw-r--r--libjava/java/util/Collections.java2
-rw-r--r--libjava/java/util/GregorianCalendar.java8
-rw-r--r--libjava/java/util/HashMap.java2
-rw-r--r--libjava/java/util/List.java2
-rw-r--r--libjava/java/util/Properties.java2
-rw-r--r--libjava/java/util/Timer.java14
-rw-r--r--libjava/java/util/Vector.java14
-rw-r--r--libjava/java/util/WeakHashMap.java2
-rw-r--r--libjava/java/util/jar/Attributes.java2
-rw-r--r--libjava/java/util/jar/JarEntry.java2
-rw-r--r--libjava/java/util/jar/JarInputStream.java2
-rw-r--r--libjava/java/util/jar/JarOutputStream.java2
-rw-r--r--libjava/javax/naming/NamingException.java2
-rw-r--r--libjava/org/xml/sax/HandlerBase.java2
-rw-r--r--libjava/org/xml/sax/SAXParseException.java8
-rw-r--r--libjava/org/xml/sax/helpers/DefaultHandler.java2
-rw-r--r--libjava/posix-threads.cc2
-rw-r--r--libjava/testsuite/libjava.lang/Thread_Wait.java4
51 files changed, 126 insertions, 92 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8abc16751c6..cb12f6a4cad 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,37 @@
+2001-10-31 Joseph S. Myers <jsm28@cam.ac.uk>
+
+ * HACKING, gnu/gcj/xlib/Pixmap.java, gnu/gcj/xlib/XException.java,
+ gnu/java/rmi/rmic/RMIC.java, java/awt/Window.java,
+ java/awt/AWTEvent.java, java/io/ByteArrayOutputStream.java,
+ java/io/CharConversionException.java,
+ java/io/PipedInputStream.java, java/io/PipedReader.java,
+ java/io/PrintWriter.java, java/io/WriteAbortedException.java,
+ java/io/natFileWin32.cc, java/lang/Class.h,
+ java/lang/natClassLoader.cc, java/lang/natObject.cc,
+ java/lang/Package.java, java/net/BindException.java,
+ java/net/ConnectException.java, java/net/ProtocolException.java,
+ java/net/SocketException.java,
+ java/net/UnknownServiceException.java,
+ java/security/cert/X509Certificate.java,
+ java/security/interfaces/DSAKey.java,
+ java/security/SecureRandom.java, java/security/SignedObject.java,
+ java/sql/DatabaseMetaData.java,
+ java/text/DecimalFormatSymbols.java,
+ java/util/jar/Attributes.java, java/util/jar/JarEntry.java,
+ java/util/jar/JarInputStream.java,
+ java/util/jar/JarOutputStream.java, java/util/Calendar.java,
+ java/util/Collections.java, java/util/GregorianCalendar.java,
+ java/util/HashMap.java, java/util/List.java,
+ java/util/Properties.java, java/util/Timer.java,
+ java/util/Vector.java, java/util/WeakHashMap.java,
+ javax/naming/NamingException.java,
+ testsuite/libjava.lang/Thread_Wait.java,
+ org/xml/sax/helpers/DefaultHandler.java,
+ org/xml/sax/HandlerBase.java, org/xml/sax/SAXParseException.java,
+ ChangeLog, acinclude.m4, aclocal.m4, posix-threads.cc: Fix
+ spelling errors.
+ * configure: Regenerate.
+
2001-10-30 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* jni.cc (JNI_CreateJavaVM): Call _Jv_CreateJavaVM. Don't call
@@ -1236,7 +1270,7 @@ Tue Oct 23 23:52:18 2001 Anthony Green <green@redhat.com>
of _Jv_AttachCurrentThread.
* gnu/gcj/runtime/FirstThread.java (FirstThread): Now extends Thread.
(run): New method. Take care of looking up main class manifest
- attribute and calling forName if neccessary. Then call call_main.
+ attribute and calling forName if necessary. Then call call_main.
(call_main): New native method.
* gnu/gcj/runtime/natFirstThread.cc (call_main): New function, code
relocated from prims.cc. Look up and call main method.
@@ -1784,7 +1818,7 @@ Tue Oct 23 23:52:18 2001 Anthony Green <green@redhat.com>
Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* java/lang/natClass.cc (_Jv_IsAssignableFrom): Ensure that ancestors
- table index is within allowed bounds. Ensure that we dont try to access
+ table index is within allowed bounds. Ensure that we don't try to access
class itable at a negative offset. Avoid an ancestor table lookup if
source is a primitive type class.
(isInstance): Remove redundant isPrimitive() check.
@@ -4788,7 +4822,7 @@ Sun Nov 26 21:30:25 2000 Anthony Green <green@redhat.com>
* java/awt/Toolkit.java (systemEventQueue): Removed.
(getDefaultToolkit): Default to "gnu.awt.gtk.GtkToolkit".
* java/awt/Window.java (getToolkit): Don't call super.
- * java/awt/image/BufferedImage.java: Fix definate assignment errors.
+ * java/awt/image/BufferedImage.java: Fix definite assignment errors.
* java/awt/peer/ContainerPeer.java (insets): Remove unused method.
* gnu/awt/gtk/GtkComponentPeer.java: New file.
* gnu/awt/gtk/GtkContainerPeer.java: New file.
@@ -5419,7 +5453,7 @@ Sat Aug 19 11:00:53 2000 Anthony Green <green@redhat.com>
* java/awt/image/BufferedImage.java: New file.
* java/awt/image/RasterOp.java: New file.
* java/awt/peer/ComponentPeer.java (getGraphicsConfiguration):
- More powerfull replacement for getColorModel().
+ More powerful replacement for getColorModel().
(getColorModel) Removed.
(setEventMask) New method.
* Makefile.am: Added new files.
diff --git a/libjava/HACKING b/libjava/HACKING
index 842617abe75..3f96b6f4529 100644
--- a/libjava/HACKING
+++ b/libjava/HACKING
@@ -40,7 +40,7 @@ Yup, you need the magic libgcj automake ;-)
<ftp://ftp.freesoftware.com/.0/sourceware/java/automake-gcj-1.4.tar.gz>
-Install that (dont worry, it should still work for other projects), add your
+Install that (don't worry, it should still work for other projects), add your
files to the Makefile.am, then just type "automake" and it will regenerate the
Makefile.in. Easy!
diff --git a/libjava/acinclude.m4 b/libjava/acinclude.m4
index bcccf362a30..a2034fccf8f 100644
--- a/libjava/acinclude.m4
+++ b/libjava/acinclude.m4
@@ -9,7 +9,7 @@ AC_ARG_ENABLE(multilib,
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl
-dnl We may get other options which we dont document:
+dnl We may get other options which we don't document:
dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
# When building with srcdir == objdir, links to the source files will
@@ -61,7 +61,7 @@ version=0.0.7
dnl Still use "libjava" here to placate dejagnu.
AM_INIT_AUTOMAKE(libjava, $version)
-# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD). If we dont
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD). If we don't
# run it explicitly here, it will be run implicitly before
# LIBGCJ_CONFIGURE, which doesn't work because that means that it will
# be run before AC_CANONICAL_HOST.
@@ -80,7 +80,7 @@ AM_MAINTAINER_MODE
# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
# fails, because we are probably configuring with a cross compiler
# which cant create executables. So we include AC_EXEEXT to keep
-# automake happy, but we dont execute it, since we dont care about
+# automake happy, but we don't execute it, since we don't care about
# the result.
if false; then
# autoconf 2.50 runs AC_EXEEXT by default, and the macro expands
diff --git a/libjava/aclocal.m4 b/libjava/aclocal.m4
index 0da1cc6769f..406fa89d7ae 100644
--- a/libjava/aclocal.m4
+++ b/libjava/aclocal.m4
@@ -21,7 +21,7 @@ AC_ARG_ENABLE(multilib,
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl
-dnl We may get other options which we dont document:
+dnl We may get other options which we don't document:
dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
# When building with srcdir == objdir, links to the source files will
@@ -73,7 +73,7 @@ version=0.0.7
dnl Still use "libjava" here to placate dejagnu.
AM_INIT_AUTOMAKE(libjava, $version)
-# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD). If we dont
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD). If we don't
# run it explicitly here, it will be run implicitly before
# LIBGCJ_CONFIGURE, which doesn't work because that means that it will
# be run before AC_CANONICAL_HOST.
@@ -92,7 +92,7 @@ AM_MAINTAINER_MODE
# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
# fails, because we are probably configuring with a cross compiler
# which cant create executables. So we include AC_EXEEXT to keep
-# automake happy, but we dont execute it, since we dont care about
+# automake happy, but we don't execute it, since we don't care about
# the result.
if false; then
# autoconf 2.50 runs AC_EXEEXT by default, and the macro expands
diff --git a/libjava/configure b/libjava/configure
index 5cab3f0de66..06c782ff37d 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -1364,7 +1364,7 @@ fi
-# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD). If we dont
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD). If we don't
# run it explicitly here, it will be run implicitly before
# LIBGCJ_CONFIGURE, which doesn't work because that means that it will
# be run before AC_CANONICAL_HOST.
@@ -1613,7 +1613,7 @@ fi
# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
# fails, because we are probably configuring with a cross compiler
# which cant create executables. So we include AC_EXEEXT to keep
-# automake happy, but we dont execute it, since we dont care about
+# automake happy, but we don't execute it, since we don't care about
# the result.
if false; then
# autoconf 2.50 runs AC_EXEEXT by default, and the macro expands
diff --git a/libjava/gnu/gcj/xlib/Pixmap.java b/libjava/gnu/gcj/xlib/Pixmap.java
index a81f55c8761..a514d95d52b 100644
--- a/libjava/gnu/gcj/xlib/Pixmap.java
+++ b/libjava/gnu/gcj/xlib/Pixmap.java
@@ -24,7 +24,7 @@ public class Pixmap extends Drawable
/* FIXME: don't create a new GC all the time. This might actually
not be as bad as initially believed. The GC cache of Xlib makes
- this opertation less costly. */
+ this operation less costly. */
GC gc = new GC(this);
gc.putImage(image, 0, 0, 0, 0, image.getWidth(), image.getHeight());
diff --git a/libjava/gnu/gcj/xlib/XException.java b/libjava/gnu/gcj/xlib/XException.java
index 73b10a1c631..32adfc14697 100644
--- a/libjava/gnu/gcj/xlib/XException.java
+++ b/libjava/gnu/gcj/xlib/XException.java
@@ -9,7 +9,7 @@ details. */
package gnu.gcj.xlib;
/**
- * Runtime exception that occured during an Xlib opertation.
+ * Runtime exception that occurred during an Xlib operation.
*
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
*/
diff --git a/libjava/gnu/java/rmi/rmic/RMIC.java b/libjava/gnu/java/rmi/rmic/RMIC.java
index 591d522421d..1ad0ffb65a1 100644
--- a/libjava/gnu/java/rmi/rmic/RMIC.java
+++ b/libjava/gnu/java/rmi/rmic/RMIC.java
@@ -647,7 +647,7 @@ private void generateSkel() throws IOException {
out.println();
- // getOpertions method
+ // getOperations method
out.print("public java.rmi.server.Operation[] getOperations() {");
ctrl.indent();
out.print("return ((java.rmi.server.Operation[]) operations.clone());");
diff --git a/libjava/java/awt/AWTEvent.java b/libjava/java/awt/AWTEvent.java
index bb09f0cab98..0717f6dda4c 100644
--- a/libjava/java/awt/AWTEvent.java
+++ b/libjava/java/awt/AWTEvent.java
@@ -17,7 +17,7 @@ package java.awt;
/**
* AWTEvent is the root event class for all AWT events in the JDK 1.1 event
- * model. It supercedes the Event class from JDK 1.0.
+ * model. It supersedes the Event class from JDK 1.0.
*/
public abstract class AWTEvent extends java.util.EventObject
diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java
index d56e8aa8183..ef661bd9599 100644
--- a/libjava/java/awt/Window.java
+++ b/libjava/java/awt/Window.java
@@ -143,7 +143,7 @@ public class Window extends Container
super.show ();
- // FIXME: Is this call neccessary or do we assume the peer takes care of
+ // FIXME: Is this call necessary or do we assume the peer takes care of
// it?
// this.toFront();
}
diff --git a/libjava/java/io/ByteArrayOutputStream.java b/libjava/java/io/ByteArrayOutputStream.java
index b26b9e427cb..65a98ae40db 100644
--- a/libjava/java/io/ByteArrayOutputStream.java
+++ b/libjava/java/io/ByteArrayOutputStream.java
@@ -186,7 +186,7 @@ public class ByteArrayOutputStream extends OutputStream
return new String (buf, 0, count, hibyte);
}
- // Resize buffer to accomodate new bytes.
+ // Resize buffer to accommodate new bytes.
private void resize (int add)
{
if (count + add >= buf.length)
diff --git a/libjava/java/io/CharConversionException.java b/libjava/java/io/CharConversionException.java
index e090dfc60ba..b4fe77a6d57 100644
--- a/libjava/java/io/CharConversionException.java
+++ b/libjava/java/io/CharConversionException.java
@@ -33,7 +33,7 @@ package java.io;
*/
/**
- * This exception is thrown to indicate that a problem occured with
+ * This exception is thrown to indicate that a problem occurred with
* an attempted character conversion.
*
* @version 0.0
diff --git a/libjava/java/io/PipedInputStream.java b/libjava/java/io/PipedInputStream.java
index 328a1c0c19d..5f2bf6fb711 100644
--- a/libjava/java/io/PipedInputStream.java
+++ b/libjava/java/io/PipedInputStream.java
@@ -194,7 +194,7 @@ public class PipedInputStream extends InputStream
else
copylen = Math.min (len, buffer.length - in);
- // Copy bytes until the pipe is filled, wrapping if neccessary.
+ // Copy bytes until the pipe is filled, wrapping if necessary.
System.arraycopy(buf, bufpos, buffer, in, copylen);
len -= copylen;
bufpos += copylen;
diff --git a/libjava/java/io/PipedReader.java b/libjava/java/io/PipedReader.java
index 07569eb1dc1..48c18ab0ae5 100644
--- a/libjava/java/io/PipedReader.java
+++ b/libjava/java/io/PipedReader.java
@@ -181,7 +181,7 @@ public class PipedReader extends Reader
else
copylen = Math.min (len, buffer.length - in);
- // Copy chars until the pipe is filled, wrapping if neccessary.
+ // Copy chars until the pipe is filled, wrapping if necessary.
System.arraycopy(buf, bufpos, buffer, in, copylen);
len -= copylen;
bufpos += copylen;
diff --git a/libjava/java/io/PrintWriter.java b/libjava/java/io/PrintWriter.java
index e6f962e3867..3a4f73f768c 100644
--- a/libjava/java/io/PrintWriter.java
+++ b/libjava/java/io/PrintWriter.java
@@ -57,7 +57,7 @@ public class PrintWriter extends Writer
private boolean autoflush;
/**
- * This boolean indicates whether or not an error has ever occured
+ * This boolean indicates whether or not an error has ever occurred
* on this stream.
*/
private boolean error;
diff --git a/libjava/java/io/WriteAbortedException.java b/libjava/java/io/WriteAbortedException.java
index 0645ff79713..f73d5902358 100644
--- a/libjava/java/io/WriteAbortedException.java
+++ b/libjava/java/io/WriteAbortedException.java
@@ -1,4 +1,4 @@
-/* WriteAbortedException.java -- An exception occured while writing a
+/* WriteAbortedException.java -- An exception occurred while writing a
serialization stream
Copyright (C) 1998, 2000 Free Software Foundation, Inc.
diff --git a/libjava/java/io/natFileWin32.cc b/libjava/java/io/natFileWin32.cc
index dae0b2b8377..7e731267386 100644
--- a/libjava/java/io/natFileWin32.cc
+++ b/libjava/java/io/natFileWin32.cc
@@ -84,7 +84,7 @@ java::io::File::attr (jint query)
if (query == LENGTH)
return ((long long)info.nFileSizeHigh) << 32 | (unsigned long long)info.nFileSizeLow;
else {
- // FIXME? This is somewhat compiler dependant (the LL constant suffix)
+ // FIXME? This is somewhat compiler dependent (the LL constant suffix)
// The file time as return by windows is the number of 100-nanosecond intervals since January 1, 1601
return (((((long long)info.ftLastWriteTime.dwHighDateTime) << 32) | ((unsigned long long)info.ftLastWriteTime.dwLowDateTime)) - 116444736000000000LL) / 10000LL;
}
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h
index 24ca5b1f2b4..f84f363df5e 100644
--- a/libjava/java/lang/Class.h
+++ b/libjava/java/lang/Class.h
@@ -305,7 +305,7 @@ private:
friend jshort _Jv_FindIIndex (jclass *, jshort *, jshort);
// Return array class corresponding to element type KLASS, creating it if
- // neccessary.
+ // necessary.
inline friend jclass
_Jv_GetArrayClass (jclass klass, java::lang::ClassLoader *loader)
{
diff --git a/libjava/java/lang/Package.java b/libjava/java/lang/Package.java
index 189d26e611b..e7ca66876fa 100644
--- a/libjava/java/lang/Package.java
+++ b/libjava/java/lang/Package.java
@@ -39,7 +39,7 @@ import java.util.StringTokenizer;
* <a href="http://java.sun.com/products/jdk/1.3/docs/guide/versioning/spec/VersioningSpecification.html">Product Versioning Specification</a>.
* It also allows packages to be sealed with respect to the originating URL.
* <p>
- * The most usefull method is the <code>isCompatibleWith()</code> method that
+ * The most useful method is the <code>isCompatibleWith()</code> method that
* compares a desired version of a specification with the version of the
* specification as implemented by a package. A package is considered
* compatible with another version if the version of the specification is
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index 7d366078dc2..d94055e1cf0 100644
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -657,7 +657,7 @@ _Jv_NewArrayClass (jclass element, java::lang::ClassLoader *loader,
array_class->interface_count = sizeof interfaces / sizeof interfaces[0];
// Since all array classes have the same interface dispatch table, we can
- // cache one and reuse it. It is not neccessary to synchronize this.
+ // cache one and reuse it. It is not necessary to synchronize this.
if (!array_idt)
{
_Jv_PrepareConstantTimeTables (array_class);
diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc
index 17d8dbc8cfb..816268c4f37 100644
--- a/libjava/java/lang/natObject.cc
+++ b/libjava/java/lang/natObject.cc
@@ -746,7 +746,7 @@ heavy_lock_obj_finalization_proc (void *obj, void *cd)
// heavy lock. Unlink it and, if necessary, register a finalizer
// to destroy sync_info.
unlink_heavy(addr, he);
- hl -> address = 0; // Dont destroy it again.
+ hl -> address = 0; // Don't destroy it again.
release_set(&(he -> address), he_address);
# if defined (_Jv_HaveCondDestroy) || defined (_Jv_HaveMutexDestroy)
// Make sure lock is not held and then destroy condvar and mutex.
diff --git a/libjava/java/net/BindException.java b/libjava/java/net/BindException.java
index 3aeedd3e6fb..7fb5cfdd094 100644
--- a/libjava/java/net/BindException.java
+++ b/libjava/java/net/BindException.java
@@ -1,4 +1,4 @@
-/* BindException.java -- An exception occured while binding to a socket
+/* BindException.java -- An exception occurred while binding to a socket
Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -33,7 +33,7 @@ package java.net;
*/
/**
- * This exception indicates that an error occured while attempting to bind
+ * This exception indicates that an error occurred while attempting to bind
* socket to a particular port.
*
* @author Aaron M. Renn (arenn@urbanophile.com)
diff --git a/libjava/java/net/ConnectException.java b/libjava/java/net/ConnectException.java
index 0ac64c8888c..fc234a576a4 100644
--- a/libjava/java/net/ConnectException.java
+++ b/libjava/java/net/ConnectException.java
@@ -1,4 +1,4 @@
-/* ConnectException.java -- An exception occured while connecting to a host
+/* ConnectException.java -- An exception occurred while connecting to a host
Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -34,7 +34,7 @@ package java.net;
*/
/**
- * This exception indicates that an error occured while attempting to
+ * This exception indicates that an error occurred while attempting to
* connect to a remote host. Often this indicates that the remote host
* refused the connection (ie, is not listening on the target socket).
*
diff --git a/libjava/java/net/ProtocolException.java b/libjava/java/net/ProtocolException.java
index 5556f28abab..9c921e6e727 100644
--- a/libjava/java/net/ProtocolException.java
+++ b/libjava/java/net/ProtocolException.java
@@ -1,4 +1,4 @@
-/* ProtocolException.java -- A low level protocol error occured
+/* ProtocolException.java -- A low level protocol error occurred
Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -34,7 +34,7 @@ package java.net;
/**
* This exception indicates that some sort of low level protocol
- * exception occured. Look in the descriptive message (if any) for
+ * exception occurred. Look in the descriptive message (if any) for
* details on what went wrong
*
* @author Aaron M. Renn (arenn@urbanophile.com)
diff --git a/libjava/java/net/SocketException.java b/libjava/java/net/SocketException.java
index 37135f3a5d7..3520d4b92c1 100644
--- a/libjava/java/net/SocketException.java
+++ b/libjava/java/net/SocketException.java
@@ -1,4 +1,4 @@
-/* SocketException.java -- An exception occured while performing a socket op
+/* SocketException.java -- An exception occurred while performing a socket op
Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -31,7 +31,7 @@ package java.net;
*/
/**
- * This exception indicates that a generic error occured related to an
+ * This exception indicates that a generic error occurred related to an
* operation on a socket. Check the descriptive message (if any) for
* details on the nature of this error
*
diff --git a/libjava/java/net/UnknownServiceException.java b/libjava/java/net/UnknownServiceException.java
index f82607a502b..b890d2bc0e0 100644
--- a/libjava/java/net/UnknownServiceException.java
+++ b/libjava/java/net/UnknownServiceException.java
@@ -1,4 +1,4 @@
-/* UnknownServiceException.java -- A service error occured
+/* UnknownServiceException.java -- A service error occurred
Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of GNU Classpath.
diff --git a/libjava/java/security/SecureRandom.java b/libjava/java/security/SecureRandom.java
index 597d077993b..00fdca26092 100644
--- a/libjava/java/security/SecureRandom.java
+++ b/libjava/java/security/SecureRandom.java
@@ -55,7 +55,7 @@ public class SecureRandom extends Random
It is not seeded and should be seeded using setSeed or else
on the first call to getnextBytes it will force a seed.
- It is maintained for backwards compatability and programs
+ It is maintained for backwards compatibility and programs
should use getInstance.
*/
public SecureRandom()
@@ -115,7 +115,7 @@ public class SecureRandom extends Random
It is seeded with the passed function and is useful if the user
has access to hardware random device (like a radiation detector).
- It is maintained for backwards compatability and programs
+ It is maintained for backwards compatibility and programs
should use getInstance.
@param seed Seed bytes for class
diff --git a/libjava/java/security/SignedObject.java b/libjava/java/security/SignedObject.java
index 34f80e96706..40aeba794a7 100644
--- a/libjava/java/security/SignedObject.java
+++ b/libjava/java/security/SignedObject.java
@@ -80,7 +80,7 @@ public final class SignedObject implements Serializable
@param signingKey the key to sign with
@param signingEngine the signature engine to use
- @throws IOException serialization error occured
+ @throws IOException serialization error occurred
@throws InvalidKeyException invalid key
@throws SignatureException signing error
*/
@@ -108,8 +108,8 @@ public final class SignedObject implements Serializable
@return the encapsulated object
- @throws IOException de-serialization error occured
- @throws ClassNotFoundException de-serialization error occured
+ @throws IOException de-serialization error occurred
+ @throws ClassNotFoundException de-serialization error occurred
*/
public Object getObject() throws IOException, ClassNotFoundException
{
diff --git a/libjava/java/security/cert/X509Certificate.java b/libjava/java/security/cert/X509Certificate.java
index 46f47f615d5..db51964656b 100644
--- a/libjava/java/security/cert/X509Certificate.java
+++ b/libjava/java/security/cert/X509Certificate.java
@@ -288,7 +288,7 @@ public abstract class X509Certificate extends Certificate implements X509Extensi
@return the DER encoded tbsCertificate
- @throws CertificateEncodingException if encoding error occured
+ @throws CertificateEncodingException if encoding error occurred
*/
public abstract byte[] getTBSCertificate() throws CertificateEncodingException;
diff --git a/libjava/java/security/interfaces/DSAKey.java b/libjava/java/security/interfaces/DSAKey.java
index 1670b5a4d87..06fdec15d34 100644
--- a/libjava/java/security/interfaces/DSAKey.java
+++ b/libjava/java/security/interfaces/DSAKey.java
@@ -1,4 +1,4 @@
-/* DSAKey.java -- Interface for Digital Signature Algorith key
+/* DSAKey.java -- Interface for Digital Signature Algorithm key
Copyright (C) 1998 Free Software Foundation, Inc.
This file is part of GNU Classpath.
diff --git a/libjava/java/sql/DatabaseMetaData.java b/libjava/java/sql/DatabaseMetaData.java
index 92ed44e4551..2340d31338b 100644
--- a/libjava/java/sql/DatabaseMetaData.java
+++ b/libjava/java/sql/DatabaseMetaData.java
@@ -47,7 +47,7 @@ public static final int bestRowUnknown = 0;
public static final int bestRowNotPseudo = 1;
/**
- * The best row identifer is a pseudo-column.
+ * The best row identifier is a pseudo-column.
*/
public static final int bestRowPseudo = 2;
@@ -58,12 +58,12 @@ public static final int bestRowPseudo = 2;
public static final int bestRowTemporary = 0;
/**
- * The best row identifer is valid to the end of the transaction.
+ * The best row identifier is valid to the end of the transaction.
*/
public static final int bestRowTransaction = 1;
/**
- * The best row identifer is valid to the end of the session.
+ * The best row identifier is valid to the end of the session.
*/
public static final int bestRowSession = 2;
@@ -2696,7 +2696,7 @@ supportsBatchUpdates() throws SQLException;
* <li>TYPE_SCEHM - The schema name, which may be <code>null</code>.
* <li>TYPE_NAME - The user defined data type name.
* <li>CLASS_NAME - The Java class name this type maps to.
- * <li>DATA_TYPE - A type identifer from <code>Types</code> for this type.
+ * <li>DATA_TYPE - A type identifier from <code>Types</code> for this type.
* This will be one of <code>JAVA_OBJECT</code>, <code>STRUCT</code>, or
* <code>DISTINCT</code>.
* <li>REMARKS - Comments about this data type.
@@ -2708,7 +2708,7 @@ supportsBatchUpdates() throws SQLException;
* @param schema The schema to retrieve information from, or the empty string
* to return entities not associated with a schema.
* @param typePattern The type name pattern to match.
- * @param types The type identifer patterns (from <code>Types</code>) to
+ * @param types The type identifier patterns (from <code>Types</code>) to
* match.
*
* @return A <code>ResultSet</code> with the requested type information
diff --git a/libjava/java/text/DecimalFormatSymbols.java b/libjava/java/text/DecimalFormatSymbols.java
index bc5776a5668..7bdae5d6b29 100644
--- a/libjava/java/text/DecimalFormatSymbols.java
+++ b/libjava/java/text/DecimalFormatSymbols.java
@@ -476,7 +476,7 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable
}
/**
- * This method sets the charcter used to represen the digit zero.
+ * This method sets the character used to represent the digit zero.
*
* @param zeroDigit The character used to represent the digit zero.
*/
diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java
index 81494112533..a807a361623 100644
--- a/libjava/java/util/Calendar.java
+++ b/libjava/java/util/Calendar.java
@@ -445,7 +445,7 @@ public abstract class Calendar implements Serializable, Cloneable
}
/**
- * Gets the set of locales for which a Calendar is availiable.
+ * Gets the set of locales for which a Calendar is available.
* @exception MissingResourceException if locale data couldn't be found.
* @return the set of locales.
*/
@@ -682,7 +682,7 @@ public abstract class Calendar implements Serializable, Cloneable
* Compares the given calendar with this.
* @param o the object to that we should compare.
* @return true, if the given object is a calendar, that represents
- * the same time (but doesn't neccessary have the same fields).
+ * the same time (but doesn't necessary have the same fields).
*/
public boolean equals(Object o)
{
@@ -892,7 +892,7 @@ public abstract class Calendar implements Serializable, Cloneable
/**
* Gets the actual minimum value that is allowed for the specified field.
- * This value is dependant on the values of the other fields.
+ * This value is dependent on the values of the other fields.
* @param field the time field. One of the time field constants.
* @return the actual minimum value.
* @since jdk1.2
@@ -902,7 +902,7 @@ public abstract class Calendar implements Serializable, Cloneable
/**
* Gets the actual maximum value that is allowed for the specified field.
- * This value is dependant on the values of the other fields.
+ * This value is dependent on the values of the other fields.
* @param field the time field. One of the time field constants.
* @return the actual maximum value.
* @since jdk1.2
diff --git a/libjava/java/util/Collections.java b/libjava/java/util/Collections.java
index 3e2a40e554c..8e77a802476 100644
--- a/libjava/java/util/Collections.java
+++ b/libjava/java/util/Collections.java
@@ -538,7 +538,7 @@ public class Collections
/** Cache a single Random object for use by shuffle(List). This improves
* performance as well as ensuring that sequential calls to shuffle() will
- * not result in the same shuffle order occuring: the resolution of
+ * not result in the same shuffle order occurring: the resolution of
* System.currentTimeMillis() is not sufficient to guarantee a unique seed.
*/
private static Random defaultRandom = null;
diff --git a/libjava/java/util/GregorianCalendar.java b/libjava/java/util/GregorianCalendar.java
index 4c6e23c53df..f2141e0c599 100644
--- a/libjava/java/util/GregorianCalendar.java
+++ b/libjava/java/util/GregorianCalendar.java
@@ -216,7 +216,7 @@ public class GregorianCalendar extends Calendar
* Get the linear time in milliseconds since the epoch. If you
* specify a nonpositive year it is interpreted as BC as
* following: 0 is 1 BC, -1 is 2 BC and so on. The date is
- * interpreted as gregorian if the change occured before that date.
+ * interpreted as gregorian if the change occurred before that date.
*
* @param year the year of the date.
* @param dayOfYear the day of year of the date; 1 based.
@@ -627,7 +627,7 @@ public class GregorianCalendar extends Calendar
* Compares the given calender with this.
* @param o the object to that we should compare.
* @return true, if the given object is a calendar, that represents
- * the same time (but doesn't neccessary have the same fields).
+ * the same time (but doesn't necessary have the same fields).
* @XXX Should we check if time zones, locale, cutover etc. are equal?
*/
public boolean equals(Object o)
@@ -973,7 +973,7 @@ public class GregorianCalendar extends Calendar
/**
* Gets the actual minimum value that is allowed for the specified field.
- * This value is dependant on the values of the other fields. Note that
+ * This value is dependent on the values of the other fields. Note that
* this calls <code>complete()</code> if not enough fields are set. This
* can have ugly side effects.
* @param field the time field. One of the time field constants.
@@ -1001,7 +1001,7 @@ public class GregorianCalendar extends Calendar
/**
* Gets the actual maximum value that is allowed for the specified field.
- * This value is dependant on the values of the other fields. Note that
+ * This value is dependent on the values of the other fields. Note that
* this calls <code>complete()</code> if not enough fields are set. This
* can have ugly side effects.
* @param field the time field. One of the time field constants.
diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java
index b75718ffa63..3b351058a95 100644
--- a/libjava/java/util/HashMap.java
+++ b/libjava/java/util/HashMap.java
@@ -505,7 +505,7 @@ public class HashMap extends AbstractMap
public boolean remove(Object o)
{
// Test against the size of the HashMap to determine if anything
- // really got removed. This is neccessary because the return value of
+ // really got removed. This is necessary because the return value of
// HashMap.remove() is ambiguous in the null case.
int oldsize = size;
HashMap.this.remove(o);
diff --git a/libjava/java/util/List.java b/libjava/java/util/List.java
index 25892d73cdc..f2ee49cd260 100644
--- a/libjava/java/util/List.java
+++ b/libjava/java/util/List.java
@@ -288,7 +288,7 @@ public interface List extends Collection
Object remove(int index);
/**
- * Remove the first occurence of an object from this list (optional
+ * Remove the first occurrence of an object from this list (optional
* operation). That is, remove the first element e such that
* <code>o == null ? e == null : o.equals(e)</code>.
*
diff --git a/libjava/java/util/Properties.java b/libjava/java/util/Properties.java
index 457048c1d09..ee39a01b530 100644
--- a/libjava/java/util/Properties.java
+++ b/libjava/java/util/Properties.java
@@ -125,7 +125,7 @@ public class Properties extends Hashtable
* </pre>
*
* @param in the input stream
- * @exception IOException if an error occured when reading
+ * @exception IOException if an error occurred when reading
* from the input. */
public void load(InputStream inStream) throws IOException
{
diff --git a/libjava/java/util/Timer.java b/libjava/java/util/Timer.java
index d00c93768cb..32c0bea3b3f 100644
--- a/libjava/java/util/Timer.java
+++ b/libjava/java/util/Timer.java
@@ -39,8 +39,8 @@ package java.util;
* scheduling guarantees more or less that the task will be executed at a
* specific time, but if there is ever a delay in execution then the period
* between successive executions will be shorter. The first method of
- * repeated scheduling is prefered for repeated tasks in response to user
- * interaction, the second method of repeated scheduling is prefered for tasks
+ * repeated scheduling is preferred for repeated tasks in response to user
+ * interaction, the second method of repeated scheduling is preferred for tasks
* that act like alarms.
* <p>
* The Timer keeps a binary heap as a task priority queue which means that
@@ -65,7 +65,7 @@ public class Timer
/** Default size of this queue */
private final int DEFAULT_SIZE = 32;
- /** Wheter to return null when there is nothing in the queue */
+ /** Whether to return null when there is nothing in the queue */
private boolean nullOnEmpty;
/**
@@ -375,7 +375,7 @@ public class Timer
private boolean canceled;
/**
- * Creates a new Timer with a non deamon Thread as Scheduler, with normal
+ * Creates a new Timer with a non daemon Thread as Scheduler, with normal
* priority and a default name.
*/
public Timer()
@@ -384,7 +384,7 @@ public class Timer
}
/**
- * Creates a new Timer with a deamon Thread as scheduler if deamon is true,
+ * Creates a new Timer with a daemon Thread as scheduler if daemon is true,
* with normal priority and a default name.
*/
public Timer(boolean daemon)
@@ -393,7 +393,7 @@ public class Timer
}
/**
- * Creates a new Timer with a deamon Thread as scheduler if deamon is true,
+ * Creates a new Timer with a daemon Thread as scheduler if daemon is true,
* with the priority given and a default name.
*/
private Timer(boolean daemon, int priority)
@@ -402,7 +402,7 @@ public class Timer
}
/**
- * Creates a new Timer with a deamon Thread as scheduler if deamon is true,
+ * Creates a new Timer with a daemon Thread as scheduler if daemon is true,
* with the priority and name given.E
*/
private Timer(boolean daemon, int priority, String name)
diff --git a/libjava/java/util/Vector.java b/libjava/java/util/Vector.java
index 16785907664..cef84e51e72 100644
--- a/libjava/java/util/Vector.java
+++ b/libjava/java/util/Vector.java
@@ -32,7 +32,7 @@ import java.io.Serializable;
/**
* the <b>Vector</b> classes implements growable arrays of Objects.
* You can access elements in a Vector with an index, just as you
- * can in a built in array, but Vectors can grow and shrink to accomodate
+ * can in a built in array, but Vectors can grow and shrink to accommodate
* more or fewer objects.
*
* Vectors try to mantain efficiency in growing by having a
@@ -244,12 +244,12 @@ public class Vector extends AbstractList
/**
* Searches the vector starting at <b>index</b> for object <b>elem</b>
- * and returns the index of the first occurence of this Object. If
+ * and returns the index of the first occurrence of this Object. If
* the object is not found, -1 is returned
*
* @param e The Object to search for
* @param index Start searching at this index
- * @returns The index of the first occurence of <b>elem</b>, or -1
+ * @returns The index of the first occurrence of <b>elem</b>, or -1
* if it is not found
*/
public synchronized int indexOf(Object e, int index)
@@ -263,11 +263,11 @@ public class Vector extends AbstractList
}
/**
- * Returns the first occurence of <b>elem</b> in the Vector, or -1 if
+ * Returns the first occurrence of <b>elem</b> in the Vector, or -1 if
* <b>elem</b> is not found.
*
* @param elem The object to search for
- * @returns The index of the first occurence of <b>elem</b> or -1 if
+ * @returns The index of the first occurrence of <b>elem</b> or -1 if
* not found
*/
public int indexOf(Object elem)
@@ -287,7 +287,7 @@ public class Vector extends AbstractList
}
/**
- * Returns the index of the first occurence of <b>elem</b>, when searching
+ * Returns the index of the first occurrence of <b>elem</b>, when searching
* backwards from <b>index</b>. If the object does not occur in this Vector,
* -1 is returned.
*
@@ -465,7 +465,7 @@ public class Vector extends AbstractList
}
/**
- * Removes the first occurence of the given object from the Vector.
+ * Removes the first occurrence of the given object from the Vector.
* If such a remove was performed (the object was found), true is returned.
* If there was no such object, false is returned.
*
diff --git a/libjava/java/util/WeakHashMap.java b/libjava/java/util/WeakHashMap.java
index c81ecee1fe0..6f39d468108 100644
--- a/libjava/java/util/WeakHashMap.java
+++ b/libjava/java/util/WeakHashMap.java
@@ -615,7 +615,7 @@ public class WeakHashMap extends AbstractMap implements Map
{
WeakBucket prev = buckets[slot];
/* This may throw a NullPointerException. It shouldn't but if
- * a race condition occured (two threads removing the same
+ * a race condition occurred (two threads removing the same
* bucket at the same time) it may happen. <br>
* But with race condition many much worse things may happen
* anyway.
diff --git a/libjava/java/util/jar/Attributes.java b/libjava/java/util/jar/Attributes.java
index b18b5d8ca8a..ce1c9abaa2c 100644
--- a/libjava/java/util/jar/Attributes.java
+++ b/libjava/java/util/jar/Attributes.java
@@ -45,7 +45,7 @@ import java.util.Set;
* manipulating the Attributes more or less type safe.
* <p>
* Most of the methods are wrappers to implement the Map interface. The really
- * usefull and often used methods are <code>getValue(Name)</code> and
+ * useful and often used methods are <code>getValue(Name)</code> and
* <code>getValue(String)</code>. If you actually want to set attributes you
* may want to use the <code>putValue(String, String)</code> method
* (sorry there is no public type safe <code>putValue(Name, String)</code>
diff --git a/libjava/java/util/jar/JarEntry.java b/libjava/java/util/jar/JarEntry.java
index 7238d5b5164..fa27169d571 100644
--- a/libjava/java/util/jar/JarEntry.java
+++ b/libjava/java/util/jar/JarEntry.java
@@ -46,7 +46,7 @@ import java.util.zip.ZipEntry;
public class JarEntry extends ZipEntry
{
- // (Packge local) fields
+ // (Package local) fields
Attributes attr;
Certificate certs[];
diff --git a/libjava/java/util/jar/JarInputStream.java b/libjava/java/util/jar/JarInputStream.java
index c63758e4daf..f077f1be6e9 100644
--- a/libjava/java/util/jar/JarInputStream.java
+++ b/libjava/java/util/jar/JarInputStream.java
@@ -75,7 +75,7 @@ public class JarInputStream extends ZipInputStream
* tries to verify all the entry signatures while reading.
*
* @param in InputStream to read the jar from
- * @param verify wheter or not to verify the manifest entries
+ * @param verify whether or not to verify the manifest entries
* @exception IOException when an error occurs when opening or reading
*/
public JarInputStream(InputStream in, boolean verify) throws IOException
diff --git a/libjava/java/util/jar/JarOutputStream.java b/libjava/java/util/jar/JarOutputStream.java
index ca7729df02e..c073819f54a 100644
--- a/libjava/java/util/jar/JarOutputStream.java
+++ b/libjava/java/util/jar/JarOutputStream.java
@@ -93,7 +93,7 @@ public class JarOutputStream extends ZipOutputStream
* This implementation just calls <code>super.putNextEntre()</code>.
*
* @param entry The information for the next entry
- * @exception IOException when some unexpected I/O exception occured
+ * @exception IOException when some unexpected I/O exception occurred
*/
public void putNextEntry(ZipEntry entry) throws IOException
{
diff --git a/libjava/javax/naming/NamingException.java b/libjava/javax/naming/NamingException.java
index b214f19f519..08f2e6b82f9 100644
--- a/libjava/javax/naming/NamingException.java
+++ b/libjava/javax/naming/NamingException.java
@@ -36,7 +36,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 occured.
+ * the exception occurred.
*
* @since 1.3
* @author Anthony Green (green@redhat.com)
diff --git a/libjava/org/xml/sax/HandlerBase.java b/libjava/org/xml/sax/HandlerBase.java
index 297aced7aaa..34a8f7675d9 100644
--- a/libjava/org/xml/sax/HandlerBase.java
+++ b/libjava/org/xml/sax/HandlerBase.java
@@ -58,7 +58,7 @@ public class HandlerBase
* in a subclass to do special translations such as catalog lookups
* or URI redirection.</p>
*
- * @param publicId The public identifer, or null if none is
+ * @param publicId The public identifier, or null if none is
* available.
* @param systemId The system identifier provided in the XML
* document.
diff --git a/libjava/org/xml/sax/SAXParseException.java b/libjava/org/xml/sax/SAXParseException.java
index bcfb94ebd25..a5dcc06f0fb 100644
--- a/libjava/org/xml/sax/SAXParseException.java
+++ b/libjava/org/xml/sax/SAXParseException.java
@@ -100,9 +100,9 @@ public class SAXParseException extends SAXException {
* fully before creating the exception.</p>
*
* @param message The error or warning message.
- * @param publicId The public identifer of the entity that generated
+ * @param publicId The public identifier of the entity that generated
* the error or warning.
- * @param systemId The system identifer of the entity that generated
+ * @param systemId The system identifier of the entity that generated
* the error or warning.
* @param lineNumber The line number of the end of the text that
* caused the error or warning.
@@ -130,9 +130,9 @@ public class SAXParseException extends SAXException {
*
* @param message The error or warning message, or null to use
* the message from the embedded exception.
- * @param publicId The public identifer of the entity that generated
+ * @param publicId The public identifier of the entity that generated
* the error or warning.
- * @param systemId The system identifer of the entity that generated
+ * @param systemId The system identifier of the entity that generated
* the error or warning.
* @param lineNumber The line number of the end of the text that
* caused the error or warning.
diff --git a/libjava/org/xml/sax/helpers/DefaultHandler.java b/libjava/org/xml/sax/helpers/DefaultHandler.java
index dfda9c39a94..957d44d882e 100644
--- a/libjava/org/xml/sax/helpers/DefaultHandler.java
+++ b/libjava/org/xml/sax/helpers/DefaultHandler.java
@@ -71,7 +71,7 @@ public class DefaultHandler
* in a subclass to do special translations such as catalog lookups
* or URI redirection.</p>
*
- * @param publicId The public identifer, or null if none is
+ * @param publicId The public identifier, or null if none is
* available.
* @param systemId The system identifier provided in the XML
* document.
diff --git a/libjava/posix-threads.cc b/libjava/posix-threads.cc
index aa73dbf55f3..f068fbab53d 100644
--- a/libjava/posix-threads.cc
+++ b/libjava/posix-threads.cc
@@ -161,7 +161,7 @@ _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu,
mu->owner = self;
mu->count = count;
- // If we were interrupted, or if a timeout occured, remove ourself from
+ // If we were interrupted, or if a timeout occurred, remove ourself from
// the cv wait list now. (If we were notified normally, notify() will have
// already taken care of this)
if (r == ETIMEDOUT || interrupted)
diff --git a/libjava/testsuite/libjava.lang/Thread_Wait.java b/libjava/testsuite/libjava.lang/Thread_Wait.java
index 5ca12ed5d4b..a6492821b4b 100644
--- a/libjava/testsuite/libjava.lang/Thread_Wait.java
+++ b/libjava/testsuite/libjava.lang/Thread_Wait.java
@@ -20,7 +20,7 @@ public class Thread_Wait implements Runnable
}
catch (Exception x)
{
- System.out.println("exception occured: " + x);
+ System.out.println("exception occurred: " + x);
}
synchronized (this)
@@ -41,7 +41,7 @@ public class Thread_Wait implements Runnable
}
catch (Exception x)
{
- System.out.println("exception occured: " + x);
+ System.out.println("exception occurred: " + x);
}
}
System.out.println ("thread notified okay");
OpenPOWER on IntegriCloud