From 8aa540d2f783474d1d2e06f16744bf67b9c1facc Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 10 Mar 2006 21:46:48 +0000 Subject: Imported GNU Classpath 0.90 Imported GNU Classpath 0.90 * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore. * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant. * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5. * java/lang/Math.java: New override file. * java/lang/Character.java: Merged from Classpath. (start, end): Now 'int's. (canonicalName): New field. (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants. (UnicodeBlock): Added argument. (of): New overload. (forName): New method. Updated unicode blocks. (sets): Updated. * sources.am: Regenerated. * Makefile.in: Likewise. From-SVN: r111942 --- libjava/classpath/java/nio/channels/FileChannel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libjava/classpath/java/nio/channels/FileChannel.java') diff --git a/libjava/classpath/java/nio/channels/FileChannel.java b/libjava/classpath/java/nio/channels/FileChannel.java index 944ec0b..0eefffb 100644 --- a/libjava/classpath/java/nio/channels/FileChannel.java +++ b/libjava/classpath/java/nio/channels/FileChannel.java @@ -219,7 +219,7 @@ public abstract class FileChannel extends AbstractInterruptibleChannel public abstract void force(boolean metaData) throws IOException; /** - * Creates a file lock for the whole assoziated file. + * Creates a file lock for the whole associated file. * * @exception AsynchronousCloseException If another thread closes this channel * while the transfer is in progress. @@ -242,7 +242,7 @@ public abstract class FileChannel extends AbstractInterruptibleChannel } /** - * Creates a file lock for a region of the assoziated file. + * Creates a file lock for a region of the associated file. * * @exception AsynchronousCloseException If another thread closes this channel * while the transfer is in progress. @@ -265,7 +265,7 @@ public abstract class FileChannel extends AbstractInterruptibleChannel throws IOException; /** - * Tries to aqquire alock on the whole assoziated file. + * Tries to aqquire alock on the whole associated file. * * @exception ClosedChannelException If this channel is closed. * @exception IOException If an I/O error occurs. @@ -280,7 +280,7 @@ public abstract class FileChannel extends AbstractInterruptibleChannel } /** - * Tries to aqquire a lock on a region of the assoziated file. + * Tries to aqquire a lock on a region of the associated file. * * @exception ClosedChannelException If this channel is closed. * @exception IllegalArgumentException If the preconditions on the parameters -- cgit v1.1