From d7a7b179f3727b6b30f5111bff56ca22c21bb405 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Wed, 31 Jul 2013 11:27:57 +0200 Subject: [PATCH] changed last occurrences of log4j to slf4j --- java/mimis/.classpath | 1 + java/mimis/build.gradle | 2 +- java/mimis/{lib => libs}/jxinput.jar | Bin .../java/mimis/device/network/NetworkDevice.java | 4 ---- .../src/main/java/mimis/device/panel/Panel.java | 9 +++++---- .../java/mimis/device/wiimote/WiimoteService.java | 8 ++++---- .../src/main/java/mimis/manager/WorkerButton.java | 10 +++++----- .../src/main/java/mimis/state/TaskMapCycle.java | 7 +++---- 8 files changed, 19 insertions(+), 22 deletions(-) rename java/mimis/{lib => libs}/jxinput.jar (100%) diff --git a/java/mimis/.classpath b/java/mimis/.classpath index c80843f..f306fbf 100644 --- a/java/mimis/.classpath +++ b/java/mimis/.classpath @@ -5,6 +5,7 @@ + diff --git a/java/mimis/build.gradle b/java/mimis/build.gradle index bcbae14..3e21f84 100644 --- a/java/mimis/build.gradle +++ b/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.+' diff --git a/java/mimis/lib/jxinput.jar b/java/mimis/libs/jxinput.jar similarity index 100% rename from java/mimis/lib/jxinput.jar rename to java/mimis/libs/jxinput.jar diff --git a/java/mimis/src/main/java/mimis/device/network/NetworkDevice.java b/java/mimis/src/main/java/mimis/device/network/NetworkDevice.java index cde2b3b..cfce8cb 100644 --- a/java/mimis/src/main/java/mimis/device/network/NetworkDevice.java +++ b/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 clientList; diff --git a/java/mimis/src/main/java/mimis/device/panel/Panel.java b/java/mimis/src/main/java/mimis/device/panel/Panel.java index bda48e9..6715c34 100644 --- a/java/mimis/src/main/java/mimis/device/panel/Panel.java +++ b/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.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +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(); } } diff --git a/java/mimis/src/main/java/mimis/device/wiimote/WiimoteService.java b/java/mimis/src/main/java/mimis/device/wiimote/WiimoteService.java index 6a1c2aa..53d4fbf 100644 --- a/java/mimis/src/main/java/mimis/device/wiimote/WiimoteService.java +++ b/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.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +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) { diff --git a/java/mimis/src/main/java/mimis/manager/WorkerButton.java b/java/mimis/src/main/java/mimis/manager/WorkerButton.java index 1f18628..961a0f4 100644 --- a/java/mimis/src/main/java/mimis/manager/WorkerButton.java +++ b/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.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +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(); } } diff --git a/java/mimis/src/main/java/mimis/state/TaskMapCycle.java b/java/mimis/src/main/java/mimis/state/TaskMapCycle.java index 576c724..73081fa 100644 --- a/java/mimis/src/main/java/mimis/state/TaskMapCycle.java +++ b/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.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TaskMapCycle extends ArrayCycle implements Input { protected static final long serialVersionUID = 1L; - protected Log log = LogFactory.getLog(getClass()); + protected Logger logger = LoggerFactory.getLogger(getClass()); }