tool help

Michael P Schroeder · Michael P Schroeder · commit 306586cc1218 · 2014-07-10T17:41:20.000+02:00
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/batch/CommandExecutor.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/batch/CommandExecutor.java
@@ -39,6 +39,9 @@ public boolean checkArguments(String[] args, PrintWriter out) {
 
         List<String> argsList = new ArrayList<>();
         for (String s : args) {
+            if (s.equals("")) {
+                continue;
+            }
             argsList.add(s);
         }
 
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/batch/tools/CloseAndSaveHeatmapTool.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/batch/tools/CloseAndSaveHeatmapTool.java
@@ -36,7 +36,7 @@ public class CloseAndSaveHeatmapTool extends HeatmapTool {
     protected boolean save;
 
     @Option(name = "-a", aliases = "--as", metaVar = "<FILE_NAME>", required = false,
-            usage = "path and filename indicating where to save")
+            usage = "path and filename indicating where to save the heatmap")
     protected String saveAsFilename;
 
     @Option(name = "-o", aliases = "--optimize", required = false,
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/batch/tools/HelpTool.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/batch/tools/HelpTool.java
@@ -26,6 +26,7 @@
 import org.gitools.ui.core.commands.tools.ITool;
 
 import java.io.PrintWriter;
+import java.util.Arrays;
 import java.util.Set;
 
 public class HelpTool implements ITool {
@@ -78,7 +79,9 @@ public boolean check(String[] args, PrintWriter out) {
 
     private static void printAvailableTools(PrintWriter out) {
         out.println("Available commands:");
-        for (String tool : availableTools) {
+        String[] orderedtools = availableTools.toArray(new String[availableTools.size()]);
+        Arrays.sort(orderedtools);
+        for (String tool : orderedtools) {
             out.println("  " + tool);
         }
         out.println("Obtain more info running './gitools <command> --help' or at online documentation\n");
diff --git a/org.gitools.ui.core/src/main/java/org/gitools/ui/core/commands/tools/HeatmapTool.java b/org.gitools.ui.core/src/main/java/org/gitools/ui/core/commands/tools/HeatmapTool.java
@@ -26,7 +26,7 @@
 public abstract class HeatmapTool extends AbstractTool {
 
     @Option(name = "-h", aliases = "--heatmap", metaVar = "<heatmap>", required = false,
-            usage = "'LAST' or heatmap name")
+            usage = "(optional) 'LAST' or heatmap name")
     protected String heatmap;
 
     public HeatmapTool() {

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ public boolean checkArguments(String[] args, PrintWriter out) {`
`39`	`39`
`40`	`40`	`List<String> argsList = new ArrayList<>();`
`41`	`41`	`for (String s : args) {`
	`42`	`+ if (s.equals("")) {`
	`43`	`+ continue;`
	`44`	`+ }`
`42`	`45`	`argsList.add(s);`
`43`	`46`	`}`
`44`	`47`