diff --git a/java/mimis/src/main/java/mimis/exception/WorkerException.java b/java/base/src/main/java/base/exception/WorkerException.java similarity index 81% rename from java/mimis/src/main/java/mimis/exception/WorkerException.java rename to java/base/src/main/java/base/exception/WorkerException.java index 0671ab0..10a0701 100644 --- a/java/mimis/src/main/java/mimis/exception/WorkerException.java +++ b/java/base/src/main/java/base/exception/WorkerException.java @@ -1,4 +1,4 @@ -package mimis.exception; +package base.exception; public class WorkerException extends Exception { protected static final long serialVersionUID = 1L; diff --git a/java/mimis/src/main/java/mimis/exception/worker/ActivateException.java b/java/base/src/main/java/base/exception/worker/ActivateException.java similarity index 61% rename from java/mimis/src/main/java/mimis/exception/worker/ActivateException.java rename to java/base/src/main/java/base/exception/worker/ActivateException.java index a6744c3..158b0a6 100644 --- a/java/mimis/src/main/java/mimis/exception/worker/ActivateException.java +++ b/java/base/src/main/java/base/exception/worker/ActivateException.java @@ -1,6 +1,6 @@ -package mimis.exception.worker; +package base.exception.worker; -import mimis.exception.WorkerException; +import base.exception.WorkerException; public class ActivateException extends WorkerException { protected static final long serialVersionUID = 1L; diff --git a/java/mimis/src/main/java/mimis/exception/worker/AlreadyActiveException.java b/java/base/src/main/java/base/exception/worker/AlreadyActiveException.java similarity index 62% rename from java/mimis/src/main/java/mimis/exception/worker/AlreadyActiveException.java rename to java/base/src/main/java/base/exception/worker/AlreadyActiveException.java index eabf91e..8c594a7 100644 --- a/java/mimis/src/main/java/mimis/exception/worker/AlreadyActiveException.java +++ b/java/base/src/main/java/base/exception/worker/AlreadyActiveException.java @@ -1,6 +1,6 @@ -package mimis.exception.worker; +package base.exception.worker; -import mimis.exception.WorkerException; +import base.exception.WorkerException; public class AlreadyActiveException extends WorkerException { protected static final long serialVersionUID = 1L; diff --git a/java/mimis/src/main/java/mimis/exception/worker/AlreadyRunningException.java b/java/base/src/main/java/base/exception/worker/AlreadyRunningException.java similarity index 62% rename from java/mimis/src/main/java/mimis/exception/worker/AlreadyRunningException.java rename to java/base/src/main/java/base/exception/worker/AlreadyRunningException.java index e7ff85f..3a92fc3 100644 --- a/java/mimis/src/main/java/mimis/exception/worker/AlreadyRunningException.java +++ b/java/base/src/main/java/base/exception/worker/AlreadyRunningException.java @@ -1,6 +1,6 @@ -package mimis.exception.worker; +package base.exception.worker; -import mimis.exception.WorkerException; +import base.exception.WorkerException; public class AlreadyRunningException extends WorkerException { protected static final long serialVersionUID = 1L; diff --git a/java/mimis/src/main/java/mimis/exception/worker/DeactivateException.java b/java/base/src/main/java/base/exception/worker/DeactivateException.java similarity index 61% rename from java/mimis/src/main/java/mimis/exception/worker/DeactivateException.java rename to java/base/src/main/java/base/exception/worker/DeactivateException.java index fcb4dc7..d5bf7fa 100644 --- a/java/mimis/src/main/java/mimis/exception/worker/DeactivateException.java +++ b/java/base/src/main/java/base/exception/worker/DeactivateException.java @@ -1,6 +1,6 @@ -package mimis.exception.worker; +package base.exception.worker; -import mimis.exception.WorkerException; +import base.exception.WorkerException; public class DeactivateException extends WorkerException { protected static final long serialVersionUID = 1L; diff --git a/java/mimis/src/main/java/mimis/exception/worker/NotActiveException.java b/java/base/src/main/java/base/exception/worker/NotActiveException.java similarity index 61% rename from java/mimis/src/main/java/mimis/exception/worker/NotActiveException.java rename to java/base/src/main/java/base/exception/worker/NotActiveException.java index 07b2491..9d97bff 100644 --- a/java/mimis/src/main/java/mimis/exception/worker/NotActiveException.java +++ b/java/base/src/main/java/base/exception/worker/NotActiveException.java @@ -1,6 +1,6 @@ -package mimis.exception.worker; +package base.exception.worker; -import mimis.exception.WorkerException; +import base.exception.WorkerException; public class NotActiveException extends WorkerException { protected static final long serialVersionUID = 1L; diff --git a/java/mimis/src/main/java/mimis/exception/worker/NotRunningException.java b/java/base/src/main/java/base/exception/worker/NotRunningException.java similarity index 62% rename from java/mimis/src/main/java/mimis/exception/worker/NotRunningException.java rename to java/base/src/main/java/base/exception/worker/NotRunningException.java index 51e0ef4..9859322 100644 --- a/java/mimis/src/main/java/mimis/exception/worker/NotRunningException.java +++ b/java/base/src/main/java/base/exception/worker/NotRunningException.java @@ -1,6 +1,6 @@ -package mimis.exception.worker; +package base.exception.worker; -import mimis.exception.WorkerException; +import base.exception.WorkerException; public class NotRunningException extends WorkerException { protected static final long serialVersionUID = 1L; diff --git a/java/mimis/src/main/java/mimis/exception/worker/StartException.java b/java/base/src/main/java/base/exception/worker/StartException.java similarity index 61% rename from java/mimis/src/main/java/mimis/exception/worker/StartException.java rename to java/base/src/main/java/base/exception/worker/StartException.java index 2e74a34..6f52162 100644 --- a/java/mimis/src/main/java/mimis/exception/worker/StartException.java +++ b/java/base/src/main/java/base/exception/worker/StartException.java @@ -1,6 +1,6 @@ -package mimis.exception.worker; +package base.exception.worker; -import mimis.exception.WorkerException; +import base.exception.WorkerException; public class StartException extends WorkerException { protected static final long serialVersionUID = 1L; diff --git a/java/mimis/src/main/java/mimis/worker/IntervalWorker.java b/java/base/src/main/java/base/worker/IntervalWorker.java similarity index 93% rename from java/mimis/src/main/java/mimis/worker/IntervalWorker.java rename to java/base/src/main/java/base/worker/IntervalWorker.java index 0fe2087..a98066b 100644 --- a/java/mimis/src/main/java/mimis/worker/IntervalWorker.java +++ b/java/base/src/main/java/base/worker/IntervalWorker.java @@ -1,10 +1,10 @@ -package mimis.worker; +package base.worker; import java.util.Timer; import java.util.TimerTask; -import mimis.exception.worker.ActivateException; -import mimis.exception.worker.DeactivateException; +import base.exception.worker.ActivateException; +import base.exception.worker.DeactivateException; public class IntervalWorker extends Worker { protected static final boolean THREAD = true; diff --git a/java/mimis/src/main/java/mimis/worker/Listener.java b/java/base/src/main/java/base/worker/Listener.java similarity index 97% rename from java/mimis/src/main/java/mimis/worker/Listener.java rename to java/base/src/main/java/base/worker/Listener.java index 695d288..86cff8f 100644 --- a/java/mimis/src/main/java/mimis/worker/Listener.java +++ b/java/base/src/main/java/base/worker/Listener.java @@ -1,4 +1,4 @@ -package mimis.worker; +package base.worker; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/java/mimis/src/main/java/mimis/worker/Worker.java b/java/base/src/main/java/base/worker/Worker.java similarity index 95% rename from java/mimis/src/main/java/mimis/worker/Worker.java rename to java/base/src/main/java/base/worker/Worker.java index 4b948e1..8def0d5 100644 --- a/java/mimis/src/main/java/mimis/worker/Worker.java +++ b/java/base/src/main/java/base/worker/Worker.java @@ -1,11 +1,11 @@ -package mimis.worker; - -import mimis.exception.worker.ActivateException; -import mimis.exception.worker.DeactivateException; +package base.worker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import base.exception.worker.ActivateException; +import base.exception.worker.DeactivateException; + public abstract class Worker implements Runnable { protected Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/java/mimis/src/main/java/base/worker/Component.java b/java/mimis/src/main/java/mimis/Component.java similarity index 98% rename from java/mimis/src/main/java/base/worker/Component.java rename to java/mimis/src/main/java/mimis/Component.java index f4d72e6..740e436 100644 --- a/java/mimis/src/main/java/base/worker/Component.java +++ b/java/mimis/src/main/java/mimis/Component.java @@ -1,5 +1,6 @@ -package base.worker; +package mimis; +import base.worker.Listener; import mimis.input.Button; import mimis.input.Feedback; import mimis.input.Input; diff --git a/java/mimis/src/main/java/mimis/Gui.java b/java/mimis/src/main/java/mimis/Gui.java index 5e75825..89c2637 100644 --- a/java/mimis/src/main/java/mimis/Gui.java +++ b/java/mimis/src/main/java/mimis/Gui.java @@ -9,7 +9,6 @@ import javax.swing.JPanel; import javax.swing.WindowConstants; import base.exception.worker.ActivateException; -import base.worker.Component; import mimis.input.Feedback; import mimis.input.Input; import mimis.manager.ButtonManager; diff --git a/java/mimis/src/main/java/mimis/Main.java b/java/mimis/src/main/java/mimis/Main.java index 5b0d97a..7d6a1a4 100644 --- a/java/mimis/src/main/java/mimis/Main.java +++ b/java/mimis/src/main/java/mimis/Main.java @@ -7,7 +7,6 @@ import javax.swing.UIManager; import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; -import base.worker.Component; import mimis.input.Task; import mimis.manager.ButtonManager; import mimis.manager.CurrentButtonManager; diff --git a/java/mimis/src/main/java/mimis/Mimis.java b/java/mimis/src/main/java/mimis/Mimis.java index b939812..28d1320 100644 --- a/java/mimis/src/main/java/mimis/Mimis.java +++ b/java/mimis/src/main/java/mimis/Mimis.java @@ -2,7 +2,6 @@ package mimis; import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; -import base.worker.Component; import mimis.input.Feedback; import mimis.input.Task; import mimis.manager.Manager; diff --git a/java/mimis/src/main/java/mimis/application/cmd/CMDApplication.java b/java/mimis/src/main/java/mimis/application/cmd/CMDApplication.java index 3343b20..8090da6 100644 --- a/java/mimis/src/main/java/mimis/application/cmd/CMDApplication.java +++ b/java/mimis/src/main/java/mimis/application/cmd/CMDApplication.java @@ -5,7 +5,7 @@ import java.util.Map; import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; -import base.worker.Component; +import mimis.Component; import mimis.application.Application; import mimis.util.Native; import mimis.value.Registry; diff --git a/java/mimis/src/main/java/mimis/application/itunes/iTunesApplication.java b/java/mimis/src/main/java/mimis/application/itunes/iTunesApplication.java index ca91e96..ba86fb7 100644 --- a/java/mimis/src/main/java/mimis/application/itunes/iTunesApplication.java +++ b/java/mimis/src/main/java/mimis/application/itunes/iTunesApplication.java @@ -1,10 +1,10 @@ package mimis.application.itunes; +import mimis.Component; import mimis.application.Application; import mimis.value.Action; import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; -import base.worker.Component; import base.worker.Worker; import com.dt.iTunesController.ITCOMDisabledReason; diff --git a/java/mimis/src/main/java/mimis/application/lirc/LircApplication.java b/java/mimis/src/main/java/mimis/application/lirc/LircApplication.java index 60a4bd3..18356e0 100644 --- a/java/mimis/src/main/java/mimis/application/lirc/LircApplication.java +++ b/java/mimis/src/main/java/mimis/application/lirc/LircApplication.java @@ -2,7 +2,7 @@ package mimis.application.lirc; import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; -import base.worker.Component; +import mimis.Component; import mimis.application.Application; import mimis.device.lirc.LircButton; import mimis.device.lirc.LircService; diff --git a/java/mimis/src/main/java/mimis/application/robot/RobotApplication.java b/java/mimis/src/main/java/mimis/application/robot/RobotApplication.java index 9bd1125..dc04f2f 100644 --- a/java/mimis/src/main/java/mimis/application/robot/RobotApplication.java +++ b/java/mimis/src/main/java/mimis/application/robot/RobotApplication.java @@ -4,7 +4,7 @@ import java.awt.AWTException; import java.awt.Robot; import base.exception.worker.ActivateException; -import base.worker.Component; +import mimis.Component; import mimis.value.Key; public class RobotApplication extends Component { diff --git a/java/mimis/src/main/java/mimis/device/javainput/JavaInputDevice.java b/java/mimis/src/main/java/mimis/device/javainput/JavaInputDevice.java index 3dec704..f6f49e4 100644 --- a/java/mimis/src/main/java/mimis/device/javainput/JavaInputDevice.java +++ b/java/mimis/src/main/java/mimis/device/javainput/JavaInputDevice.java @@ -2,7 +2,7 @@ package mimis.device.javainput; import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; -import base.worker.Component; +import mimis.Component; import mimis.device.Device; import mimis.exception.ButtonException; import mimis.exception.button.UnknownButtonException; diff --git a/java/mimis/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java b/java/mimis/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java index 980991c..4518fd6 100644 --- a/java/mimis/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java +++ b/java/mimis/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java @@ -2,6 +2,7 @@ package mimis.device.jintellitype; import java.util.ArrayList; +import mimis.Component; import mimis.device.Device; import mimis.exception.button.UnknownButtonException; import mimis.input.state.Press; @@ -9,7 +10,6 @@ import mimis.input.state.Release; import mimis.value.Action; import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; -import base.worker.Component; import com.melloware.jintellitype.HotkeyListener; import com.melloware.jintellitype.IntellitypeListener; 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 49da257..49e3ef3 100644 --- a/java/mimis/src/main/java/mimis/device/network/NetworkDevice.java +++ b/java/mimis/src/main/java/mimis/device/network/NetworkDevice.java @@ -11,8 +11,8 @@ import java.util.concurrent.ConcurrentLinkedQueue; import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; -import base.worker.Component; import base.worker.Worker; +import mimis.Component; import mimis.device.Device; import mimis.input.Feedback; import mimis.input.Input; diff --git a/java/mimis/src/main/java/mimis/device/panel/PanelDevice.java b/java/mimis/src/main/java/mimis/device/panel/PanelDevice.java index fe47884..bfa64d0 100644 --- a/java/mimis/src/main/java/mimis/device/panel/PanelDevice.java +++ b/java/mimis/src/main/java/mimis/device/panel/PanelDevice.java @@ -2,7 +2,7 @@ package mimis.device.panel; import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; -import base.worker.Component; +import mimis.Component; import mimis.device.Device; import mimis.input.state.Press; import mimis.input.state.Release; diff --git a/java/mimis/src/main/java/mimis/device/wiimote/WiimoteDevice.java b/java/mimis/src/main/java/mimis/device/wiimote/WiimoteDevice.java index 839b6a9..0e6c6e3 100644 --- a/java/mimis/src/main/java/mimis/device/wiimote/WiimoteDevice.java +++ b/java/mimis/src/main/java/mimis/device/wiimote/WiimoteDevice.java @@ -1,5 +1,6 @@ package mimis.device.wiimote; +import mimis.Component; import mimis.device.Device; import mimis.device.wiimote.gesture.GestureDevice; import mimis.device.wiimote.motion.MotionDevice; @@ -23,7 +24,6 @@ import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; -import base.worker.Component; import base.worker.Worker; public class WiimoteDevice extends Component implements Device, GestureListener { diff --git a/java/mimis/src/main/java/mimis/device/wiimote/motion/MotionDevice.java b/java/mimis/src/main/java/mimis/device/wiimote/motion/MotionDevice.java index bb947dc..85ccafd 100644 --- a/java/mimis/src/main/java/mimis/device/wiimote/motion/MotionDevice.java +++ b/java/mimis/src/main/java/mimis/device/wiimote/motion/MotionDevice.java @@ -10,8 +10,8 @@ import java.util.ArrayList; import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; -import base.worker.Component; import base.worker.Worker; +import mimis.Component; import mimis.device.lirc.LircButton; import mimis.device.lirc.remote.PhiliphsRCLE011Button; import mimis.device.wiimote.WiimoteDevice; diff --git a/java/mimis/src/main/java/mimis/input/state/State.java b/java/mimis/src/main/java/mimis/input/state/State.java index 2a12d37..d542c81 100644 --- a/java/mimis/src/main/java/mimis/input/state/State.java +++ b/java/mimis/src/main/java/mimis/input/state/State.java @@ -1,6 +1,6 @@ package mimis.input.state; -import base.worker.Component; +import mimis.Component; import mimis.input.Button; import mimis.input.Input; import mimis.input.state.State; diff --git a/java/mimis/src/main/java/mimis/manager/CurrentButtonManager.java b/java/mimis/src/main/java/mimis/manager/CurrentButtonManager.java index 8185c77..4c234ed 100644 --- a/java/mimis/src/main/java/mimis/manager/CurrentButtonManager.java +++ b/java/mimis/src/main/java/mimis/manager/CurrentButtonManager.java @@ -13,8 +13,8 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.border.TitledBorder; -import base.worker.Component; import base.worker.Worker; +import mimis.Component; import mimis.input.Task; import mimis.router.Router; import mimis.util.ArrayCycle; diff --git a/java/mimis/src/main/java/mimis/manager/WorkerButton.java b/java/mimis/src/main/java/mimis/manager/WorkerButton.java index a620488..5cf4341 100644 --- a/java/mimis/src/main/java/mimis/manager/WorkerButton.java +++ b/java/mimis/src/main/java/mimis/manager/WorkerButton.java @@ -5,10 +5,11 @@ import java.awt.event.MouseListener; import javax.swing.JToggleButton; +import mimis.Component; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import base.worker.Component; import base.worker.Worker; public class WorkerButton extends JToggleButton implements MouseListener { diff --git a/java/mimis/src/main/java/mimis/parser/Parser.java b/java/mimis/src/main/java/mimis/parser/Parser.java index 8263235..ef72c45 100644 --- a/java/mimis/src/main/java/mimis/parser/Parser.java +++ b/java/mimis/src/main/java/mimis/parser/Parser.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map.Entry; import base.exception.worker.ActivateException; -import base.worker.Component; +import mimis.Component; import mimis.input.Input; import mimis.input.Task; import mimis.input.state.State; diff --git a/java/mimis/src/main/java/mimis/parser/ParserInput.java b/java/mimis/src/main/java/mimis/parser/ParserInput.java index ef4fc15..623ab68 100644 --- a/java/mimis/src/main/java/mimis/parser/ParserInput.java +++ b/java/mimis/src/main/java/mimis/parser/ParserInput.java @@ -1,6 +1,6 @@ package mimis.parser; -import base.worker.Component; +import mimis.Component; import mimis.input.Input; import mimis.state.TaskMap; import mimis.value.Action; diff --git a/java/mimis/src/main/java/mimis/router/Router.java b/java/mimis/src/main/java/mimis/router/Router.java index 9d0b282..ca5f842 100644 --- a/java/mimis/src/main/java/mimis/router/Router.java +++ b/java/mimis/src/main/java/mimis/router/Router.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map.Entry; -import base.worker.Component; +import mimis.Component; import mimis.Main; import mimis.application.Application; import mimis.device.Device;