This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] java.nio - new files


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi list,

The attached patch with 2 new files is needed in java.nio.
They are not compiled yet by default. This will come later.
Please review and comment.

Michael
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+Q4uFWSOgCCdjSDsRAgVtAJ9b1eStj2MocT/vgyf1ZTNNuRnv9gCgnBNx
BmSE4OQgcdY1z1JbuaLBh1Q=
=xvqX
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1663
diff -u -r1.1663 ChangeLog
--- ChangeLog	4 Feb 2003 21:07:15 -0000	1.1663
+++ ChangeLog	7 Feb 2003 10:22:36 -0000
@@ -1,3 +1,8 @@
+2003-02-07  Michael Koch  <konqueror@gmx.de>
+
+	* gnu/java/nio/FileLockImpl.java,
+	java/nio/channels/FileLock.java: New files.
+
 2003-02-04  Tom Tromey  <tromey@redhat.com>
 
 	* java/io/PipedOutputStream.java (flush): Declare as throwing
Index: gnu/java/nio/FileLockImpl.java
===================================================================
RCS file: gnu/java/nio/FileLockImpl.java
diff -N gnu/java/nio/FileLockImpl.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/nio/FileLockImpl.java	7 Feb 2003 10:22:36 -0000
@@ -0,0 +1,63 @@
+/* FileChannelImpl.java -- 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.java.nio;
+
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+
+/**
+ * @author Michael Koch
+ */
+public class FileLockImpl extends FileLock
+{
+  public FileLockImpl (FileChannel channel, long position, long size,
+                       boolean shared)
+  {
+    super (channel, position, size, shared);
+  }
+  
+  public boolean isValid ()
+  {
+    throw new Error ("Not implemented");
+  }
+
+  public void release ()
+  {
+    throw new Error ("Not implemented");
+  }
+}
Index: java/nio/channels/FileLock.java
===================================================================
RCS file: java/nio/channels/FileLock.java
diff -N java/nio/channels/FileLock.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/nio/channels/FileLock.java	7 Feb 2003 10:22:36 -0000
@@ -0,0 +1,137 @@
+/* FileLock.java -- 
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.nio.channels;
+
+import java.io.IOException;
+
+/**
+ * @since 1.4
+ */
+public abstract class FileLock
+{
+  FileChannel channel;
+  long position;
+  long size;
+  boolean shared;
+  
+  /**
+   * Initializes the file lock.
+   *
+   * @exception IllegalArgumentException If the preconditions on the parameters do not hold
+   */
+  protected FileLock (FileChannel channel, long position, long size,
+                      boolean shared)
+  {
+    if (position < 0 ||
+        size < 0)
+      throw new IllegalArgumentException ();
+
+    this.channel = channel;
+    this.position = position;
+    this.size = size;
+    this.shared = shared;
+  }
+ 
+  /**
+   * Tells whether or not this lock is valid.
+   */
+  public abstract boolean isValid();
+ 
+  /**
+   * Releases this lock.
+   *
+   * @exception IOException If an error occurs
+   * @exception ClosedChannelException If the locked channel is no longer open.
+   */
+  public abstract void release () throws IOException;
+  
+  /**
+   * Returns the file channel upon whose file this lock is held.
+   */
+  public final FileChannel channel ()
+  {
+    return channel;
+  }
+
+  /**
+   * Tells whether this lock is shared.
+   */
+  public final boolean isShared ()
+  {
+    return shared;
+  }    
+
+  /**
+   * Tells whether or not this lock overlaps the given lock range.
+   */
+  public final boolean overlaps (long position, long size)
+  {
+    if (position > this.position +this.size)
+      return false;
+
+    if (position + size < this.position)
+      return false;
+
+    return true;
+  }
+
+  /**
+   * Returns the position within the file of the first byte of the
+   * locked region.
+   */
+  public final long position ()
+  {
+    return position;
+  }
+    
+  /**
+   * Returns the size of the locked region in bytes.
+   */
+  public final long size ()
+  {
+    return size;
+  }
+
+  /**
+   * Returns a string describing the range, type, and validity of this lock.
+   */
+  public final String toString ()
+  {
+    return "file-lock:pos=" + position + "size=" + size;
+  }
+}

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]