X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2FCommandlineHandler.java;h=95aacf053c485db0ab7a77c244bfdbec8e42869c;hb=10e63289bea94532c36c15d8bd23d164869972bb;hp=84bff070ea47aac003dd692daaa2de711450a1a6;hpb=6b6927aafa42fefece54df3c05ebd9161993ef52;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
index 84bff07..95aacf0 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
@@ -11,29 +11,38 @@ 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.NullParameter;
+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").mustExist();
 
-		final Parser parser = new Parser();
-		parser.addParameter(galleryNameParameter);
-		parser.addParameter(workingDirectoryParameter);
+	NullParameter removeIndex = parser.createNullParameter(
+			"Remove generated index").addAliases("-r", "--remove");
 
-		return parser;
+	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"));
 	}
 
 	/**
@@ -41,24 +50,12 @@ public class CommandlineHandler {
 	 *         successfully parsed, or <code>null</code> if parsing error
 	 *         occurred.
 	 */
-	public IndexingOptions parseCommandlineArguments(final String[] args) {
-
-		final IndexingOptions options = new IndexingOptions();
+	public boolean parseCommandlineArguments(final String[] args) {
+		final boolean parsingSucceeded = parser.parse(args);
 
-		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"));
+		if (!parsingSucceeded)
+			parser.showHelp();
 
-		return options;
+		return parsingSucceeded;
 	}
 }