Merged gcj-eclipse branch to trunk.

From-SVN: r120621
This commit is contained in:
Tom Tromey 2007-01-09 19:58:05 +00:00
parent c648dedbde
commit 97b8365caf
17478 changed files with 606493 additions and 100744 deletions

View file

@ -1,5 +1,5 @@
/* Deflater.java - Compress a data stream
Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -150,7 +150,7 @@ public class Deflater
private int state;
/** The total bytes of output written. */
private int totalOut;
private long totalOut;
/** The pending output. */
private DeflaterPending pending;
@ -241,7 +241,17 @@ public class Deflater
/**
* Gets the number of input bytes processed so far.
*/
@Deprecated
public int getTotalIn()
{
return (int) engine.getTotalIn();
}
/**
* Gets the number of input bytes processed so far.
* @since 1.5
*/
public long getBytesRead()
{
return engine.getTotalIn();
}
@ -249,7 +259,17 @@ public class Deflater
/**
* Gets the number of output bytes so far.
*/
@Deprecated
public int getTotalOut()
{
return (int) totalOut;
}
/**
* Gets the number of output bytes so far.
* @since 1.5
*/
public long getBytesWritten()
{
return totalOut;
}