X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=cli-helper.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fcli_helper%2Fparameter_parser%2FParser.java;fp=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fcli_helper%2Fparameter_parser%2FParser.java;h=d307ea3455ce73b06d3bd0ac30932c4a47e2a890;hp=639be0f29b8a081d8239018fc68f887c863d5ceb;hb=324ea20c0c65f671c0d35e94ed90142912a56b4c;hpb=2c29a140b3ff6f0f60ac838437c4bd9b8fd6dad7

diff --git a/src/main/java/eu/svjatoslav/commons/cli_helper/parameter_parser/Parser.java b/src/main/java/eu/svjatoslav/commons/cli_helper/parameter_parser/Parser.java
index 639be0f..d307ea3 100755
--- a/src/main/java/eu/svjatoslav/commons/cli_helper/parameter_parser/Parser.java
+++ b/src/main/java/eu/svjatoslav/commons/cli_helper/parameter_parser/Parser.java
@@ -11,10 +11,10 @@ import java.util.ArrayList;
  */
 public class Parser {
 
-    private final ArrayList<Parameter<?, ? extends Parameter>> parameters = new ArrayList<>();
+    private final ArrayList<Option<?, ? extends Option>> options = new ArrayList<>();
 
-    public <E extends Parameter> E add(final E parameter) {
-        parameters.add(parameter);
+    public <E extends Option> E add(final E parameter) {
+        options.add(parameter);
         return parameter;
     }
 
@@ -24,10 +24,10 @@ public class Parser {
      */
     private boolean checkMandatoryArgumentsPresent() {
 
-        for (final Parameter parameter : parameters)
-            if (parameter.isMandatory() && (!parameter.isSpecified())) {
+        for (final Option option : options)
+            if (option.isMandatory() && (!option.isPresent())) {
                 System.out.println("Error! Mandatory parameter ("
-                        + parameter.getAliases() + ") is not specified.");
+                        + option.getAliasesAsString() + ") is not specified.");
                 return false;
             }
 
@@ -41,11 +41,11 @@ 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 Option findParameterByAlias(final String alias) {
 
-        for (final Parameter parameter : parameters)
-            if (parameter.matchesAlias(alias))
-                return parameter;
+        for (final Option option : options)
+            if (option.matchesAlias(alias))
+                return option;
 
         return null;
     }
@@ -57,28 +57,28 @@ public class Parser {
      */
     public boolean parse(final String[] args) {
 
-        Parameter currentParameter = null;
+        Option currentOption = null;
 
         for (final String argument : args) {
 
-            final Parameter parameterForAlias = findParameterByAlias(argument);
-            if (parameterForAlias == null) {
-                if (currentParameter == null) {
+            final Option optionForAlias = findParameterByAlias(argument);
+            if (optionForAlias == null) {
+                if (currentOption == null) {
                     System.out.println("Unknown commandline parameter: "
                             + argument);
                     return false;
                 }
 
-                if (!currentParameter.addArgument(argument))
+                if (!currentOption.addParameter(argument))
                     return false;
 
             } else {
-                if (currentParameter != null)
-                    if (!currentParameter.noMoreArguments())
+                if (currentOption != null)
+                    if (!currentOption.noMoreArguments())
                         return false;
 
-                parameterForAlias.setSpecified(true);
-                currentParameter = parameterForAlias;
+                optionForAlias.setPresent(true);
+                currentOption = optionForAlias;
             }
 
         }
@@ -88,8 +88,8 @@ public class Parser {
 
     public void showHelp() {
         System.out.println("Available commandline arguments:");
-        for (final Parameter parameter : parameters)
-            System.out.println(parameter.getHelp());
+        for (final Option option : options)
+            System.out.println(option.getHelp());
     }
 
 }