summaryrefslogtreecommitdiff
path: root/libjava/classpath/java/nio/channels/FileChannel.java
diff options
context:
space:
mode:
authormark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>2006-03-10 21:46:48 +0000
committermark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>2006-03-10 21:46:48 +0000
commitce57ab760f69de6db452def7ffbf5b114a2d8694 (patch)
treeea38c56431c5d4528fb54254c3f8e50f517bede3 /libjava/classpath/java/nio/channels/FileChannel.java
parent50996fe55769882de3f410896032c887f0ff0d04 (diff)
downloadgcc-ce57ab760f69de6db452def7ffbf5b114a2d8694.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111942 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/java/nio/channels/FileChannel.java')
-rw-r--r--libjava/classpath/java/nio/channels/FileChannel.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/libjava/classpath/java/nio/channels/FileChannel.java b/libjava/classpath/java/nio/channels/FileChannel.java
index 944ec0b8f3e..0eefffbe97b 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