Change project structure and driver modularity

1 files changed, 16 insertions, 6 deletions

diff --git a/src/client/MainWindow.java b/src/client/MainWindow.java
index b60b9ec..1f24f64 100644
--- a/src/client/MainWindow.java
+++ b/src/client/MainWindow.java
@@ -23,16 +23,26 @@ public class MainWindow extends JFrame {
 	private JComboBox<Color> right;
 	private JButton apply=new JButton("Apply");
 	
-	private DriverTypeA keyboard;
+	private DriverTypeA keyboardTypeA;
+	private Class<?> driverType;
+	private DriverManager drvMan=new DriverManager();
 	
 	public MainWindow() throws InstantiationException{
 		this.initUI();
-		this.keyboard=new Device_1770_ff00();
+		Driver drv=drvMan.getDevice();
+		if(drv==null){
+			System.err.println("No driver avalaible (try as root)");
+			System.exit(1);
+		}
+		else{
+			this.driverType=drv.getType();
+			this.keyboardTypeA=(DriverTypeA) drv;
+		}
+		
 		this.left=new JComboBox<>(Color.values());
 		this.middle=new JComboBox<>(Color.values());
 		this.right=new JComboBox<>(Color.values());
 		
-		
 		this.apply.addActionListener(new ActionListener() {
 			
 			@Override
@@ -41,9 +51,9 @@ public class MainWindow extends JFrame {
 				Color middleRegion=(Color) middle.getSelectedItem();
 				Color rightRegion=(Color) right.getSelectedItem();
 
-				keyboard.setRegionColor(Region.LEFT, leftRegion, Intensity.HIGH);
-				keyboard.setRegionColor(Region.MIDDLE, middleRegion, Intensity.HIGH);
-				keyboard.setRegionColor(Region.RIGHT, rightRegion, Intensity.HIGH);
+				keyboardTypeA.setRegionColor(Region.LEFT, leftRegion, Intensity.HIGH);
+				keyboardTypeA.setRegionColor(Region.MIDDLE, middleRegion, Intensity.HIGH);
+				keyboardTypeA.setRegionColor(Region.RIGHT, rightRegion, Intensity.HIGH);
 
 				
 			}