|
From: <ls...@us...> - 2008-06-15 17:08:34
|
Revision: 4249
http://jnode.svn.sourceforge.net/jnode/?rev=4249&view=rev
Author: lsantha
Date: 2008-06-15 10:08:33 -0700 (Sun, 15 Jun 2008)
Log Message:
-----------
File systems sizes are -1 when undefined.
Modified Paths:
--------------
trunk/fs/src/fs/org/jnode/fs/FileSystem.java
trunk/fs/src/fs/org/jnode/fs/ext2/Ext2FileSystem.java
trunk/fs/src/fs/org/jnode/fs/fat/FatFileSystem.java
trunk/fs/src/fs/org/jnode/fs/ftpfs/FTPFileSystem.java
trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystem.java
trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java
trunk/fs/src/fs/org/jnode/fs/jarfs/JarFileSystem.java
trunk/fs/src/fs/org/jnode/fs/jfat/FatFileSystem.java
trunk/fs/src/fs/org/jnode/fs/jifs/JIFileSystem.java
trunk/fs/src/fs/org/jnode/fs/ntfs/NTFSFileSystem.java
trunk/fs/src/fs/org/jnode/fs/service/def/VirtualFS.java
trunk/fs/src/fs/org/jnode/fs/smbfs/SMBFileSystem.java
Modified: trunk/fs/src/fs/org/jnode/fs/FileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/FileSystem.java 2008-06-15 15:47:01 UTC (rev 4248)
+++ trunk/fs/src/fs/org/jnode/fs/FileSystem.java 2008-06-15 17:08:33 UTC (rev 4249)
@@ -62,9 +62,24 @@
*/
public boolean isClosed();
+ /**
+ * The total size of this file system.
+ * @return if -1 this feature is unsupported
+ * @throws IOException if an I/O error occurs
+ */
public long getTotalSpace() throws IOException;
+ /**
+ * The free space of this file system.
+ * @return if -1 this feature is unsupported
+ * @throws IOException if an I/O error occurs
+ */
public long getFreeSpace() throws IOException;
+ /**
+ * The usabe space of this file system.
+ * @return if -1 this feature is unsupported
+ * @throws IOException if an I/O error occurs
+ */
public long getUsableSpace() throws IOException;
}
Modified: trunk/fs/src/fs/org/jnode/fs/ext2/Ext2FileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/ext2/Ext2FileSystem.java 2008-06-15 15:47:01 UTC (rev 4248)
+++ trunk/fs/src/fs/org/jnode/fs/ext2/Ext2FileSystem.java 2008-06-15 17:08:33 UTC (rev 4249)
@@ -947,6 +947,6 @@
public long getUsableSpace() {
// TODO implement me
- return 0;
+ return -1;
}
}
Modified: trunk/fs/src/fs/org/jnode/fs/fat/FatFileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/fat/FatFileSystem.java 2008-06-15 15:47:01 UTC (rev 4248)
+++ trunk/fs/src/fs/org/jnode/fs/fat/FatFileSystem.java 2008-06-15 17:08:33 UTC (rev 4249)
@@ -203,16 +203,16 @@
public long getFreeSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getTotalSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getUsableSpace() {
// TODO implement me
- return 0;
+ return -1;
}
}
Modified: trunk/fs/src/fs/org/jnode/fs/ftpfs/FTPFileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/ftpfs/FTPFileSystem.java 2008-06-15 15:47:01 UTC (rev 4248)
+++ trunk/fs/src/fs/org/jnode/fs/ftpfs/FTPFileSystem.java 2008-06-15 17:08:33 UTC (rev 4249)
@@ -164,17 +164,17 @@
public long getFreeSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getTotalSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getUsableSpace() {
// TODO implement me
- return 0;
+ return -1;
}
FTPFile[] dirDetails(String path) throws IOException, FTPException, ParseException {
Modified: trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystem.java 2008-06-15 15:47:01 UTC (rev 4248)
+++ trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystem.java 2008-06-15 17:08:33 UTC (rev 4249)
@@ -104,7 +104,7 @@
public final long getUsableSpace() {
// TODO Auto-generated method stub
- return 0;
+ return -1;
}
public final Catalog getCatalog() {
Modified: trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java 2008-06-15 15:47:01 UTC (rev 4248)
+++ trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java 2008-06-15 17:08:33 UTC (rev 4249)
@@ -110,16 +110,16 @@
public long getFreeSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getTotalSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getUsableSpace() {
// TODO implement me
- return 0;
+ return -1;
}
}
Modified: trunk/fs/src/fs/org/jnode/fs/jarfs/JarFileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/jarfs/JarFileSystem.java 2008-06-15 15:47:01 UTC (rev 4248)
+++ trunk/fs/src/fs/org/jnode/fs/jarfs/JarFileSystem.java 2008-06-15 17:08:33 UTC (rev 4249)
@@ -81,16 +81,16 @@
public long getFreeSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getTotalSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getUsableSpace() {
// TODO implement me
- return 0;
+ return -1;
}
}
Modified: trunk/fs/src/fs/org/jnode/fs/jfat/FatFileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/jfat/FatFileSystem.java 2008-06-15 15:47:01 UTC (rev 4248)
+++ trunk/fs/src/fs/org/jnode/fs/jfat/FatFileSystem.java 2008-06-15 17:08:33 UTC (rev 4249)
@@ -89,16 +89,16 @@
public long getFreeSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getTotalSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getUsableSpace() {
// TODO implement me
- return 0;
+ return -1;
}
}
Modified: trunk/fs/src/fs/org/jnode/fs/jifs/JIFileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/jifs/JIFileSystem.java 2008-06-15 15:47:01 UTC (rev 4248)
+++ trunk/fs/src/fs/org/jnode/fs/jifs/JIFileSystem.java 2008-06-15 17:08:33 UTC (rev 4249)
@@ -120,17 +120,17 @@
public long getFreeSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getTotalSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getUsableSpace() {
// TODO implement me
- return 0;
+ return -1;
}
}
Modified: trunk/fs/src/fs/org/jnode/fs/ntfs/NTFSFileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/ntfs/NTFSFileSystem.java 2008-06-15 15:47:01 UTC (rev 4248)
+++ trunk/fs/src/fs/org/jnode/fs/ntfs/NTFSFileSystem.java 2008-06-15 17:08:33 UTC (rev 4249)
@@ -106,16 +106,16 @@
public long getFreeSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getTotalSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getUsableSpace() {
// TODO implement me
- return 0;
+ return -1;
}
}
Modified: trunk/fs/src/fs/org/jnode/fs/service/def/VirtualFS.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/service/def/VirtualFS.java 2008-06-15 15:47:01 UTC (rev 4248)
+++ trunk/fs/src/fs/org/jnode/fs/service/def/VirtualFS.java 2008-06-15 17:08:33 UTC (rev 4249)
@@ -100,16 +100,16 @@
public long getFreeSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getTotalSpace() {
// TODO implement me
- return 0;
+ return -1;
}
public long getUsableSpace() {
// TODO implement me
- return 0;
+ return -1;
}
}
Modified: trunk/fs/src/fs/org/jnode/fs/smbfs/SMBFileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/smbfs/SMBFileSystem.java 2008-06-15 15:47:01 UTC (rev 4248)
+++ trunk/fs/src/fs/org/jnode/fs/smbfs/SMBFileSystem.java 2008-06-15 17:08:33 UTC (rev 4249)
@@ -98,24 +98,16 @@
return false;
}
- public long getFreeSpace() {
- try {
- return root.smbFile.getDiskFreeSpace();
- } catch (SmbException e) {
- return 0;
- }
+ public long getFreeSpace() throws IOException {
+ return root.smbFile.getDiskFreeSpace();
}
- public long getTotalSpace() {
+ public long getTotalSpace() throws IOException {
//todo fix it
- return 1;
+ return -1;
}
- public long getUsableSpace() {
- try {
- return root.smbFile.getDiskFreeSpace();
- } catch (SmbException e) {
- return 0;
- }
+ public long getUsableSpace() throws IOException {
+ return root.smbFile.getDiskFreeSpace();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|