[rfc][icedtea-web][itweb-settings] itweb-settings use Option Parser
Jiri Vanek
jvanek at redhat.com
Thu Sep 25 15:09:24 UTC 2014
On 09/22/2014 10:54 PM, Lukasz Dracz wrote:
> Hello,
>
> I have changed the parser to take into account the order of options it receives.
> For itweb-settings it goes through the options in order, so the order in which the commands are
issued matter.
> Ex. 'itweb-settings get deployment.log.file set deployment.log.file true get deployment.log.file reset deployment.log.file
> get deployment.log.file' will go through in order with the first get then set it to true, show you it is true with get
> then reset it and use get after the reset. Also now help can be combined with options so 'itweb-settings get help set deployment.log.file true'
> will show the help for get and do the specified set option. This does mean to get the big main help message the help command has to be present right
> after itweb-settings or you could do itweb-settings headless help.
Ufff... Much more mayor hints.
Again. On one side I really like the possibility. On the other side, I'm not sure if it is worthy of
introduced complexity. And from dark side, I'm definitely not with way how it is done (see inline).
And from darkest side, I must disagree with your usecase.
If you decide to go on with this "suport everything" approach, I will need to ask you also for few
reproducers, to be sure that:
itweb-settings set whatever set whatever2 get whatever reset whatever2 get whatever2
resetall set whatever get whatever
really do the same as
that itweb-settings set whatever ; itweb-settings set whatever2 ; itweb-settings get whatever
itweb-settings reset whatever2 ; itweb-settings get whatever2 ; itweb-settings resetall
itweb-settings set whatever ; itweb-settings get whatever
For your usecase. I would nnever ever lunch
iwebsettings set whatever tosomething get whatever reset whatever set whatever tosomethingeelse get
whatever.
I will always lunch it as separate commands and watch return values/outputs of commands - and so
stop if something goes wrong.
So Although on one side it is really cool to have such an powerful parser, I'm not sure if it
worthy. It is bringing a lot of responsibility and maybe it have no target audience.
(Added after finished the review) - seeing the complexity - I would really rather discourage you
from this all-mightyapproach.
>
>> >Mayor hints
>> > - when resetAll is presented - then no metter of other arguments, the
...
> Yes I added support for set name=value because that is how they are stored in deployment.properties so I thought a user seeing the file might want to set them in the same manner. It also works in the old way where you place a space between name and value. I thought it would make it easier to use, I don't foresee the issue of "name" having a "=" in it as a legitimate property. Yes something like na=me=value if 'na=me' was a legitimate property would read the propery as na with value me and value would be the next property seen. If you think name might have equals / there is another issue I will change it back, I just thought this would make it easier for the user.
I probably agree with support of this.
>
>> >
>> >Here is valid same issue as in your first opton parser. What is value
>> >consists of symbol?
>> >param=va=lu=e will be broken :(
> I could make it just break on the first equals it finds. Would that be more desirable behaviour ? So in this case set param=va=lu=e would be the same as set param va=lu=e.
yes please.
>
>> >
>> >But this will be valid only if we agree on bothold and new style. If we agree
>> >only on old one those
>> >will go out:(
>> >
>> >Anyway - nitpickers nit - tey both should be static and tested :)
>>> > >+
>>> > >+ public List<String> getValuesSplitOnEquals(OptionsDefinitions.OPTIONS
>>> > >option) {
>>> > >+ return getValuesSplitOn(option, "=");
>>> > >+ }
>>> > >+
>>> > >+ public int getNumberOfOptions() {
>>> > >+ if (mainArgExists()) {
>>> > >+ return parsedOptions.size() - 1;
>>> > >+ }
>>> > >+ return parsedOptions.size();
>>> > >+ }
>>> > >+
>>> > > }
>>> > >
> Made these two static and added unit tests for them as well as the other new methods added.
ty :)
>
>> >int to two "unrelated" bugs - both shoud be fixe din this changeset - as tis
>> >is mayor rework of the
>> >inpur handling.
>> >
>> >
>> >Thak you!
>> >
>> >(well compared to this, th epolicyeditor will be children's palyground for
>> >you :) )
> I guess so :)
>
> Thank you,
> Lukasz Dracz
>
>
> itweb-settingsOptionParser-5.patch
>
>
> diff -r e1c7156ed0a1 launcher/launchers.in
> --- a/launcher/launchers.in Thu Sep 18 13:18:11 2014 -0400
> +++ b/launcher/launchers.in Mon Sep 22 16:47:47 2014 -0400
> @@ -53,7 +53,7 @@
> *)
> ARGS[$j]="$1"
> j=$((j+1))
> - if [ "$1" = "-headless" ] ; then
> + if [ "$1" = "-headless" ] || [ "$1" = "headless" ] ; then
ouch. Where have you find this? This should not have reason to live...
Well probably depends on taste, but test function have its own or. You shold uuse that.
Anyway - your parser is supporting headless -headless --headless ... ------------*--------headless ...
So even splash should.
Please turn to regex/match (test *have* thisalready)
> SPLASH="false"
> fi
> ;;
> diff -r e1c7156ed0a1 netx/net/sourceforge/jnlp/OptionsDefinitions.java
> --- a/netx/net/sourceforge/jnlp/OptionsDefinitions.java Thu Sep 18 13:18:11 2014 -0400
> +++ b/netx/net/sourceforge/jnlp/OptionsDefinitions.java Mon Sep 22 16:47:47 2014 -0400
> @@ -75,11 +75,11 @@
> //itweb settings
> NODASHHELP("help", "IBOHelp"),
I think this also needs fix now - when your parser is no longer forcing - to swithces, then we don
otneed HELP and NODASHHELP.
But not sure how to keep in align with consistency
javaws man looks like
-option1
-option2
-help
-optionN
itweb-settings man loks like
option1
option2
help
OptionN
So it would not be nice to have
-option1
-option2
help
-optionN
or
option1
option2
-help
OptionN
As PolicyEditor is using also -dash versions, maybe we can unify on them?
And whats best, with your new parser we are automatically backward compatible.
> LIST("list", "IBOList"),
> - GET("get", "name", "IBOGet"),
> - INFO("info", "name", "IBOInfo"),
> - SET("set", "name value", "IBOSet"),
> + GET("get", "name", "IBOGet", NumberOfArguments.ONE_OR_MORE),
> + INFO("info", "name", "IBOInfo", NumberOfArguments.ONE_OR_MORE),
> + SET("set", "name value", "IBOSet", NumberOfArguments.ONE_OR_MORE),
> RESETALL("reset", "all", "IBOResetAll"),
> - RESET("reset", "name", "IBOReset"),
> + RESET("reset", "name", "IBOReset", NumberOfArguments.ONE_OR_MORE),
> CHECK("check", "name", "IBOCheck"),
I think we have an bug here.
if you really decide to go with multiple set | get | reset | whatever you will need to add an field
to the constructor.
And if you will not decide to do so, resetall will force you
The new field should be "expected quantity"
so - in my world - eg
restall - shouldbe EXACTLY_ONE_AND_ALONE
get and set EXACTLY_ONE (and maybe alone?)
list, info - shouldbe EXACTLY_ONE_AND_ALONE
For javaws, most of the switches would be EXACTLY_ONE or ONE_OR_NONE (which I would set as default)
- well except help :) Wchich shouldbe exactly one and alone :)
In your world, for itwebsettings
restall, get, and set or list, info - shouldbe ZERO_ONE_OR_MORETIMES ...
Dependes how we agree here, but htis is the palce where to define it. Not hack *outside* parser
..somehow.
According to ths change, different handling of arguments must be done. See later.
*Anyway, the paresr must kill applciation if invalid combination/number of options apear.*
minor note - if this field will be added, new enum will be probably created. Thsi enum will need
same localizable schema as have NumberOfArguments. And Must be later added to docs generator.
> //policyeditor
> //-help
> @@ -160,8 +160,9 @@
> OPTIONS.GET,
> OPTIONS.INFO,
> OPTIONS.SET,
> + OPTIONS.RESET,
> OPTIONS.RESETALL,
> - OPTIONS.RESET,
> + OPTIONS.HEADLESS,
> OPTIONS.CHECK
> });
> }
> diff -r e1c7156ed0a1 netx/net/sourceforge/jnlp/controlpanel/CommandLine.java
> --- a/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java Thu Sep 18 13:18:11 2014 -0400
> +++ b/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java Mon Sep 22 16:47:47 2014 -0400
> @@ -21,8 +21,6 @@
> import static net.sourceforge.jnlp.runtime.Translator.R;
>
> import java.io.IOException;
> -import java.util.ArrayList;
> -import java.util.Arrays;
> import java.util.List;
> import java.util.Map;
>
> @@ -37,16 +35,17 @@
> import net.sourceforge.jnlp.util.docprovider.TextsProvider;
> import net.sourceforge.jnlp.util.docprovider.formatters.formatters.PlainTextFormatter;
> import net.sourceforge.jnlp.util.logging.OutputController;
> +import net.sourceforge.jnlp.util.optionparser.OptionParser;
>
> /**
> * Encapsulates a command line interface to the deployment configuration.
> * <p>
> - * The central method is {@link #handle(String[])}, which calls one of the
> - * various 'handle' methods. The commands listed in {@link #allCommands} are
> + * The central method is {@link #handle()}, which calls one of the
> + * various 'handle' methods. The commands listed in OptionsDefinitions are
> * supported. For each supported command, a method handleCOMMANDCommand exists.
> * This method actually takes action based on the command. Generally, a
> * printCOMMANDHelp method also exists, and prints out the help message for
> - * that specific command. For example, see {@link #handleListCommand(List)}
> + * that specific command. For example, see {@link #handleListCommand(int)}
> * and {@link #printListHelp()}.
> * </p>
> * Sample usage:
> @@ -72,6 +71,7 @@
>
>
> DeploymentConfiguration config = null;
> + private static OptionParser optionParser;
>
> /**
> * Creates a new instance
> @@ -125,11 +125,11 @@
> /**
> * Handles the 'list' command
> *
> - * @param args the arguments to the list command
> * @return result of handling the command. SUCCESS if no errors occurred.
> */
> - public int handleListCommand(List<String> args) {
> - if (args.contains("help")) {
> + public int handleListCommand(int order) {
> + List<String> args = optionParser.getValuesFromOrder(order);
> + if (optionParser.getOptionFromOrder(order + 1) == OptionsDefinitions.OPTIONS.NODASHHELP) {
No op on this +1. It is terribly untrasnaprrent. See below.
> printListHelp();
> return SUCCESS;
> }
> @@ -169,33 +169,29 @@
> /**
> * Handles the 'get' command.
> *
> - * @param args the arguments to the get command
> * @return an integer representing success (SUCCESS) or error handling the
> * get command.
> */
> - public int handleGetCommand(List<String> args) {
> - if (args.contains("help")) {
> + public int handleGetCommand(int order) {
> + List<String> args = optionParser.getValuesFromOrder(order);
> + if (optionParser.getOptionFromOrder(order + 1) == OptionsDefinitions.OPTIONS.NODASHHELP) {
> printGetHelp();
> return SUCCESS;
> }
>
> - if (args.size() != 1) {
> - printGetHelp();
> - return ERROR;
> - }
> -
> Map<String, Setting<String>> all = config.getRaw();
>
> - String key = args.get(0);
> - String value = null;
> - if (all.containsKey(key)) {
> - value = all.get(key).getValue();
> - OutputController.getLogger().printOutLn(value);
> - return SUCCESS;
> - } else {
> - OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLUnknownProperty", key));
> - return ERROR;
> + for (String key : args) {
> + String value = null;
> + if (all.containsKey(key)) {
> + value = all.get(key).getValue();
> + OutputController.getLogger().printOutLn(key+": "+value);
> + } else {
> + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLUnknownProperty", key));
> + return ERROR;
> + }
> }
> + return SUCCESS;
> }
>
> /**
> @@ -210,39 +206,46 @@
> /**
> * Handles the 'set' command
> *
> - * @param args the arguments to the set command
> * @return an integer indicating success (SUCCESS) or error in handling
> * the command
> */
> - public int handleSetCommand(List<String> args) {
> - if (args.contains("help")) {
> + public int handleSetCommand(int order) {
> + List<String> args = optionParser.getValuesFromOrder(order);
> + args = OptionParser.splitListOnEquals(args);
> + if (optionParser.getOptionFromOrder(order + 1) == OptionsDefinitions.OPTIONS.NODASHHELP) {
> printSetHelp();
> return SUCCESS;
> }
>
> - if (args.size() != 2) {
> + if (args.size() % 2 != 0) {
> printSetHelp();
> return ERROR;
> }
> + String key = "";
> + String value;
>
> - String key = args.get(0);
> - String value = args.get(1);
> -
> - if (config.getRaw().containsKey(key)) {
> - Setting<String> old = config.getRaw().get(key);
> - if (old.getValidator() != null) {
> - try {
> - old.getValidator().validate(value);
> - } catch (IllegalArgumentException e) {
> - OutputController.getLogger().log(OutputController.Level.WARNING_ALL, R("CLIncorrectValue", old.getName(), value, old.getValidator().getPossibleValues()));
> - OutputController.getLogger().log(e);
> - return ERROR;
> + for (String arg : args) {
> + if (args.indexOf(arg) % 2 == 0) {
> + key = arg;
> + } else {
> + value = arg;
> + if (config.getRaw().containsKey(key)) {
> + Setting<String> old = config.getRaw().get(key);
> + if (old.getValidator() != null) {
> + try {
> + old.getValidator().validate(value);
> + } catch (IllegalArgumentException e) {
> + OutputController.getLogger().log(OutputController.Level.WARNING_ALL, R("CLIncorrectValue", old.getName(), value, old.getValidator().getPossibleValues()));
> + OutputController.getLogger().log(e);
> + return ERROR;
> + }
> + }
> + config.setProperty(key, value);
> + } else {
> + OutputController.getLogger().printOutLn(R("CLWarningUnknownProperty", key));
> + config.setProperty(key, value);
> }
> }
> - config.setProperty(key, value);
> - } else {
> - OutputController.getLogger().printOutLn(R("CLWarningUnknownProperty", key));
> - config.setProperty(key, value);
> }
>
> try {
> @@ -267,33 +270,29 @@
> /**
> * Handles the 'reset' command
> *
> - * @param args the arguments to the reset command
> * @return an integer indicating success (SUCCESS) or error in handling
> * the command
> */
> - public int handleResetCommand(List<String> args) {
> - if (args.contains("help")) {
> + public int handleResetCommand(int order) {
> + List<String> args = optionParser.getValuesFromOrder(order);
> + if (optionParser.getOptionFromOrder(order + 1) == OptionsDefinitions.OPTIONS.NODASHHELP) {
> printResetHelp();
> return SUCCESS;
> }
>
> - if (args.size() != 1) {
> - printResetHelp();
> - return ERROR;
> - }
> -
> - String key = args.get(0);
> -
> boolean resetAll = false;
> - if (key.equals("all")) {
> + if (args.contains("all")) {
> resetAll = true;
> + if (args.size() > 1) {
> + for (String arg : args) {
> + if (!arg.equals("all")) {
> + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLUnknownCommand", arg));
> + }
> + }
> + }
> }
>
> Map<String, Setting<String>> all = config.getRaw();
> - if (!resetAll && !all.containsKey(key)) {
> - OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLUnknownProperty", key));
> - return ERROR;
> - }
>
> if (resetAll) {
> for (String aKey: all.keySet()) {
> @@ -301,8 +300,15 @@
> setting.setValue(setting.getDefaultValue());
> }
> } else {
> - Setting<String> setting = all.get(key);
> - setting.setValue(setting.getDefaultValue());
> + for(String key : args) {
> + if (!all.containsKey(key)) {
> + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLUnknownProperty", key));
> + return ERROR;
> + } else {
> + Setting<String> setting = all.get(key);
> + setting.setValue(setting.getDefaultValue());
> + }
> + }
> }
>
> try {
> @@ -325,42 +331,6 @@
> }
>
> /**
> - * Handles the 'info' command
> - *
> - * @param args the arguments to the info command
> - * @return an integer indicating success (SUCCESS) or error in handling
> - * the command
> - */
> - public int handleInfoCommand(List<String> args) {
> - if (args.contains("help")) {
> - printInfoHelp();
> - return SUCCESS;
> - }
> -
> - if (args.size() != 1) {
> - printInfoHelp();
> - return ERROR;
> - }
> -
> - Map<String, Setting<String>> all = config.getRaw();
> -
> - String key = args.get(0);
> - Setting<String> value = all.get(key);
> - if (value == null) {
> - OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLNoInfo"));
> - return ERROR;
> - } else {
> - OutputController.getLogger().printOutLn(R("CLDescription", value.getDescription()));
> - OutputController.getLogger().printOutLn(R("CLValue", value.getValue()));
> - if (value.getValidator() != null) {
> - OutputController.getLogger().printOutLn("\t" + R("VVPossibleValues", value.getValidator().getPossibleValues()));
> - }
> - OutputController.getLogger().printOutLn(R("CLValueSource", value.getSource()));
> - return SUCCESS;
> - }
> - }
> -
> - /**
> * Prints a help message for the 'check' command
> */
> public void printCheckHelp() {
> @@ -370,14 +340,46 @@
> }
>
> /**
> - * Handles the 'check' command
> + * Handles the 'info' command
> *
> - * @param args the arguments to the check command.
> * @return an integer indicating success (SUCCESS) or error in handling
> * the command
> */
> - public int handleCheckCommand(List<String> args) {
> - if (args.contains("help")) {
> + public int handleInfoCommand(int order) {
> + List<String> args = optionParser.getValuesFromOrder(order);
> + if (optionParser.getOptionFromOrder(order + 1) == OptionsDefinitions.OPTIONS.NODASHHELP) {
> + printInfoHelp();
> + return SUCCESS;
> + }
> +
> + Map<String, Setting<String>> all = config.getRaw();
> +
> + for (String key : args) {
> + Setting<String> value = all.get(key);
> + if (value == null) {
> + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLNoInfo"));
> + return ERROR;
> + } else {
> + OutputController.getLogger().printOutLn(R("CLDescription", value.getDescription()));
> + OutputController.getLogger().printOutLn(R("CLValue", value.getValue()));
> + if (value.getValidator() != null) {
> + OutputController.getLogger().printOutLn("\t" + R("VVPossibleValues", value.getValidator().getPossibleValues()));
> + }
> + OutputController.getLogger().printOutLn(R("CLValueSource", value.getSource()));
> + }
> + }
> + return SUCCESS;
> + }
> +
> + /**
> + * Handles the 'check' command
> + *
> + * @return an integer indicating success (SUCCESS) or error in handling
> + * the command
> + */
> + public int handleCheckCommand(int order) {
> + List<String> args = optionParser.getValuesFromOrder(order);
> + if (optionParser.getOptionFromOrder(order + 1) == OptionsDefinitions.OPTIONS.NODASHHELP) {
> printCheckHelp();
> return SUCCESS;
> }
> @@ -416,48 +418,41 @@
> * into two pieces: the first element is assumend to be the command, and
> * everything after is taken to be the argument to the command.
> *
> - * @param commandAndArgs A string array representing the command and
> - * arguments to take action on
> * @return an integer representing an error code or SUCCESS if no problems
> * occurred.
> */
> - public int handle(String[] commandAndArgs) {
> + public int handle() {
>
> - if (commandAndArgs == null) {
> - throw new NullPointerException("command is null");
> + int val = ERROR;
> + int order = 0;
> + for (OptionsDefinitions.OPTIONS option : optionParser.getOptionsOrder()) {
> + if (option.equals(OptionsDefinitions.OPTIONS.RESET)) {
> + val = handleResetCommand(order);
> + }
> + if (option.equals(OptionsDefinitions.OPTIONS.LIST)) {
> + val = handleListCommand(order);
> + }
> + if (option.equals(OptionsDefinitions.OPTIONS.SET)) {
> + val = handleSetCommand(order);
> + }
> + if (option.equals(OptionsDefinitions.OPTIONS.GET)) {
> + val = handleGetCommand(order);
> + }
> + if (option.equals(OptionsDefinitions.OPTIONS.INFO)) {
> + val = handleInfoCommand(order);
> + }
> + if (option.equals(OptionsDefinitions.OPTIONS.CHECK)) {
> + val = handleCheckCommand(order);
> + }
> + if (optionParser.mainArgExists()) {
> + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLUnknownCommand", optionParser.getMainArgs()));
> + handleHelpCommand();
> + val = ERROR;
> + } else if (option.equals(OptionsDefinitions.OPTIONS.NODASHHELP) && (order == 0 || (optionParser.getOptionFromOrder(0) == OptionsDefinitions.OPTIONS.HEADLESS && order == 1))) {
> + val = handleHelpCommand();
> + }
> + order++;
> }
> -
> - if (commandAndArgs.length == 0) {
> - handleHelpCommand();
> - return ERROR;
> - }
> -
> - String command = commandAndArgs[0];
> - String[] argsArray = new String[commandAndArgs.length - 1];
> - System.arraycopy(commandAndArgs, 1, argsArray, 0, commandAndArgs.length - 1);
> - List<String> arguments = new ArrayList<>(Arrays.asList(argsArray));
> -
> - int val;
> - if (command.equals(OptionsDefinitions.OPTIONS.NODASHHELP.option)) {
> - val = handleHelpCommand();
> - } else if (command.equals(OptionsDefinitions.OPTIONS.LIST.option)) {
> - val = handleListCommand(arguments);
> - } else if (command.equals(OptionsDefinitions.OPTIONS.SET.option)) {
> - val = handleSetCommand(arguments);
> - } else if (command.equals(OptionsDefinitions.OPTIONS.RESET.option)) {
> - val = handleResetCommand(arguments);
> - } else if (command.equals(OptionsDefinitions.OPTIONS.GET.option)) {
> - val = handleGetCommand(arguments);
> - } else if (command.equals(OptionsDefinitions.OPTIONS.INFO.option)) {
> - val = handleInfoCommand(arguments);
> - } else if (command.equals(OptionsDefinitions.OPTIONS.CHECK.option)) {
> - val = handleCheckCommand(arguments);
> - } else {
> - OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLUnknownCommand", command));
> - handleHelpCommand();
> - val = ERROR;
> - }
> -
> return val;
> }
>
> @@ -466,12 +461,17 @@
> * @param args the command line arguments to this program
> */
> public static void main(String[] args) throws Exception {
> + optionParser = new OptionParser(args, OptionsDefinitions.getItwsettingsCommands());
> + if (optionParser.hasOption(OptionsDefinitions.OPTIONS.HEADLESS)) {
> + JNLPRuntime.setHeadless(true);
> + }
Yes. this is working for me. ty!
> DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched();
> +
> if (args.length == 0) {
> ControlPanel.main(new String[] {});
> } else {
> CommandLine cli = new CommandLine();
> - int result = cli.handle(args);
> + int result = cli.handle();
>
> // instead of returning, use JNLPRuntime.exit() so we can pass back
> // error codes indicating success or failure. Otherwise using
> diff -r e1c7156ed0a1 netx/net/sourceforge/jnlp/resources/Messages.properties
> --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Thu Sep 18 13:18:11 2014 -0400
> +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Sep 22 16:47:47 2014 -0400
> @@ -297,7 +297,7 @@
> IBOSet=Sets the setting to the new value, after checking that it is an appropriate value.
> IBOResetAll= Resets all settings to their original values.
> IBOReset=Resets the named setting to its original value.
> -IBOCheck=Checks that the current value of the setting is a valid value.
> +IBOCheck=Checks that the current settings have valid values.
>
> PBOFile=Specifies a policy file path to open. If exactly one argument is given, and it is not this flag, it is interpreted as a file path to open, as if this flag was given first. This flag exists \
> mostly for compatibility with Policy Tool, but is also needed when opening a policy file and also using the -codebase flag.
> diff -r e1c7156ed0a1 netx/net/sourceforge/jnlp/util/optionparser/OptionParser.java
> --- a/netx/net/sourceforge/jnlp/util/optionparser/OptionParser.java Thu Sep 18 13:18:11 2014 -0400
> +++ b/netx/net/sourceforge/jnlp/util/optionparser/OptionParser.java Mon Sep 22 16:47:47 2014 -0400
> @@ -40,6 +40,7 @@
>
> import java.util.ArrayList;
> import java.util.Arrays;
> +import java.util.Collections;
> import java.util.HashMap;
> import java.util.List;
> import java.util.Map;
> @@ -58,7 +59,8 @@
> //null represents all values that are parsed that don't have a corresponding option which are potential main args
> private final OptionsDefinitions.OPTIONS mainArg = null;
> private List<String> result;
> -
> + private List<OptionsDefinitions.OPTIONS> orderedOptions;
> + private List<Integer> orderedAmountOfValues;
Ok. This is weekpoint. You cannot go by this hackisch way:(
If you wont to support this ferature, you have to go by some deffinition similar to the one I
suggested above, and adapt internal implementation of parser.
In result the api of this parser will change. I'm c urrently not sure how. Probably return some list
(arguments) of lists (their values)? But how to sanitize the order of different swithces. Some
kind of iterable? In that case the
Well This seems to me like in that case the parser will becoime moreover verifier and sanitizer. But
also the transferer from string to objects... Well think about it :)
See your reply!
J.
More information about the distro-pkg-dev
mailing list