[Jnode-svn-commits] SF.net SVN: jnode: [3949] trunk/shell

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

Revision: 3949
          http://jnode.svn.sourceforge.net/jnode/?rev=3949&view=rev
Author:   crawley
Date:     2008-04-11 04:38:22 -0700 (Fri, 11 Apr 2008)

Log Message:
-----------
Fixed inconsistencies in the syntax of the syntax command.

Modified Paths:
--------------
    trunk/shell/descriptors/org.jnode.shell.command.xml
    trunk/shell/src/shell/org/jnode/shell/command/SyntaxCommand.java

Modified: trunk/shell/descriptors/org.jnode.shell.command.xml
===================================================================
--- trunk/shell/descriptors/org.jnode.shell.command.xml	2008-04-10 14:37:15 UTC (rev 3948)
+++ trunk/shell/descriptors/org.jnode.shell.command.xml	2008-04-11 11:38:22 UTC (rev 3949)
@@ -96,8 +96,8 @@
       <argument description="remove a system property" argLabel="key"/>
     </syntax>
     <syntax alias="syntax">
-      <option argLabel="list" longName="list" shortName="l" description="list aliases with syntaxes"/>
-      <option argLabel="dumpAll" longName="dump" shortName="d" description="dump all syntaxes"/>
+      <empty description="list aliases with syntaxes"/>
+      <option argLabel="dumpAll" longName="dump-all" description="dump all syntaxes"/>
       <sequence description="dump the syntax for a given alias">
         <option argLabel="dump" longName="dump" shortName="d"/>
         <argument argLabel="alias"/>

Modified: trunk/shell/src/shell/org/jnode/shell/command/SyntaxCommand.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/command/SyntaxCommand.java	2008-04-10 14:37:15 UTC (rev 3948)
+++ trunk/shell/src/shell/org/jnode/shell/command/SyntaxCommand.java	2008-04-11 11:38:22 UTC (rev 3949)
@@ -57,8 +57,6 @@
         new AliasArgument("alias", Argument.OPTIONAL, "the target alias");
     private FileArgument ARG_FILE = 
         new FileArgument("file", Argument.OPTIONAL, "if set, load the syntax from this file");
-    private FlagArgument ARG_LIST =
-        new FlagArgument("list", Argument.OPTIONAL, "if set, list the syntaxes");
     private FlagArgument ARG_REMOVE =
         new FlagArgument("remove", Argument.OPTIONAL, "if set, remove the syntaxes for the target alias");
     private FlagArgument ARG_DUMP =
@@ -67,8 +65,8 @@
         new FlagArgument("dumpAll", Argument.OPTIONAL, "if set, show the syntaxes for all aliases");
     
     public SyntaxCommand() {
-        super("load or clear a syntax for an alias");
-        registerArguments(ARG_ALIAS, ARG_FILE, ARG_LIST, ARG_REMOVE, ARG_DUMP, ARG_DUMP_ALL);
+        super("manages syntaxes for commands using the 'new' syntax mechanisms");
+        registerArguments(ARG_ALIAS, ARG_FILE, ARG_REMOVE, ARG_DUMP, ARG_DUMP_ALL);
     }
 
     public static void main(String[] args) throws Exception {
@@ -79,12 +77,7 @@
     throws Exception {
         SyntaxManager synMgr = ShellUtils.getCurrentSyntaxManager();
 
-        if (ARG_LIST.isSet()) {
-            for (String key : synMgr.getKeys()) {
-                out.println(key);
-            }
-        }
-        else if (ARG_DUMP_ALL.isSet()) {
+        if (ARG_DUMP_ALL.isSet()) {
             for (String alias : synMgr.getKeys()) {
                 Syntax syntax = synMgr.getSyntax(alias);
                 dumpSyntax(alias, syntax, out);
@@ -127,6 +120,11 @@
             else if (ARG_REMOVE.isSet()) {
                 synMgr.remove(alias);
             }
+            else {
+                for (String key : synMgr.getKeys()) {
+                    out.println(key);
+                }
+            }
         }
     }
 


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