1 files changed, 27 insertions, 57 deletions

diff --git a/src/app/App.java b/src/app/App.java
index b71c5bc..186202c 100644
--- a/src/app/App.java
+++ b/src/app/App.java
@@ -1,74 +1,44 @@
 package org.manzerbredes.open_klm.app;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.DataLine;
-import javax.sound.sampled.LineUnavailableException;
-import javax.sound.sampled.SourceDataLine;
-import javax.sound.sampled.TargetDataLine;
-
-import org.manzerbredes.open_klm.args.ArgsTypeA;
+import org.manzerbredes.open_klm.args.ArgsManager;
 import org.manzerbredes.open_klm.client.MainWindow;
 import org.manzerbredes.open_klm.drivers.*;
-import org.manzerbredes.open_klm.drivers.DriverTypeA.*;
 
 /**
  * Hello world!
  *
  */
 public class App 
-{/*
-	@Option(name="-leftColor",usage="Set the left color")
-	public String leftColor=null;
-	@Option(name="-middleColor",usage="Set the middle color")
-	public String middleColor=null;
-	@Option(name="-rightColor",usage="Set the right color")
-	public String rightColor=null;
-	
-	public void parseArguments(){
-		if(this.leftColor!=null || this.rightColor!=null || this.middleColor!=null){
-			try {
-				DriverTypeA device=new Driver_1770_ff00();
-				
-				if(this.leftColor==null)
-					this.leftColor="OFF";
-				if(this.middleColor==null)
-					this.middleColor="OFF";
-				if(this.rightColor==null)
-					this.rightColor="OFF";
-				device.setRegionColor(Region.LEFT, Color.valueOf(leftColor), Intensity.HIGH);
-				device.setRegionColor(Region.MIDDLE, Color.valueOf(middleColor), Intensity.HIGH);
-				device.setRegionColor(Region.RIGHT, Color.valueOf(rightColor), Intensity.HIGH);
-
-			} catch (Exception e) {
+{
+    public static void main( String[] args ) 
+    {
+    	// Get driver
+    	DriverManager driverManager=new DriverManager();
+    	Driver aDriver=driverManager.getDevice();
+    	
+    	// If a driver is found run the program
+    	if(aDriver!=null){
+    		
+    		// Parse argument
+    		ArgsManager argsManager=new ArgsManager();
+    		argsManager.parse(aDriver, args);
+    		
+    		// Else run GUI
+    		try {
+				MainWindow mw = new MainWindow(aDriver);
+			} catch (InstantiationException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-			System.exit(0);
-		}
-		
-	}*/
-	
-    public static void main( String[] args ) 
-    {
+    	}
+    	else{
+    		// Exit with error
+        	System.err.println("No driver avalaible for your system. Try as root !");
+        	System.exit(1);
+    	}
+    	
     	
-    	/*app.parseArguments();
-    	new MainWindow();*/
-		/*DriverTypeA device=new Driver_1770_ff00();
-		Driver a=(Driver) device;
-		a.initDriver();
-		device.setRegionColor(Region.LEFT, Color.RED, Intensity.HIGH);
-		device.setRegionColor(Region.MIDDLE, Color.ORANGE, Intensity.HIGH);
-		device.setRegionColor(Region.RIGHT, Color.PURPLE, Intensity.HIGH);
-		device.setMode(Mode.WAVE);*/
-    	System.out.println("Parsing... "+ args.length);
-    	ArgsTypeA a=new ArgsTypeA();
-    	Driver aa=new Driver_1770_ff00();
-    	aa.initDriver();
-    	a.applyAndExit(aa, args);
+    
     	
     }
 }