Changeset 836

Timestamp:

09/04/10 13:04:29 (17 months ago)

Author:

stefan

Message:

quick hack to fix bug #55: \newcommand template throws an exception after skipping the optional parameters

Location:

trunk/src/sce/codehelper

Files:

• CHCommandArgument.java (modified) (3 diffs)
• StaticCommandsCodeHelper.java (modified) (1 diff)

trunk/src/sce/codehelper/CHCommandArgument.java

@@ -13 +13 @@
   private String name = null;
   private boolean optional = false;
+  private boolean secondOptional = false;
   // the hint
   private String hint = null;
@@ -33 +34 @@
   }
 
-  /**
+  /**
+   * Creates a command argument.
+   *
+   * @param name the name
+   * @param optional whether the argument is optional
+   * @param secondOptional whether the argument is second optional
+   */
+  public CHCommandArgument(String name, boolean optional, boolean secondOptional) {
+    this.name = name;
+    this.optional = optional;
+    this.secondOptional = secondOptional;
+  }
+
+  /**
    * Returns the name of the argument.
    *
@@ -51 +65 @@
   }
 
-  /**
+  /**
+   * Returns true if the argument is second optional.
+   *
+   * @return true if second optional
+   */
+  public boolean isSecondOptional() {
+    return secondOptional;
+  }
+
+  /**
    * Returns the hint for this argument.
    *

trunk/src/sce/codehelper/StaticCommandsCodeHelper.java

@@ -134 +134 @@
       if (commandUsage.substring(argumentEnd).trim().startsWith("]")) optional = true;
 
+      boolean secondOptional = false;
+      if (optional) {
+        if (commandUsage.substring(0, argumentStart-1).trim().endsWith("]")) {
+          secondOptional = true;
+          command.setUsage(commandUsage.replaceAll("\\[@" + argumentName + "@\\]", ""));
+          continue;
+        }
+      }
+
       // create the argument
-      CHCommandArgument argument = new CHCommandArgument(argumentName, optional);
+      CHCommandArgument argument = new CHCommandArgument(argumentName, optional, secondOptional);
       argument.setHint(argumentXML.getAttribute("hint"));