From a9ac11e0670eb79c6b320f460f9d90bdd661b95f Mon Sep 17 00:00:00 2001
From: Febbweiss <fabrice.ecaille@gmail.com>
Date: Thu, 28 Sep 2017 14:50:23 +0200
Subject: [PATCH] Fix: right way to manage enigma resolution

---
 src/main/java/fr/pavnay/scrabble/Main.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/fr/pavnay/scrabble/Main.java b/src/main/java/fr/pavnay/scrabble/Main.java
index b87cff2..e0dc426 100644
--- a/src/main/java/fr/pavnay/scrabble/Main.java
+++ b/src/main/java/fr/pavnay/scrabble/Main.java
@@ -38,7 +38,6 @@ public class Main {
 		
 		try {
 			CommandLine line = parser.parse(options, args);
-			System.out.println(line.getArgList());
 			if( line.hasOption( "build" ) ) {
 				generate(line);
 			} else {
@@ -83,8 +82,8 @@ public class Main {
 		final int min = Integer.parseInt(line.getOptionValue("min", "3"));
 		final int max = Integer.parseInt(line.getOptionValue("max", "7"));
 		char[] letters = null;
-		if( line.getArgList().size() == 1 ) {
-			letters = line.getArgList().get(0).toCharArray();
+		if( line.hasOption("resolve") ) {
+			letters = line.getOptionValue("resolve").toCharArray();
 		}
 		try {
 			manageLanguage(language);
@@ -144,12 +143,21 @@ public class Main {
 				.argName("max")
 				.required(false)
 				.build();
+		
+		final Option lettersOption = Option.builder("r")
+				.longOpt("resolve")
+				.desc("Find words with the given letters")
+				.hasArg(true)
+				.argName("letters")
+				.required(false)
+				.build();
 
 		final Options options = new Options();
 
 		options.addOption(buildOption);
 		options.addOption(helpFileOption);
 		options.addOption(languageOption);
+		options.addOption(lettersOption);
 		options.addOption(minOption);
 		options.addOption(maxOption);