From: <chr...@us...> - 2009-05-02 02:04:11
|
Revision: 5382 http://jnode.svn.sourceforge.net/jnode/?rev=5382&view=rev Author: chrisboertien Date: 2009-05-02 01:44:40 +0000 (Sat, 02 May 2009) Log Message: ----------- Checkstyle fixes Signed-off-by: chrisboertien <chr...@gm...> Modified Paths: -------------- trunk/cli/src/commands/org/jnode/command/archive/ArchiveCommand.java trunk/cli/src/commands/org/jnode/command/common/BasenameCommand.java trunk/cli/src/commands/org/jnode/command/file/CatCommand.java trunk/cli/src/commands/org/jnode/command/file/DuCommand.java trunk/cli/src/commands/org/jnode/command/file/Md5SumCommand.java trunk/cli/src/commands/org/jnode/command/file/WcCommand.java trunk/cli/src/commands/org/jnode/command/net/IfconfigCommand.java trunk/cli/src/commands/org/jnode/command/util/IOUtils.java Modified: trunk/cli/src/commands/org/jnode/command/archive/ArchiveCommand.java =================================================================== --- trunk/cli/src/commands/org/jnode/command/archive/ArchiveCommand.java 2009-05-01 21:45:43 UTC (rev 5381) +++ trunk/cli/src/commands/org/jnode/command/archive/ArchiveCommand.java 2009-05-02 01:44:40 UTC (rev 5382) @@ -29,7 +29,6 @@ import java.io.PrintWriter; import java.io.Reader; import java.io.IOException; -import java.util.ArrayList; import org.apache.tools.zip.ZipFile; import org.jnode.shell.AbstractCommand; import org.jnode.shell.syntax.Argument; Modified: trunk/cli/src/commands/org/jnode/command/common/BasenameCommand.java =================================================================== --- trunk/cli/src/commands/org/jnode/command/common/BasenameCommand.java 2009-05-01 21:45:43 UTC (rev 5381) +++ trunk/cli/src/commands/org/jnode/command/common/BasenameCommand.java 2009-05-02 01:44:40 UTC (rev 5382) @@ -32,9 +32,9 @@ */ public class BasenameCommand extends AbstractCommand { - private static final String help_name = "Strip this fileargName of its directory and optionally argSuffix components."; - private static final String help_suffix = "Strip this argSuffix from the fileargName"; - private static final String help_super = "Strip directory and argSuffix from filesargNames"; + private static final String help_name = "Strip this file name of its directory and optionally suffix components."; + private static final String help_suffix = "Strip this suffix from the file name"; + private static final String help_super = "Strip directory and suffix from files names"; private final StringArgument argName; private final StringArgument argSuffix; Modified: trunk/cli/src/commands/org/jnode/command/file/CatCommand.java =================================================================== --- trunk/cli/src/commands/org/jnode/command/file/CatCommand.java 2009-05-01 21:45:43 UTC (rev 5381) +++ trunk/cli/src/commands/org/jnode/command/file/CatCommand.java 2009-05-02 01:44:40 UTC (rev 5382) @@ -22,8 +22,6 @@ import java.io.BufferedReader; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; Modified: trunk/cli/src/commands/org/jnode/command/file/DuCommand.java =================================================================== --- trunk/cli/src/commands/org/jnode/command/file/DuCommand.java 2009-05-01 21:45:43 UTC (rev 5381) +++ trunk/cli/src/commands/org/jnode/command/file/DuCommand.java 2009-05-02 01:44:40 UTC (rev 5382) @@ -101,7 +101,7 @@ protected void lastAction(boolean wasCancelled) { Map<File, Long> summarisedMap = summariseIt(map); for (Entry<File, Long> e : summarisedMap.entrySet()) { - if(humanReadable) + if (humanReadable) out.println(NumberUtils.toBinaryByte(e.getValue()) + "\t" + e.getKey()); else out.println(e.getValue() + "\t" + e.getKey()); @@ -120,7 +120,7 @@ Map<File, Long> summarisedMap = summariseIt(map); for (Entry<File, Long> e : summarisedMap.entrySet()) { if (e.getKey().isDirectory()) { - if(humanReadable) + if (humanReadable) out.println(NumberUtils.toBinaryByte(e.getValue()) + "\t" + e.getKey()); else out.println(e.getValue() + "\t" + e.getKey()); @@ -139,7 +139,7 @@ protected void lastAction(boolean wasCancelled) { TreeMap<File, Long> summarisedMap = summariseIt(map); Entry<File, Long> e = summarisedMap.firstEntry(); - if(humanReadable) + if (humanReadable) out.println(NumberUtils.toBinaryByte(e.getValue()) + "\t" + e.getKey()); else out.println(e.getValue() + "\t" + e.getKey()); @@ -167,7 +167,7 @@ allArg = new FlagArgument("all", Argument.OPTIONAL, HELP_ALL); dirArg = new FileArgument("directory", Argument.OPTIONAL | Argument.MULTIPLE, HELP_DIR); humanReadableArg = new FlagArgument("human-readable", Argument.OPTIONAL, HELP_HUMAN_READABLE); - registerArguments(totalArg, allArg, humanReadableArg, dirArg ); + registerArguments(totalArg, allArg, humanReadableArg, dirArg); } public static void main(String[] args) throws IOException { Modified: trunk/cli/src/commands/org/jnode/command/file/Md5SumCommand.java =================================================================== --- trunk/cli/src/commands/org/jnode/command/file/Md5SumCommand.java 2009-05-01 21:45:43 UTC (rev 5381) +++ trunk/cli/src/commands/org/jnode/command/file/Md5SumCommand.java 2009-05-02 01:44:40 UTC (rev 5382) @@ -78,9 +78,9 @@ public Md5SumCommand() { super(help_super); - argPaths = new FileArgument("paths", Argument.OPTIONAL | Argument.MULTIPLE | Argument.EXISTING, help_paths); + argPaths = new FileArgument("paths", Argument.MULTIPLE | Argument.EXISTING, help_paths); flagRecursive = new FlagArgument("recursive", Argument.OPTIONAL, help_recurse); - argCheckfile = new FileArgument("checkfile", Argument.OPTIONAL | Argument.SINGLE | Argument.EXISTING, help_check); + argCheckfile = new FileArgument("checkfile", Argument.SINGLE | Argument.EXISTING, help_check); registerArguments(argPaths, flagRecursive, argCheckfile); } Modified: trunk/cli/src/commands/org/jnode/command/file/WcCommand.java =================================================================== --- trunk/cli/src/commands/org/jnode/command/file/WcCommand.java 2009-05-01 21:45:43 UTC (rev 5381) +++ trunk/cli/src/commands/org/jnode/command/file/WcCommand.java 2009-05-02 01:44:40 UTC (rev 5382) @@ -31,7 +31,6 @@ import org.jnode.shell.AbstractCommand; import org.jnode.shell.syntax.Argument; -import org.jnode.shell.syntax.CommandSyntaxException; import org.jnode.shell.syntax.FileArgument; import org.jnode.shell.syntax.FlagArgument; Modified: trunk/cli/src/commands/org/jnode/command/net/IfconfigCommand.java =================================================================== --- trunk/cli/src/commands/org/jnode/command/net/IfconfigCommand.java 2009-05-01 21:45:43 UTC (rev 5381) +++ trunk/cli/src/commands/org/jnode/command/net/IfconfigCommand.java 2009-05-02 01:44:40 UTC (rev 5382) @@ -52,8 +52,8 @@ private static final String help_subnet = "the IPv4 subnet mask for the device"; private static final String help_super = "List or manage network interface bindings"; private static final String fmt_devices = "%s: MAC-Address %s MTU %s%n %s%n"; - private static final String fmt_ip = "IP address(es) for %s %s"; - private static final String fmt_set_ip = "IP Address for %s set to %s"; + private static final String fmt_ip = "IP address(es) for %s %s%n"; + private static final String fmt_set_ip = "IP Address for %s set to %s%n"; private final DeviceArgument argDevice; private final IPv4AddressArgument argIPAddress; Modified: trunk/cli/src/commands/org/jnode/command/util/IOUtils.java =================================================================== --- trunk/cli/src/commands/org/jnode/command/util/IOUtils.java 2009-05-01 21:45:43 UTC (rev 5381) +++ trunk/cli/src/commands/org/jnode/command/util/IOUtils.java 2009-05-02 01:44:40 UTC (rev 5382) @@ -471,7 +471,7 @@ * Check for null objects in a list of objects. */ private static void checkNull(Object... objs) { - for(Object obj : objs) { + for (Object obj : objs) { if (obj == null) throw new NullPointerException(ex_null_param); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |