X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fcommandline%2Fparameterparser%2FParser.java;h=91993eb52a9bc2779abc56edc7dbed18ba0a095c;hb=b8bd1e820265fc15c39c1ee8c06289ea8b8e2c1c;hp=63a95f9d8b97920aba1d12249c27b8641534bf55;hpb=9bf004ce4e9b5edff36c65fcc8cc0f303390d7fc;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 63a95f9..91993eb 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 ©2012-2014, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright ©2012-2017, 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
@@ -18,9 +18,9 @@ import java.util.ArrayList;
  */
 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;
     }
@@ -31,8 +31,8 @@ public class Parser {
      */
     private boolean checkMandatoryArgumentsPresent() {
 
-        for (final Parameter<?> parameter : parameters)
-            if (parameter.isMandatory() && (!parameter.isParameterSpecified())) {
+        for (final Parameter parameter : parameters)
+            if (parameter.isMandatory() && (!parameter.isSpecified())) {
                 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.
      */
-    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;
 
@@ -64,11 +64,11 @@ public class Parser {
      */
     public boolean parse(final String[] args) {
 
-        Parameter<?> currentParameter = null;
+        Parameter currentParameter = null;
 
         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: "
@@ -84,7 +84,7 @@ public class Parser {
                     if (!currentParameter.noMoreArguments())
                         return false;
 
-                parameterForAlias.setParameterSpecified(true);
+                parameterForAlias.setSpecified(true);
                 currentParameter = parameterForAlias;
             }
 
@@ -94,7 +94,8 @@ public class Parser {
     }
 
     public void showHelp() {
-        for (final Parameter<?> parameter : parameters)
+        System.out.println("Available commandline arguments:");
+        for (final Parameter parameter : parameters)
             System.out.println(parameter.getHelp());
     }