Merge remote-tracking branch 'origin/develop' into sound

java/mimis/.classpath

@@ -5,6 +5,7 @@
 	<classpathentry exported="true" kind="src" path="/itunescontroller"/>
 	<classpathentry exported="true" kind="src" path="/wiigee"/>
 	<classpathentry exported="true" kind="src" path="/wiiusej"/>
+	<classpathentry kind="lib" path="libs/jxinput.jar"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
 	<classpathentry kind="output" path="bin"/>

java/mimis/build.gradle

@@ -6,7 +6,7 @@ dependencies {
 	compile project(':wiigee')
 
 	//compile files('lib/jxinput.jar')
-	compile fileTree(dir: 'lib', include: '*.jar')
+	compile fileTree(dir: 'libs', include: '*.jar')
 
 	compile 'commons-collections:commons-collections:3.+'
 	compile 'org.slf4j:slf4j-api:1.+'

java/mimis/src/main/java/mimis/device/network/NetworkDevice.java

@@ -20,14 +20,10 @@ import mimis.value.Target;
 import mimis.worker.Component;
 import mimis.worker.Worker;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 public class NetworkDevice extends Component implements Device {
     protected static final String TITLE = "Network";
     public static final int PORT = 6789;
 
-    protected Log log = LogFactory.getLog(NetworkDevice.class);
     protected Server server;
     protected ConcurrentLinkedQueue<Client> clientList;
 

java/mimis/src/main/java/mimis/device/panel/Panel.java

@@ -14,12 +14,13 @@ import mimis.util.swing.HoldButton;
 import mimis.util.swing.HoldButtonListener;
 import mimis.util.swing.ToggleButton;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 
 public class Panel extends JFrame implements HoldButtonListener {
     protected static final long serialVersionUID = 1L;
-    protected Log log = LogFactory.getLog(getClass());
+
+    protected Logger logger = LoggerFactory.getLogger(getClass());
     protected final static String TITLE = "MIMIS Panel Device";
 
     protected PanelDevice panelDevice;
@@ -173,7 +174,7 @@ public class Panel extends JFrame implements HoldButtonListener {
 
     protected void processWindowEvent(WindowEvent event) {
         if (event.getID() == WindowEvent.WINDOW_CLOSING) {
-            log.debug("Window closing");
+            logger.debug("Window closing");
             panelDevice.stop();
         }
     }

java/mimis/src/main/java/mimis/device/wiimote/WiimoteService.java

@@ -5,8 +5,8 @@ import java.util.HashMap;
 
 import mimis.exception.device.DeviceNotFoundException;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 
 import wiiusej.WiiUseApiManager;
 import wiiusej.Wiimote;
@@ -28,7 +28,7 @@ import wiiusej.wiiusejevents.wiiuseapievents.NunchukRemovedEvent;
 import wiiusej.wiiusejevents.wiiuseapievents.StatusEvent;
 
 public class WiimoteService extends WiiUseApiManager implements WiimoteListener {
-    protected Log log = LogFactory.getLog(getClass());
+    protected Logger logger = LoggerFactory.getLogger(getClass());
     
     /*public static void main(String[] args) {
         Log log = LogFactory.getLog(WiimoteService.class);
@@ -113,7 +113,7 @@ public class WiimoteService extends WiiUseApiManager implements WiimoteListener
     public void onClassicControllerRemovedEvent(ClassicControllerRemovedEvent event) {}
 
     public void onBalanceBoardInsertedEvent(BalanceBoardInsertedEvent e) {
-        log.debug(e);        
+        logger.debug("", e);        
     }
 
     public void onBalanceBoardRemovedEvent(BalanceBoardRemovedEvent e) {

java/mimis/src/main/java/mimis/manager/WorkerButton.java

@@ -8,12 +8,12 @@ import javax.swing.JToggleButton;
 import mimis.worker.Component;
 import mimis.worker.Worker;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 
 public class WorkerButton extends JToggleButton implements MouseListener {
     protected static final long serialVersionUID = 1L;
-    protected Log log = LogFactory.getLog(getClass());
+    protected Logger logger = LoggerFactory.getLogger(getClass());
 
     protected Worker worker;
 
@@ -28,10 +28,10 @@ public class WorkerButton extends JToggleButton implements MouseListener {
 
     public void mouseClicked(MouseEvent event) {
         if (worker.active()) {
-            log.trace("Stop");
+            logger.trace("Stop");
             worker.stop();
         } else {
-            log.trace("Start");
+            logger.trace("Start");
             worker.start();
         }        
     }

java/mimis/src/main/java/mimis/state/TaskMapCycle.java

@@ -1,14 +1,13 @@
 package mimis.state;
 
 import mimis.input.Input;
-import mimis.state.TaskMap;
 import mimis.util.ArrayCycle;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 
 public class TaskMapCycle extends ArrayCycle<TaskMap> implements Input {
     protected static final long serialVersionUID = 1L;
     
-    protected Log log = LogFactory.getLog(getClass());
+    protected Logger logger = LoggerFactory.getLogger(getClass());
 }