projects
/
svjatoslav_commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated copyright
[svjatoslav_commons.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
commons
/
commandline
/
parameterparser
/
Parser.java
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
63a95f9
..
997bdef
100755
(executable)
--- 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.
/*
* Svjatoslav Commons - shared library of common functionality.
- * Copyright ©2012-201
4
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright ©2012-201
9
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 3 of the GNU Lesser General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 3 of the GNU Lesser General Public License
@@
-18,9
+18,9
@@
import java.util.ArrayList;
*/
public class Parser {
*/
public class Parser {
- private final ArrayList<Parameter<?>> parameters = new ArrayList<>();
+ private final ArrayList<Parameter<?
, ? extends Parameter
>> parameters = new ArrayList<>();
- public <E extends Parameter
<?>
> E add(final E parameter) {
+ public <E extends Parameter> E add(final E parameter) {
parameters.add(parameter);
return parameter;
}
parameters.add(parameter);
return parameter;
}
@@
-31,8
+31,8
@@
public class Parser {
*/
private boolean checkMandatoryArgumentsPresent() {
*/
private boolean checkMandatoryArgumentsPresent() {
- for (final Parameter
<?>
parameter : parameters)
- if (parameter.isMandatory() && (!parameter.is
Parameter
Specified())) {
+ for (final Parameter parameter : parameters)
+ if (parameter.isMandatory() && (!parameter.isSpecified())) {
System.out.println("Error! Mandatory parameter ("
+ parameter.getAliases() + ") is not specified.");
return false;
System.out.println("Error! Mandatory parameter ("
+ parameter.getAliases() + ") is not specified.");
return false;
@@
-48,9
+48,9
@@
public class Parser {
* @param alias parameter alias
* @return found parameter or <code>null</code> if parameter was not found.
*/
* @param alias parameter alias
* @return found parameter or <code>null</code> if parameter was not found.
*/
- public Parameter
<?>
findParameterByAlias(final String alias) {
+ public Parameter findParameterByAlias(final String alias) {
- for (final Parameter
<?>
parameter : parameters)
+ for (final Parameter parameter : parameters)
if (parameter.matchesAlias(alias))
return parameter;
if (parameter.matchesAlias(alias))
return parameter;
@@
-64,11
+64,11
@@
public class Parser {
*/
public boolean parse(final String[] args) {
*/
public boolean parse(final String[] args) {
- Parameter
<?>
currentParameter = null;
+ Parameter currentParameter = null;
for (final String argument : args) {
for (final String argument : args) {
- final Parameter
<?>
parameterForAlias = findParameterByAlias(argument);
+ final Parameter parameterForAlias = findParameterByAlias(argument);
if (parameterForAlias == null) {
if (currentParameter == null) {
System.out.println("Unknown commandline parameter: "
if (parameterForAlias == null) {
if (currentParameter == null) {
System.out.println("Unknown commandline parameter: "
@@
-84,7
+84,7
@@
public class Parser {
if (!currentParameter.noMoreArguments())
return false;
if (!currentParameter.noMoreArguments())
return false;
- parameterForAlias.set
Parameter
Specified(true);
+ parameterForAlias.setSpecified(true);
currentParameter = parameterForAlias;
}
currentParameter = parameterForAlias;
}
@@
-94,7
+94,8
@@
public class Parser {
}
public void showHelp() {
}
public void showHelp() {
- for (final Parameter<?> parameter : parameters)
+ System.out.println("Available commandline arguments:");
+ for (final Parameter parameter : parameters)
System.out.println(parameter.getHelp());
}
System.out.println(parameter.getHelp());
}