Merge branch 'master' of oss.readytalk.com:/var/local/git/avian

This commit is contained in:
Joel Dice 2008-07-14 11:02:47 -06:00
commit f700f6cf3a
5 changed files with 14 additions and 15 deletions

View File

@ -14,9 +14,9 @@ public class File {
private static final String FileSeparator
= System.getProperty("file.separator");
// static {
// System.loadLibrary("natives");
// }
// static {
// System.loadLibrary("natives");
// }
private final String path;

View File

@ -11,9 +11,9 @@
package java.io;
public class FileInputStream extends InputStream {
// static {
// System.loadLibrary("natives");
// }
// static {
// System.loadLibrary("natives");
// }
private int fd;

View File

@ -11,9 +11,9 @@
package java.io;
public class FileOutputStream extends OutputStream {
// static {
// System.loadLibrary("natives");
// }
// static {
// System.loadLibrary("natives");
// }
private int fd;

View File

@ -41,8 +41,7 @@ public abstract class InputStream {
int c;
while ((c = read(buffer, 0, (int) (size < remaining ? size : remaining)))
>= 0
&& remaining > 0)
{
&& remaining > 0) {
remaining -= c;
}
return count - remaining;