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 6095673..eb32317 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
@@ -11,53 +11,42 @@ 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.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 eu.svjatoslav.commons.commandline.parameterparser.arguments.String(), "Gallery title. (default is: "
-                    + Constants.DEFAULT_GALLERY_TITLE + ").", "-t", "--gallery-title");
-
-    Parameter workingDirectoryParameter = new Parameter(false, true, true,
-            new eu.svjatoslav.commons.commandline.parameterparser.arguments.String(), "Working directory.", "-w",
-            "--working-directory");
-
-    public Parser initParser() {
-
-        final Parser parser = new Parser();
-        parser.addParameter(galleryNameParameter);
-        parser.addParameter(workingDirectoryParameter);
-
-        return parser;
-    }
-
-    /**
-     * @return {@link EncodingOptions} if commandline arguments were
-     *         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;
-    }
+       Parser parser = new Parser();
+
+       StringParameter galleryNameParameter = parser.createStringParameter(
+                       "Gallery title. (default is: " + Constants.DEFAULT_GALLERY_TITLE
+                                       + ").").addAliases("-t", "--gallery-title");
+
+       DirectoryParameter workingDirectoryParameter = parser
+                       .createDirectoryParameter("Working directory.").addAliases("-w",
+                                       "--working-directory");
+
+       public String getGalleryTitle() {
+               if (galleryNameParameter.isParameterSpecified())
+                       return galleryNameParameter.getValue();
+               return Constants.DEFAULT_GALLERY_TITLE;
+       }
+
+       public File getWorkingDirectory() {
+               if (workingDirectoryParameter.isParameterSpecified())
+                       return workingDirectoryParameter.getValue();
+               else
+                       return new File(System.getProperty("user.dir"));
+       }
+
+       /**
+        * @return {@link EncodingOptions} if commandline arguments were
+        *         successfully parsed, or <code>null</code> if parsing error
+        *         occurred.
+        */
+       public boolean parseCommandlineArguments(final String[] args) {
+               return parser.parse(args);
+       }
 }