projects
/
svjatoslav_commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more elegant parameter initialization
[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
a72984f
..
e064cd5
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,10
+1,10
@@
/*
* Svjatoslav Commons - shared library of common functionality.
/*
* Svjatoslav Commons - shared library of common functionality.
- * Copyright ©2012-201
3
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- *
+ * Copyright ©2012-201
4
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ *
* This program is free software; you can redistribute it and/or
* 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
- * as published by the Free Software Foundation.
+ * modify it under the terms of version
3 of the GNU Lesser
General Public License
+ *
or later
as published by the Free Software Foundation.
*/
package eu.svjatoslav.commons.commandline.parameterparser;
*/
package eu.svjatoslav.commons.commandline.parameterparser;
@@
-20,15
+20,16
@@
public class Parser {
private final ArrayList<Parameter> parameters = new ArrayList<Parameter>();
private final ArrayList<Parameter> parameters = new ArrayList<Parameter>();
- public
void addParameter(final Parameter
parameter) {
+ public
<E extends Parameter> E add(final E
parameter) {
parameters.add(parameter);
parameters.add(parameter);
+ return parameter;
}
/**
* Return parameter by given alias or <code>null</code> if no parameter
* exists for given alias.
*/
}
/**
* Return parameter by given alias or <code>null</code> if no parameter
* exists for given alias.
*/
- public Parameter
get
ParameterByAlias(final String alias) {
+ public Parameter
find
ParameterByAlias(final String alias) {
for (final Parameter parameter : parameters)
if (parameter.matchesAlias(alias))
for (final Parameter parameter : parameters)
if (parameter.matchesAlias(alias))
@@
-47,7
+48,7
@@
public class Parser {
for (final String argument : args) {
for (final String argument : args) {
- final Parameter parameterForAlias =
get
ParameterByAlias(argument);
+ final Parameter parameterForAlias =
find
ParameterByAlias(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: "