From: <ga...@us...> - 2012-08-10 06:13:24
|
Revision: 5906 http://jnode.svn.sourceforge.net/jnode/?rev=5906&view=rev Author: galatnm Date: 2012-08-10 06:13:18 +0000 (Fri, 10 Aug 2012) Log Message: ----------- Code review changes update code style Modified Paths: -------------- trunk/fs/src/fs/org/jnode/partitions/apm/ApmPartitionTable.java trunk/fs/src/fs/org/jnode/partitions/apm/ApmPartitionTableEntry.java trunk/fs/src/fs/org/jnode/partitions/apm/ApmPartitionTableType.java trunk/fs/src/fs/org/jnode/partitions/gpt/GptPartitionTable.java trunk/fs/src/fs/org/jnode/partitions/gpt/GptPartitionTableEntry.java trunk/fs/src/fs/org/jnode/partitions/gpt/GptPartitionTableType.java Modified: trunk/fs/src/fs/org/jnode/partitions/apm/ApmPartitionTable.java =================================================================== --- trunk/fs/src/fs/org/jnode/partitions/apm/ApmPartitionTable.java 2012-08-10 06:11:00 UTC (rev 5905) +++ trunk/fs/src/fs/org/jnode/partitions/apm/ApmPartitionTable.java 2012-08-10 06:13:18 UTC (rev 5906) @@ -65,8 +65,7 @@ ApmPartitionTableEntry entry = new ApmPartitionTableEntry(this, first16KiB, offset); - if (entry.isValid()) - { + if (entry.isValid()) { partitions.add(entry); } } @@ -88,6 +87,7 @@ return true; } + @Override public Iterator<ApmPartitionTableEntry> iterator() { return Collections.unmodifiableList(partitions).iterator(); } @@ -95,6 +95,7 @@ /** * @see org.jnode.partitions.PartitionTable#getType() */ + @Override public PartitionTableType getType() { return tableType; } Modified: trunk/fs/src/fs/org/jnode/partitions/apm/ApmPartitionTableEntry.java =================================================================== --- trunk/fs/src/fs/org/jnode/partitions/apm/ApmPartitionTableEntry.java 2012-08-10 06:11:00 UTC (rev 5905) +++ trunk/fs/src/fs/org/jnode/partitions/apm/ApmPartitionTableEntry.java 2012-08-10 06:13:18 UTC (rev 5906) @@ -51,6 +51,7 @@ this.offset = offset; } + @Override public boolean isValid() { return first16KiB.length > offset + 128; } @@ -58,6 +59,7 @@ /** * @see org.jnode.partitions.PartitionTableEntry#getChildPartitionTable() */ + @Override public IBMPartitionTable getChildPartitionTable() { throw new UnsupportedOperationException("No child partitions."); } @@ -65,6 +67,7 @@ /** * @see org.jnode.partitions.PartitionTableEntry#hasChildPartitionTable() */ + @Override public boolean hasChildPartitionTable() { return false; } @@ -98,9 +101,7 @@ return b.toString(); } - /** - * @see Object#toString() - */ + @Override public String toString() { StringBuilder builder = new StringBuilder(32); builder.append('[').append(getName()).append(' '); Modified: trunk/fs/src/fs/org/jnode/partitions/apm/ApmPartitionTableType.java =================================================================== --- trunk/fs/src/fs/org/jnode/partitions/apm/ApmPartitionTableType.java 2012-08-10 06:11:00 UTC (rev 5905) +++ trunk/fs/src/fs/org/jnode/partitions/apm/ApmPartitionTableType.java 2012-08-10 06:13:18 UTC (rev 5906) @@ -33,15 +33,18 @@ */ public class ApmPartitionTableType implements PartitionTableType { + @Override public PartitionTable<?> create(byte[] firstSector, Device device) throws PartitionTableException { return new ApmPartitionTable(this, firstSector, device); } + @Override public String getName() { return "APM"; } + @Override public boolean supports(byte[] first16KiB, BlockDeviceAPI devApi) { return ApmPartitionTable.containsPartitionTable(first16KiB); } -} +} \ No newline at end of file Modified: trunk/fs/src/fs/org/jnode/partitions/gpt/GptPartitionTable.java =================================================================== --- trunk/fs/src/fs/org/jnode/partitions/gpt/GptPartitionTable.java 2012-08-10 06:11:00 UTC (rev 5905) +++ trunk/fs/src/fs/org/jnode/partitions/gpt/GptPartitionTable.java 2012-08-10 06:13:18 UTC (rev 5906) @@ -70,8 +70,7 @@ GptPartitionTableEntry entry = new GptPartitionTableEntry(this, first16KiB, offset, blockSize); - if (entry.isValid()) - { + if (entry.isValid()) { partitions.add(entry); } } @@ -115,6 +114,7 @@ return detectBlockSize(first16KiB) != -1; } + @Override public Iterator<GptPartitionTableEntry> iterator() { return Collections.unmodifiableList(partitions).iterator(); } @@ -122,6 +122,7 @@ /** * @see org.jnode.partitions.PartitionTable#getType() */ + @Override public PartitionTableType getType() { return tableType; } Modified: trunk/fs/src/fs/org/jnode/partitions/gpt/GptPartitionTableEntry.java =================================================================== --- trunk/fs/src/fs/org/jnode/partitions/gpt/GptPartitionTableEntry.java 2012-08-10 06:11:00 UTC (rev 5905) +++ trunk/fs/src/fs/org/jnode/partitions/gpt/GptPartitionTableEntry.java 2012-08-10 06:13:18 UTC (rev 5906) @@ -56,6 +56,7 @@ this.offset = offset; } + @Override public boolean isValid() { return first16KiB.length > offset + 128 && !isEmpty(); } @@ -63,6 +64,7 @@ /** * @see org.jnode.partitions.PartitionTableEntry#getChildPartitionTable() */ + @Override public PartitionTable<?> getChildPartitionTable() { throw new UnsupportedOperationException("No child partitions."); } @@ -70,6 +72,7 @@ /** * @see org.jnode.partitions.PartitionTableEntry#hasChildPartitionTable() */ + @Override public boolean hasChildPartitionTable() { return false; } @@ -117,9 +120,7 @@ return b.toString(); } - /** - * @see java.lang.Object#toString() - */ + @Override public String toString() { StringBuilder builder = new StringBuilder(32); builder.append('[').append(getName()).append(' '); Modified: trunk/fs/src/fs/org/jnode/partitions/gpt/GptPartitionTableType.java =================================================================== --- trunk/fs/src/fs/org/jnode/partitions/gpt/GptPartitionTableType.java 2012-08-10 06:11:00 UTC (rev 5905) +++ trunk/fs/src/fs/org/jnode/partitions/gpt/GptPartitionTableType.java 2012-08-10 06:13:18 UTC (rev 5906) @@ -33,15 +33,18 @@ */ public class GptPartitionTableType implements PartitionTableType { + @Override public PartitionTable<?> create(byte[] firstSector, Device device) throws PartitionTableException { return new GptPartitionTable(this, firstSector, device); } + @Override public String getName() { return "EFI PART"; } + @Override public boolean supports(byte[] first16KiB, BlockDeviceAPI devApi) { return GptPartitionTable.containsPartitionTable(first16KiB); } -} +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |