2004-10-09 Michael Koch <konqueror@gmx.de>

	* java/io/CharArrayWriter.java
	(resize): Removed redundant 'final' modifier.
	* java/io/DataInputStream.java
	(readFully): Throw IndexOutOfBoundsException of len < 0.
	* java/io/FileDescriptor.java,
	java/io/FileInputStream.java,
	java/io/FileOutputStream.java,
	java/io/ObjectOutputStream.java,
	java/io/ObjectStreamClass.java,
	java/io/PipedInputStream.java,
	java/io/RandomAccessFile.java:
	Reorganized import statements.

From-SVN: r88817

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 43b60bd3d35450c3ad98011e18ec3216a7be8209..856ac3ae5ec05a7e12fa1ef59a6e2600e518c506 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,18 @@
+2004-10-09  Michael Koch  <konqueror@gmx.de>
+
+       * java/io/CharArrayWriter.java
+       (resize): Removed redundant 'final' modifier.
+       * java/io/DataInputStream.java
+       (readFully): Throw IndexOutOfBoundsException of len < 0.
+       * java/io/FileDescriptor.java,
+       java/io/FileInputStream.java,
+       java/io/FileOutputStream.java,
+       java/io/ObjectOutputStream.java,
+       java/io/ObjectStreamClass.java,
+       java/io/PipedInputStream.java,
+       java/io/RandomAccessFile.java:
+       Reorganized import statements.
+
 2004-10-09  Michael Koch  <konqueror@gmx.de>
 
        * gnu/java/rmi/rmic/RMIC.java,

diff --git a/libjava/java/io/CharArrayWriter.java b/libjava/java/io/CharArrayWriter.java
index 106fd9ee2dff8fae00c6de70975288408de7afa1..7453996c346416017eb45ddc001a705098cc0afc 100644 (file)
--- a/libjava/java/io/CharArrayWriter.java
+++ b/libjava/java/io/CharArrayWriter.java
@@ -249,7 +249,7 @@ public class CharArrayWriter extends Writer
    * application programmers by setting their initial buffer size big
    * enough to hold everything if possible.
    */
-  private final void resize (int len)
+  private void resize (int len)
   {
     if (count + len >= buf.length)
       {

diff --git a/libjava/java/io/DataInputStream.java b/libjava/java/io/DataInputStream.java
index b33cbe756baafa0fde6df21c236cf34731a7e770..b74fabe63f6dc392ce47c23c411951ebd069e85a 100644 (file)
--- a/libjava/java/io/DataInputStream.java
+++ b/libjava/java/io/DataInputStream.java
@@ -279,6 +279,9 @@ public class DataInputStream extends FilterInputStream implements DataInput
    */
   public final void readFully (byte[] buf, int offset, int len) throws IOException
   {
+    if (len < 0)
+      throw new IndexOutOfBoundsException("Negative length: " + len);
+    
     while (len > 0)
       {
        // in.read will block until some data is available.

diff --git a/libjava/java/io/FileDescriptor.java b/libjava/java/io/FileDescriptor.java
index 35a478509fc1efbee7af562d7293bbd444ee1d5a..e3c1a18bd9ff005a4ec8177a6aed9ac6036a965f 100644 (file)
--- a/libjava/java/io/FileDescriptor.java
+++ b/libjava/java/io/FileDescriptor.java
@@ -39,9 +39,10 @@ exception statement from your version. */
 
 package java.io;
 
+import gnu.java.nio.channels.FileChannelImpl;
+
 import java.nio.channels.ByteChannel;
 import java.nio.channels.FileChannel;
-import gnu.java.nio.channels.FileChannelImpl;
 
 /**
  * This class represents an opaque file handle as a Java class.  It should

diff --git a/libjava/java/io/FileInputStream.java b/libjava/java/io/FileInputStream.java
index 57f6143f6be68f055420ab92a2f046566d0df3bb..41d240352c757136cf1871940ae7c317e1eb6bec 100644 (file)
--- a/libjava/java/io/FileInputStream.java
+++ b/libjava/java/io/FileInputStream.java
@@ -38,9 +38,10 @@ exception statement from your version. */
 
 package java.io;
 
-import java.nio.channels.FileChannel;
 import gnu.java.nio.channels.FileChannelImpl;
 
+import java.nio.channels.FileChannel;
+
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
  * "The Java Language Specification", ISBN 0-201-63451-1
  * plus online API docs for JDK 1.2 beta from http://www.javasoft.com.

diff --git a/libjava/java/io/FileOutputStream.java b/libjava/java/io/FileOutputStream.java
index 8942871e43aa6c7833dfcad9ff98e4b51a44c236..d81d6d19bcf7e60cb7debcf23fa02dcfc5a560da 100644 (file)
--- a/libjava/java/io/FileOutputStream.java
+++ b/libjava/java/io/FileOutputStream.java
@@ -38,9 +38,10 @@ exception statement from your version. */
 
 package java.io;
 
-import java.nio.channels.FileChannel;
 import gnu.java.nio.channels.FileChannelImpl;
 
+import java.nio.channels.FileChannel;
+
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
  * "The Java Language Specification", ISBN 0-201-63451-1
  * Status:  Complete to version 1.1.

diff --git a/libjava/java/io/ObjectOutputStream.java b/libjava/java/io/ObjectOutputStream.java
index 2435b070d08f3ce4c70296198f715a16a3a54480..91c985856544f58ed08037ed94797b94bb53845c 100644 (file)
--- a/libjava/java/io/ObjectOutputStream.java
+++ b/libjava/java/io/ObjectOutputStream.java
@@ -1,5 +1,6 @@
 /* ObjectOutputStream.java -- Class used to write serialized objects
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,19 +39,18 @@ exception statement from your version. */
 
 package java.io;
 
+import gnu.classpath.Configuration;
+import gnu.java.io.ObjectIdentityWrapper;
+import gnu.java.lang.reflect.TypeSignature;
+import gnu.java.security.action.SetAccessibleAction;
+
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
-import java.security.PrivilegedAction;
+import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.util.Hashtable;
 
-import gnu.java.io.ObjectIdentityWrapper;
-import gnu.java.lang.reflect.TypeSignature;
-import gnu.java.security.action.SetAccessibleAction;
-import gnu.classpath.Configuration;
-
 /**
  * An <code>ObjectOutputStream</code> can be used to write objects
  * as well as primitive data in a platform-independent manner to an

diff --git a/libjava/java/io/ObjectStreamClass.java b/libjava/java/io/ObjectStreamClass.java
index 050ed3d7bac0ad932b540baa9e6f48d7fdc00392..d133afc08f93335d29e9275ef1c3d39dfa0c3be7 100644 (file)
--- a/libjava/java/io/ObjectStreamClass.java
+++ b/libjava/java/io/ObjectStreamClass.java
@@ -2,43 +2,48 @@
    about serialized objects.
    Copyright (C) 1998, 1999, 2000, 2001, 2003  Free Software Foundation, Inc.
 
-   This file is part of GNU Classpath.
+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 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. */
+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.io;
 
+import gnu.java.io.NullOutputStream;
+import gnu.java.lang.reflect.TypeSignature;
+import gnu.java.security.action.SetAccessibleAction;
+import gnu.java.security.provider.Gnu;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
@@ -55,11 +60,6 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Hashtable;
 import java.util.Vector;
-import gnu.java.io.NullOutputStream;
-import gnu.java.lang.reflect.TypeSignature;
-import gnu.java.security.action.SetAccessibleAction;
-import gnu.java.security.provider.Gnu;
-
 
 public class ObjectStreamClass implements Serializable
 {

diff --git a/libjava/java/io/PipedInputStream.java b/libjava/java/io/PipedInputStream.java
index 91fca676fd97be50fb220ac6f79aef852caf7336..97700a07ff10d61ae69cde100748145b30beb252 100644 (file)
--- a/libjava/java/io/PipedInputStream.java
+++ b/libjava/java/io/PipedInputStream.java
@@ -35,12 +35,12 @@ 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.io;
+
 // NOTE: This implementation is very similar to that of PipedReader.  If you 
 // fix a bug in here, chances are you should make a similar change to the 
 // PipedReader code.
 
-package java.io;
-
 /**
   * An input stream that reads its bytes from an output stream
   * to which it is connected. 

diff --git a/libjava/java/io/RandomAccessFile.java b/libjava/java/io/RandomAccessFile.java
index 7907d46f2fd95d031c0545cb660ba8821bcf15fe..a99abd2d6b490357f3b9c3b39177994e3e02f862 100644 (file)
--- a/libjava/java/io/RandomAccessFile.java
+++ b/libjava/java/io/RandomAccessFile.java
@@ -38,9 +38,10 @@ exception statement from your version. */
 
 package java.io;
 
-import java.nio.channels.FileChannel;
 import gnu.java.nio.channels.FileChannelImpl;
 
+import java.nio.channels.FileChannel;
+
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
  * "The Java Language Specification", ISBN 0-201-63451-1
  * Status: Believe complete and correct to 1.1.