procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
This commit is contained in:
Michael Koch 2004-10-09 10:22:25 +00:00 • committed by Michael Koch
parent f507003ab2
commit 0d2e6ffef6
10 changed files with 72 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libjava/ChangeLog
View file

@ -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,

2
libjava/java/io/CharArrayWriter.java
View file

@ -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)
{

3
libjava/java/io/DataInputStream.java
View file

@ -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.

3
libjava/java/io/FileDescriptor.java
View file

@ -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

3
libjava/java/io/FileInputStream.java
View file

@ -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.

3
libjava/java/io/FileOutputStream.java
View file

@ -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.

20
libjava/java/io/ObjectOutputStream.java
View file

@ -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,18 +39,17 @@ exception statement from your version. */
package java.io;
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.security.AccessController;
import java.util.Hashtable;
import gnu.classpath.Configuration;
import gnu.java.io.ObjectIdentityWrapper;
import gnu.java.lang.reflect.TypeSignature;
import gnu.java.security.action.SetAccessibleAction;
import gnu.classpath.Configuration;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.security.AccessController;
import java.util.Hashtable;
/**
* An <code>ObjectOutputStream</code> can be used to write objects

66
libjava/java/io/ObjectStreamClass.java
View file

@ -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.
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.
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.
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. */
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
{

4
libjava/java/io/PipedInputStream.java
View file

@ -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.

3
libjava/java/io/RandomAccessFile.java
View file

@ -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.