From f510a57fd1fd123d06d1aff37e198a62c576e1b7 Mon Sep 17 00:00:00 2001 From: MaximZaitsev Date: Thu, 14 Jul 2016 13:18:48 +0300 Subject: [PATCH] command line args moved to separate function --- .../stFlashClient/src/main/java/Main.kt | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/desktop_clients/stFlashClient/src/main/java/Main.kt b/desktop_clients/stFlashClient/src/main/java/Main.kt index 0181d413d4a..cbb2c5ad56b 100644 --- a/desktop_clients/stFlashClient/src/main/java/Main.kt +++ b/desktop_clients/stFlashClient/src/main/java/Main.kt @@ -12,17 +12,8 @@ import java.io.IOException */ fun main(args: Array) { - val jsap: JSAP = JSAP(); - val opthost = FlaggedOption("host").setStringParser(JSAP.STRING_PARSER).setRequired(true).setShortFlag('h').setLongFlag("host") - val optPort = FlaggedOption("port").setStringParser(JSAP.INTEGER_PARSER).setDefault("8888").setRequired(false).setShortFlag('p').setLongFlag("port") - val optBinPath = FlaggedOption("binFile").setStringParser(JSAP.STRING_PARSER).setRequired(true).setShortFlag('f').setLongFlag("binFile") - val optmcuSystem = FlaggedOption("mcuSystem").setStringParser(JSAP.STRING_PARSER).setRequired(false).setDefault("0x08000000").setShortFlag('s') - val optHelp = FlaggedOption("help").setStringParser(JSAP.BOOLEAN_PARSER).setRequired(false).setDefault("false").setLongFlag("help") - jsap.registerParameter(opthost) - jsap.registerParameter(optPort) - jsap.registerParameter(optBinPath) - jsap.registerParameter(optmcuSystem) - jsap.registerParameter(optHelp) + val jsap: JSAP = JSAP() + setOptions(jsap) val config = jsap.parse(args) if (!config.success() || config.getBoolean("help")) { @@ -57,3 +48,16 @@ fun main(args: Array) { client.Client.sendRequest(request, host, port) println(client.ClientHandler.requestResult.code) } + +fun setOptions(jsap:JSAP) { + val opthost = FlaggedOption("host").setStringParser(JSAP.STRING_PARSER).setRequired(true).setShortFlag('h').setLongFlag("host") + val optPort = FlaggedOption("port").setStringParser(JSAP.INTEGER_PARSER).setDefault("8888").setRequired(false).setShortFlag('p').setLongFlag("port") + val optBinPath = FlaggedOption("binFile").setStringParser(JSAP.STRING_PARSER).setRequired(true).setShortFlag('f').setLongFlag("binFile") + val optmcuSystem = FlaggedOption("mcuSystem").setStringParser(JSAP.STRING_PARSER).setRequired(false).setDefault("0x08000000").setShortFlag('s') + val optHelp = FlaggedOption("help").setStringParser(JSAP.BOOLEAN_PARSER).setRequired(false).setDefault("false").setLongFlag("help") + jsap.registerParameter(opthost) + jsap.registerParameter(optPort) + jsap.registerParameter(optBinPath) + jsap.registerParameter(optmcuSystem) + jsap.registerParameter(optHelp) +} \ No newline at end of file