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

CollationKey.java: Implement Comparable.

Browse source 
* java/text/CollationKey.java: Implement Comparable.
	(compareTo(Object)): New method.
	* java/text/Collator.java (compare(Object,Object)): New method.
	Implement Comparator.

	* java/util/zip/InflaterInputStream.java (available): New method.
	(close): New method.
	(read, available, skip, fill): Throw exception if stream closed.
	* java/util/zip/ZipInputStream.java (read, skip, readFully, fill,
	getNextEntry): Throw exception if closed.

From-SVN: r37525
This commit is contained in:
Tom Tromey 2000-11-17 20:44:03 +00:00 • committed by Tom Tromey
parent 6414587c8b
commit 4cdfd292e3
5 changed files with 78 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libjava/java/util/zip/ZipInputStream.java
View file

@ -35,6 +35,8 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
public ZipEntry getNextEntry () throws IOException
{
if (closed)
throw new IOException ("stream closed");
if (current != null)
closeEntry();
if (in.read() != 'P'
@ -112,6 +114,8 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
// back data.
protected void fill () throws IOException
{
if (closed)
throw new IOException ("stream closed");
int count = buf.length;
if (count > compressed_bytes)
count = compressed_bytes;
@ -127,9 +131,11 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
{
return new ZipEntry (name);
}
public int read (byte[] b, int off, int len) throws IOException
{
if (closed)
throw new IOException ("stream closed");
if (len > avail)
len = avail;
int count;
@ -149,6 +155,8 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
public long skip (long n) throws IOException
{
if (closed)
throw new IOException ("stream closed");
if (n > avail)
n = avail;
long count;
@ -160,11 +168,9 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
return count;
}
public int available() {
if (closed)
return 0;
else
return 1;
public int available()
{
return closed ? 0 : 1;
}
private void readFully (byte[] b) throws IOException