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
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/* LineInputStream.java --
|
||||
Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
@@ -40,7 +40,6 @@ package gnu.java.net;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.FilterInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
@@ -50,8 +49,14 @@ import java.io.InputStream;
|
||||
* @author Chris Burdess (dog@gnu.org)
|
||||
*/
|
||||
public class LineInputStream
|
||||
extends FilterInputStream
|
||||
extends InputStream
|
||||
{
|
||||
|
||||
/**
|
||||
* The underlying input stream.
|
||||
*/
|
||||
protected InputStream in;
|
||||
|
||||
/*
|
||||
* Line buffer.
|
||||
*/
|
||||
@@ -88,7 +93,7 @@ public class LineInputStream
|
||||
*/
|
||||
public LineInputStream(InputStream in, String encoding)
|
||||
{
|
||||
super(in);
|
||||
this.in = in;
|
||||
buf = new ByteArrayOutputStream();
|
||||
this.encoding = encoding;
|
||||
eof = false;
|
||||
@@ -96,6 +101,24 @@ public class LineInputStream
|
||||
blockReads = !(in instanceof BufferedInputStream) && in.markSupported();
|
||||
}
|
||||
|
||||
public int read()
|
||||
throws IOException
|
||||
{
|
||||
return in.read();
|
||||
}
|
||||
|
||||
public int read(byte[] buf)
|
||||
throws IOException
|
||||
{
|
||||
return in.read(buf);
|
||||
}
|
||||
|
||||
public int read(byte[] buf, int off, int len)
|
||||
throws IOException
|
||||
{
|
||||
return in.read(buf, off, len);
|
||||
}
|
||||
|
||||
/**
|
||||
* Read a line of input.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user