From: <ga...@us...> - 2010-03-26 13:23:40
|
Revision: 5734 http://jnode.svn.sourceforge.net/jnode/?rev=5734&view=rev Author: galatnm Date: 2010-03-26 13:23:34 +0000 (Fri, 26 Mar 2010) Log Message: ----------- Return space on the device. Modified Paths: -------------- trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660Volume.java trunk/fs/src/fs/org/jnode/fs/iso9660/PrimaryVolumeDescriptor.java trunk/fs/src/fs/org/jnode/fs/iso9660/SupplementaryVolumeDescriptor.java Modified: trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java =================================================================== --- trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java 2010-03-26 13:23:12 UTC (rev 5733) +++ trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java 2010-03-26 13:23:34 UTC (rev 5734) @@ -17,7 +17,7 @@ * along with this library; If not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - + package org.jnode.fs.iso9660; import java.io.IOException; @@ -43,7 +43,7 @@ * @see org.jnode.fs.FileSystem#getDevice() */ public ISO9660FileSystem(Device device, boolean readOnly, ISO9660FileSystemType type) - throws FileSystemException { + throws FileSystemException { super(device, readOnly, type); try { @@ -108,17 +108,14 @@ } public long getFreeSpace() { - // TODO implement me - return -1; + return 0; } public long getTotalSpace() { - // TODO implement me - return -1; + return volume.getSize(); } public long getUsableSpace() { - // TODO implement me - return -1; + return volume.getSize(); } } Modified: trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660Volume.java =================================================================== --- trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660Volume.java 2010-03-26 13:23:12 UTC (rev 5733) +++ trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660Volume.java 2010-03-26 13:23:34 UTC (rev 5734) @@ -17,7 +17,7 @@ * along with this library; If not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - + package org.jnode.fs.iso9660; import java.io.IOException; @@ -119,4 +119,16 @@ return primaryVolumeDescriptor.getRootDirectoryEntry(); } } + + public PrimaryVolumeDescriptor getPrimaryVolumeDescriptor() { + return primaryVolumeDescriptor; + } + + public SupplementaryVolumeDescriptor getSupplementaryVolumeDescriptor() { + return supplementaryVolumeDescriptor; + } + + public long getSize() { + return primaryVolumeDescriptor.getSize(); + } } Modified: trunk/fs/src/fs/org/jnode/fs/iso9660/PrimaryVolumeDescriptor.java =================================================================== --- trunk/fs/src/fs/org/jnode/fs/iso9660/PrimaryVolumeDescriptor.java 2010-03-26 13:23:12 UTC (rev 5733) +++ trunk/fs/src/fs/org/jnode/fs/iso9660/PrimaryVolumeDescriptor.java 2010-03-26 13:23:34 UTC (rev 5734) @@ -17,7 +17,7 @@ * along with this library; If not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - + package org.jnode.fs.iso9660; import java.io.IOException; @@ -105,7 +105,7 @@ this.getRootDirectoryEntry().getLengthOfExtendedAttribute()); out.println("\t\t- Location of the extent: " + this.getRootDirectoryEntry().getLocationOfExtent()); - //out.println(" - Length of the file identifier: " + + // out.println(" - Length of the file identifier: " + // this.getRootDirectoryEntry().getLengthOfFileIdentifier()); out.println("\t\t- is directory: " + this.getRootDirectoryEntry().isDirectory()); out.println("\t\t- File identifier: " + this.getRootDirectoryEntry().getFileIdentifier()); @@ -197,4 +197,8 @@ public String getVolumeIdentifier() { return volumeIdentifier; } + + public long getSize() { + return this.getSpaceSize() * this.getLBSize(); + } } Modified: trunk/fs/src/fs/org/jnode/fs/iso9660/SupplementaryVolumeDescriptor.java =================================================================== --- trunk/fs/src/fs/org/jnode/fs/iso9660/SupplementaryVolumeDescriptor.java 2010-03-26 13:23:12 UTC (rev 5733) +++ trunk/fs/src/fs/org/jnode/fs/iso9660/SupplementaryVolumeDescriptor.java 2010-03-26 13:23:34 UTC (rev 5734) @@ -17,7 +17,7 @@ * along with this library; If not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - + package org.jnode.fs.iso9660; import java.io.PrintStream; @@ -45,7 +45,7 @@ * @param buffer */ public SupplementaryVolumeDescriptor(ISO9660Volume volume, byte[] buffer) - throws UnsupportedEncodingException { + throws UnsupportedEncodingException { super(volume, buffer); this.flags = getUInt8(buffer, 8); this.escapeSequences = getDChars(buffer, 89, 121 - 89); @@ -71,8 +71,8 @@ public void dump(PrintStream out) { out.println("Supplementary Volume Descriptor"); out.println("\tFlags " + flags); - //out.println("\tEscape sequences " + escapeSequences); - //out.println("\tEncoding " + encoding); + // out.println("\tEscape sequences " + escapeSequences); + // out.println("\tEncoding " + encoding); out.println("\tSystemIdentifier " + systemIdentifier); out.println("\tVolumeIdentifier " + volumeIdentifier); out.println("\tVolume Space Size " + spaceSize); @@ -115,6 +115,7 @@ /** * Gets a derived encoding name from the given escape sequences. + * * @param escapeSequences * @return the encoding name */ @@ -136,6 +137,7 @@ /** * Is the used encoding known to this system. + * * @return {@code true} if the encoding known, otherwise {@code false}. */ public final boolean isEncodingKnown() { @@ -155,4 +157,5 @@ public final EntryRecord getRootDirectoryEntry() { return this.rootDirectoryEntry; } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |