[Jnode-svn-commits] SF.net SVN: jnode: [4004] trunk/fs

[<cr...@us...>]

Revision: 4004
          http://jnode.svn.sourceforge.net/jnode/?rev=4004&view=rev
Author:   crawley
Date:     2008-04-23 04:42:09 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
Correct spelling and clarified some help descriptions.

Modified Paths:
--------------
    trunk/fs/descriptors/org.jnode.fs.command.xml
    trunk/fs/src/fs/org/jnode/fs/command/DeleteCommand.java

Modified: trunk/fs/descriptors/org.jnode.fs.command.xml
===================================================================
--- trunk/fs/descriptors/org.jnode.fs.command.xml	2008-04-22 15:39:41 UTC (rev 4003)
+++ trunk/fs/descriptors/org.jnode.fs.command.xml	2008-04-23 11:42:09 UTC (rev 4004)
@@ -37,9 +37,9 @@
 
   <extension point="org.jnode.shell.syntaxes">
     <syntax alias="del">
-      <sequence description="delete file or directory">
+      <sequence description="delete a file or directory">
         <optionSet>
-          <option argLabel="recurcive" shortName="r" description="delete recurcive" />
+          <option argLabel="recursive" shortName="r" description="recursively delete a directory's contents" />
         </optionSet>
         <argument argLabel="file/dir"/>
       </sequence>

Modified: trunk/fs/src/fs/org/jnode/fs/command/DeleteCommand.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/command/DeleteCommand.java	2008-04-22 15:39:41 UTC (rev 4003)
+++ trunk/fs/src/fs/org/jnode/fs/command/DeleteCommand.java	2008-04-23 11:42:09 UTC (rev 4004)
@@ -51,8 +51,10 @@
   public DeleteCommand() {
     super("delete files or directories");
 
-    ARG_DIR = new FileArgument("file/dir",Argument.MANDATORY, "delete the file or directory");
-    ARG_OPTION = new FlagArgument("recurcive", Argument.OPTIONAL, "recurcive deleting");
+    ARG_DIR = new FileArgument("file/dir", Argument.MANDATORY, 
+            "the file or directory to be deleted");
+    ARG_OPTION = new FlagArgument("recursive", Argument.OPTIONAL,
+            "if set, any directories are deleted recursively");
 
     registerArguments(ARG_DIR, ARG_OPTION);
   }
@@ -64,13 +66,13 @@
     public void execute(CommandLine commandLine, InputStream in,
                         PrintStream out, PrintStream err) throws Exception {
 
-      boolean recurcive = ARG_OPTION.isSet();
+      boolean recursive = ARG_OPTION.isSet();
 
       File[] file_arr = ARG_DIR.getValues();
 
       boolean ok = true;
       for (File file : file_arr) {
-          boolean tmp = deleteFile(file, err, recurcive);
+          boolean tmp = deleteFile(file, err, recursive);
           ok &= tmp;
       }
 
@@ -79,7 +81,7 @@
       }
     }
 
-    private boolean deleteFile(File file, PrintStream err, boolean recurcive) throws NameNotFoundException {
+    private boolean deleteFile(File file, PrintStream err, boolean recursive) throws NameNotFoundException {
         boolean deleteOk = true;
         try {
             if (!file.exists()) {
@@ -97,13 +99,13 @@
                   final String name = f.getName();
 
                   if (!name.equals(".") && !name.equals("..")) {
-                    if (!recurcive) {
+                    if (!recursive) {
                       err.println("Directory is not empty " + file);
                       deleteOk = false;
                       break;
                     }
                     else {
-                      deleteFile(f, err, recurcive);
+                      deleteFile(f, err, recursive);
                     }
                   }
                 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.