updated meviz to work with new commandline parsing API

[meviz.git] / src / main / java / eu / svjatoslav / meviz / htmlindexer / CommandlineHandler.java

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
index 84bff07..eb32317 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
@@ -11,29 +11,34 @@ package eu.svjatoslav.meviz.htmlindexer;
 
 import java.io.File;
 
-import eu.svjatoslav.commons.commandline.parameterparser.Parameter;
 import eu.svjatoslav.commons.commandline.parameterparser.Parser;
-import eu.svjatoslav.commons.commandline.parameterparser.arguments.StringArgument;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.DirectoryParameter;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameter;
 import eu.svjatoslav.meviz.encoder.EncodingOptions;
 
 public class CommandlineHandler {
 
-       Parameter galleryNameParameter = new Parameter(false, true, false,
-                       new StringArgument(), "Gallery title. (default is: "
-                                       + Constants.DEFAULT_GALLERY_TITLE + ").", "-t",
-                       "--gallery-title");
+       Parser parser = new Parser();
 
-       Parameter workingDirectoryParameter = new Parameter(false, true, true,
-                       new StringArgument(), "Working directory.", "-w",
-                       "--working-directory");
+       StringParameter galleryNameParameter = parser.createStringParameter(
+                       "Gallery title. (default is: " + Constants.DEFAULT_GALLERY_TITLE
+                                       + ").").addAliases("-t", "--gallery-title");
 
-       public Parser initParser() {
+       DirectoryParameter workingDirectoryParameter = parser
+                       .createDirectoryParameter("Working directory.").addAliases("-w",
+                                       "--working-directory");
 
-               final Parser parser = new Parser();
-               parser.addParameter(galleryNameParameter);
-               parser.addParameter(workingDirectoryParameter);
+       public String getGalleryTitle() {
+               if (galleryNameParameter.isParameterSpecified())
+                       return galleryNameParameter.getValue();
+               return Constants.DEFAULT_GALLERY_TITLE;
+       }
 
-               return parser;
+       public File getWorkingDirectory() {
+               if (workingDirectoryParameter.isParameterSpecified())
+                       return workingDirectoryParameter.getValue();
+               else
+                       return new File(System.getProperty("user.dir"));
        }
 
        /**
@@ -41,24 +46,7 @@ public class CommandlineHandler {
         *         successfully parsed, or <code>null</code> if parsing error
         *         occurred.
         */
-       public IndexingOptions parseCommandlineArguments(final String[] args) {
-
-               final IndexingOptions options = new IndexingOptions();
-
-               final Parser parser = initParser();
-               if (!parser.parse(args))
-                       return null;
-
-               if (galleryNameParameter.isParameterSpecified())
-                       options.galleryTitle = galleryNameParameter.getArgumentsAsStrings()
-                                       .get(0);
-
-               if (workingDirectoryParameter.isParameterSpecified())
-                       options.workingDirectory = workingDirectoryParameter
-                                       .getArgumentsAsFiles().get(0);
-               else
-                       options.workingDirectory = new File(System.getProperty("user.dir"));
-
-               return options;
+       public boolean parseCommandlineArguments(final String[] args) {
+               return parser.parse(args);
        }
 }