From 4d35afa2c2c11a5c25bd3d35f6b6420dffac4d86 Mon Sep 17 00:00:00 2001 From: ata4 Date: Mon, 18 Jan 2016 14:17:40 +0100 Subject: [PATCH] Printing program name and version with usage --- .../java/info/ata4/disunity/cli/command/Command.java | 10 ++++++++-- .../info/ata4/disunity/cli/command/DisUnityRoot.java | 4 ++-- .../src/main/java/info/ata4/disunity/DisUnity.java | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/disunity-cli/src/main/java/info/ata4/disunity/cli/command/Command.java b/disunity-cli/src/main/java/info/ata4/disunity/cli/command/Command.java index b60709e9..49e714f5 100644 --- a/disunity-cli/src/main/java/info/ata4/disunity/cli/command/Command.java +++ b/disunity-cli/src/main/java/info/ata4/disunity/cli/command/Command.java @@ -10,6 +10,7 @@ package info.ata4.disunity.cli.command; import com.beust.jcommander.JCommander; +import info.ata4.disunity.DisUnity; import info.ata4.junity.progress.Progress; import java.io.PrintWriter; import java.util.Objects; @@ -38,7 +39,7 @@ public void init(JCommander commander, PrintWriter out) { public JCommander commander() { return commander; } - + @Override public void run() { String commandName = commander.getParsedCommand(); @@ -49,7 +50,7 @@ public void run() { commandObj.run(); } else { // no command selected, show usage - commander.usage(); + usage(); } } } @@ -61,6 +62,11 @@ protected JCommander addSubCommand(String commandName, Command commandObj) { return subCommander; } + protected void usage() { + output().println(DisUnity.getSignature()); + commander().usage(); + } + protected PrintWriter output() { return out; } diff --git a/disunity-cli/src/main/java/info/ata4/disunity/cli/command/DisUnityRoot.java b/disunity-cli/src/main/java/info/ata4/disunity/cli/command/DisUnityRoot.java index df0d147b..16fd9c5b 100644 --- a/disunity-cli/src/main/java/info/ata4/disunity/cli/command/DisUnityRoot.java +++ b/disunity-cli/src/main/java/info/ata4/disunity/cli/command/DisUnityRoot.java @@ -9,11 +9,11 @@ */ package info.ata4.disunity.cli.command; -import info.ata4.disunity.cli.command.bundle.BundleRoot; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import info.ata4.disunity.cli.command.asset.AssetRoot; +import info.ata4.disunity.cli.command.bundle.BundleRoot; import info.ata4.log.LogUtils; import java.io.PrintWriter; import java.util.logging.Level; @@ -55,7 +55,7 @@ public void run() { // display usage if (help) { - commander().usage(); + usage(); return; } diff --git a/disunity-core/src/main/java/info/ata4/disunity/DisUnity.java b/disunity-core/src/main/java/info/ata4/disunity/DisUnity.java index 931d05a8..eac49eda 100644 --- a/disunity-core/src/main/java/info/ata4/disunity/DisUnity.java +++ b/disunity-core/src/main/java/info/ata4/disunity/DisUnity.java @@ -25,7 +25,7 @@ public static String getProgramName() { } public static String getVersion() { - return "0.5"; + return "0.5.0"; } public static String getSignature() {