resolved confict for merge

Author: mpolonioli

README.md

@@ -1,10 +1,15 @@
-# FFX_LightningAvoider
-This is a simple project that makes Tidus to avoid thunder in the game Final Fantasy X for ps4
-
-INSTRUCTIONS
-
-  1 - Start remote play for ps4 on PC in order to play the game on the PC
-  2 - Position Tidus in the south area near the kyactus stone on the right side of the map in order to block him when avoiding
-  3 - Run the program
-  4 - Now you have 5 seconds to position the mouse pointer on a dark pixel of the game screen
-  5 - wait until the program ends, you can see on the standard output how many thunder have been avoided
+
+# FFX_LightningAvoider
+This is a simple project that makes Tidus to avoid thunder in the game Final Fantasy X for ps4
+
+INSTRUCTIONS
+
+  1. Start remote play for ps4 on PC in order to play the game on the PC
+  2. Position Tidus in the south area near the kyactus stone on the right side of the map in order to block him when avoiding
+  3. Run the program
+  4. Now you have 5 seconds to position the mouse pointer in on a dark pixel of the game screen
+  5. wait until the program ends, you can see on the standard output how many thunder have been avoided
+
+  ## Command line option
+  
+  ``[-wp <number of waiting time>] [-ml <number of max lightning avoied>]``

src/LightningSensor.java

@@ -0,0 +1,44 @@
+import java.awt.AWTException;
+import java.awt.MouseInfo;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+
+public class LightningSensor {
+	
+	final public int WAITING_PIXEL;
+	final public int MAXLIGHTNING_AVOIED;
+	
+	public LightningSensor(int waitinPixel, int maxLightningAvoied){
+		this.WAITING_PIXEL = waitinPixel;
+		this.MAXLIGHTNING_AVOIED = maxLightningAvoied;
+	}
+	
+	public LightningSensor(){
+		this(5000, 210);
+	}
+	
+	public void run() throws AWTException{
+		Point coord;
+		Robot robot = new Robot();
+		int lightningCounter = 0;
+		
+		// wait for this.WAITINGPIXEL seconds to permit the user to point the mouse on the desire pixel
+		robot.delay(this.WAITING_PIXEL);
+		coord = MouseInfo.getPointerInfo().getLocation();
+
+		while (lightningCounter <= this.MAXLIGHTNING_AVOIED) {
+			// green >= 70 means screen flash
+			if (robot.getPixelColor((int) coord.getX(), (int) coord.getY()).getGreen() >= 70) {
+				// press ENTER = X 
+				robot.keyPress(KeyEvent.VK_ENTER);
+				robot.delay(100);
+				robot.keyRelease(KeyEvent.VK_ENTER);
+				lightningCounter++;
+				System.out.println(lightningCounter);
+				// wait to prevent X spamming
+				robot.delay(500);
+			}
+		}	
+	}
+}

src/Main.java

@@ -1,40 +1,21 @@
 import java.awt.AWTException;
-import java.awt.Robot;
-import java.awt.event.KeyEvent;
-import java.awt.Point;
-import java.awt.MouseInfo;
 
 public class Main {
 
+	final static public int DEFAULT_WAITING_PIXEL = 5000;
+	final static public int DEFAULT_MAXLIGHTNING_AVOIED = 210;
+
 	public static void main(String[] args) throws AWTException {
-		
-		Point coord;
-		Robot robot = new Robot();
-		int count = 0;
-		boolean whileCondition = true;
-		
-		// wait for 5 seconds to permit the user to point the mouse on the desire pixel
-		robot.delay(5000);
-		// take coordinate of the pointed pixel
-		coord = MouseInfo.getPointerInfo().getLocation();
-		
-		while (whileCondition) {
-			// green >= 70 means screen flash
-			if (robot.getPixelColor((int) coord.getX(), (int) coord.getY()).getGreen() >= 70) {
-				// press ENTER = X 
-				robot.keyPress(KeyEvent.VK_ENTER);
-				robot.delay(100);
-				robot.keyRelease(KeyEvent.VK_ENTER);
-				// how many lightning avoided since now
-				count++;
-				System.out.println(count);
-				// wait to prevent X spamming
-				robot.delay(500);
-				//  exit the while after 210 lightning avoided
-				if (count == 210) {
-					whileCondition = false;
-				}
-			}
-		}	
+		try{
+			String commandValue;
+			int waitingPizel =  ((commandValue = ParserInput.getCommand("-wp", args)) != null) ? ParserInput.parseIntForCommand("-wp", commandValue) : DEFAULT_WAITING_PIXEL;
+			int maxLightningAvoied = ((commandValue = ParserInput.getCommand("-ml", args)) != null) ? ParserInput.parseIntForCommand("-ml", commandValue) : DEFAULT_WAITING_PIXEL;
+			
+			new LightningSensor(waitingPizel, maxLightningAvoied).run();
+		}
+		catch(ParserInputException e){
+			System.out.println(e.getMessage());
+		}
 	}
+	
 }

src/ParserInput.java

@@ -0,0 +1,17 @@
+
+public class ParserInput {
+	public static String getCommand(String command, String[] arguments){
+		for(int i = 0; i<arguments.length;i++)
+			if(arguments[i].compareTo(command) == 0)
+				return (i<arguments.length) ? arguments[i+1] : null;
+		return null;
+	}
+	public static int parseIntForCommand(String command, String num){
+		try{
+			return Integer.parseInt(num);
+		}
+		catch(NumberFormatException e){
+			throw new ParserInputException(command, num);
+		}
+	}
+}

src/ParserInputException.java

@@ -0,0 +1,21 @@
+
+public class ParserInputException extends RuntimeException {
+	private static final long serialVersionUID = 1L;
+	protected String command;
+	protected String string;
+	
+	public ParserInputException(String command, String string) {
+		this.command = command;
+		this.string = string;
+	}
+	
+	@Override
+	public String toString() {
+		return "Error to perform command.\n"+this.command+" it's not a number but: " + this.string;
+	}
+	
+	@Override
+	public String getMessage() {
+		return this.toString();
+	}
+}