X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fcommandline%2Fparameterparser%2FParser.java;fp=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fcommandline%2Fparameterparser%2FParser.java;h=a72984f3b10dd347e8b4a5f70bcd1e6c0c30730b;hb=cf965fda534cc562368c9f2a3f34475e2519fcdc;hp=d2f623fc5c8a0a21e6f390365194d94dca2594f3;hpb=6a9352a6edbeaa1a2b3dafc09e91f53ab1871e1c;p=svjatoslav_commons.git diff --git a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java index d2f623f..a72984f 100755 --- a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java +++ b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java @@ -1,6 +1,6 @@ /* * Svjatoslav Commons - shared library of common functionality. - * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu + * Copyright ©2012-2013, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public License @@ -30,10 +30,9 @@ public class Parser { */ public Parameter getParameterByAlias(final String alias) { - for (final Parameter parameter : parameters) { + for (final Parameter parameter : parameters) if (parameter.matchesAlias(alias)) return parameter; - } return null; } @@ -60,10 +59,9 @@ public class Parser { return false; } else { - if (currentParameter != null) { + if (currentParameter != null) if (!currentParameter.noMoreArguments()) return false; - } parameterForAlias.setParameterSpecified(true); currentParameter = parameterForAlias; @@ -73,21 +71,19 @@ public class Parser { // check if any mandatory parameters are missing - for (final Parameter parameter : parameters) { + for (final Parameter parameter : parameters) if (parameter.isMandatory() && (!parameter.isParameterSpecified())) { System.out.println("Error! Mandatory parameter (" + parameter.getAliases() + ") is not specified."); return false; } - } return true; } public void showHelp() { - for (final Parameter parameter : parameters) { + for (final Parameter parameter : parameters) System.out.println(parameter.getHelp()); - } } }