diff --git a/java/application.lightroom/build.gradle b/java/application.lightroom/build.gradle index 753ca2a..8dec091 100644 --- a/java/application.lightroom/build.gradle +++ b/java/application.lightroom/build.gradle @@ -1,3 +1,7 @@ dependencies { + compile project(':core.mimis') + compile 'com.github.boukefalos:jlibwinapi:0.1' + + compile 'org.slf4j:slf4j-log4j12:1.7.7' } \ No newline at end of file diff --git a/java/exec.mimis/src/main/java/mimis/application/cmd/windows/lightroom/LightroomApplication.java b/java/application.lightroom/src/main/java/mimis/application/cmd/windows/lightroom/LightroomApplication.java similarity index 96% rename from java/exec.mimis/src/main/java/mimis/application/cmd/windows/lightroom/LightroomApplication.java rename to java/application.lightroom/src/main/java/mimis/application/cmd/windows/lightroom/LightroomApplication.java index b839d74..59e5c60 100644 --- a/java/exec.mimis/src/main/java/mimis/application/cmd/windows/lightroom/LightroomApplication.java +++ b/java/application.lightroom/src/main/java/mimis/application/cmd/windows/lightroom/LightroomApplication.java @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package mimis.application.cmd.windows.lightroom; import mimis.application.cmd.windows.WindowsApplication; diff --git a/java/application.lirc/build.gradle b/java/application.lirc/build.gradle new file mode 100644 index 0000000..43c27ed --- /dev/null +++ b/java/application.lirc/build.gradle @@ -0,0 +1,3 @@ +dependencies { + compile project(':device.lirc') +} \ No newline at end of file diff --git a/java/exec.mimis/src/main/java/mimis/application/lirc/LircApplication.java b/java/application.lirc/src/main/java/mimis/application/lirc/LircApplication.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/lirc/LircApplication.java rename to java/application.lirc/src/main/java/mimis/application/lirc/LircApplication.java diff --git a/java/exec.mimis/src/main/java/mimis/application/lirc/ipod/iPodApplication.java b/java/application.lirc/src/main/java/mimis/application/lirc/ipod/iPodApplication.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/lirc/ipod/iPodApplication.java rename to java/application.lirc/src/main/java/mimis/application/lirc/ipod/iPodApplication.java diff --git a/java/core.legacy/sources.txt b/java/core.legacy/sources.txt deleted file mode 100644 index 5995f29..0000000 --- a/java/core.legacy/sources.txt +++ /dev/null @@ -1,79 +0,0 @@ -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\module-info.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\Control.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\Duplex.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\Forwarder.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\Receiver.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\Sender.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\exception\LoaderException.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\exception\WorkerException.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\exception\worker\ActivateException.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\exception\worker\AlreadyActiveException.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\exception\worker\AlreadyRunningException.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\exception\worker\DeactivateException.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\exception\worker\NotActiveException.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\exception\worker\NotRunningException.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\exception\worker\StartException.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\loader\AbstractLoader.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\channel\TcpClient.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\channel\TcpServer.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\channel\TcpServerClient.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\datagram\AbstractUdpClient.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\datagram\UdpDuplexAutoClient.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\datagram\UdpDuplexClient.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\datagram\UdpDuplexHelper.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\datagram\UdpDuplexServer.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\datagram\UdpMulticastClient.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\datagram\UdpMulticastServer.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\datagram\UdpSender.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\datagram\UdpServer.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\forwarder\TcpChannelServerForwarder.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\forwarder\TcpClientChannelForwarder.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\forwarder\TcpClientSocketForwarder.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\forwarder\TcpSocketServerForwarder.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\forwarder\UdpDuplexClientForwarder.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\forwarder\UdpDuplexServerForwarder.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\forwarder\UdpServerForwarder.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\receiver\AbstractReceiver.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\socket\AbstractTcpClient.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\socket\TcpClient.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\socket\TcpServer.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\server\socket\TcpServerClient.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\util\ArrayCycle.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\util\Buffer.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\util\Bufferable.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\util\BufferedArrayCycle.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\util\Dummy.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\work\Listen.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\work\ReflectiveListen.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\work\Work.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\BackgroundListener.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\DirectIntervalWorker.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\DirectWorker.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\ForegroundListener.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\IntervalWork.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\ThreadIntervalWorker.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\ThreadWorker.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\Worker.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\pool\Listener.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\pool\ListenerPool.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\pool\ListenerPoolRunnable.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\pool\PooledListener.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\pool\PooledWorker.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\pool\WorkerPool.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\pool\WorkerPoolRunnable.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\main\java\base\worker\pool\Wrapper.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\junit\AllTests.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\junit\TestTcpChannelCommunication.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\junit\TestTcpSocketCommunication.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\junit\TestUdpDuplexCommunication.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\junit\TestUdpMulticastCommunication.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\junit\TestUdpUnicastCommunication.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\test\Test.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\worker\TestDirectWork.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\worker\TestIntervalWork.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\worker\TestListen.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\worker\TestPooledListen.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\worker\TestPooledWork.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\worker\dummy\DummyIntervalWork.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\worker\dummy\DummyListen.java -C:\Users\Rik\Git\github\mimis\java\core.legacy\src\test\java\worker\dummy\DummyWork.java diff --git a/java/core.mimis/build.gradle b/java/core.mimis/build.gradle new file mode 100644 index 0000000..e3f6fc4 --- /dev/null +++ b/java/core.mimis/build.gradle @@ -0,0 +1,12 @@ +dependencies { + compile project(':core.legacy') + + compile 'com.github.boukefalos:jlibmimis:0.1' + compile 'com.github.boukefalos:jlibxinput:1.0' + compile 'com.github.boukefalos:jlibitunes:0.3' + compile 'com.github.boukefalos:jlibintellitype:1.3.9' + + compile 'org.slf4j:slf4j-log4j12:1.7.7' + compile 'org.picocontainer:picocontainer:2.15' + compile 'junit:junit:4.12' +} \ No newline at end of file diff --git a/java/core.mimis/src/main/java/mimis/Component.java b/java/core.mimis/src/main/java/mimis/Component.java new file mode 100644 index 0000000..9fd74de --- /dev/null +++ b/java/core.mimis/src/main/java/mimis/Component.java @@ -0,0 +1,148 @@ +/** + * Copyright (C) 2015 Rik Veenboer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package mimis; + +import mimis.input.Button; +import mimis.input.Feedback; +import mimis.input.Input; +import mimis.input.Task; +import mimis.input.state.Press; +import mimis.input.state.Release; +import mimis.input.state.State; +import mimis.parser.ParserInput; +import mimis.router.Router; +import mimis.state.TaskMap; +import mimis.value.Action; +import base.work.Listen; +import base.worker.Worker; +import base.worker.Worker.Type; + +public abstract class Component extends Listen { + protected static final String TITLE = "Component"; + + protected String title; + protected Router router; + + public Component() { + this(TITLE); + } + + public Component(Type type) { + super(type); + } + + public Component(String title) { + super(Worker.Type.BACKGROUND); + this.title = title; + } + + public void setRouter(Router router) { + this.router = router; + } + + public String getTitle() { + return title; + } + + public void listen(Class clazz) { + if (router == null) { + logger.error("Router not set"); + } else { + router.listen(this, clazz); + } + } + + public void ignore(Class clazz) { + if (router == null) { + logger.error("Router not set"); + } else { + router.ignore(this, clazz); + } + } + + public void route(Input input) { + if (router == null) { + logger.error("Router not set"); + } else { + if (input instanceof State) { + State state = (State) input; + if (state.getComponent() == null) { + state.setComponent(this); + } + } + router.add(input); + } + } + + public void input(Input input) { + if (input instanceof State) { + state((State) input); + } else if (input instanceof Task) { + task((Task) input); + } else if (input instanceof Feedback) { + feedback((Feedback) input); + } + } + + protected void state(State state) { + Button button = state.getButton(); + if (state instanceof Press) { + press(button); + } else if (state instanceof Release) { + release(button); + } + } + + protected void task(Task task) { + Action action = task.getAction(); + switch (task.getSignal()) { + case BEGIN: + switch (action) { + case START: + start(); + break; + case STOP: + stop(); + break; + case EXIT: + exit(); + break; + default: + begin(action); + break; + } + break; + case END: + end(action); + break; + default: + action(action); + break; + } + } + + protected void press(Button button) {} + protected void release(Button button) {} + protected void feedback(Feedback feedback) {} + protected void action(Action action) {} + protected void begin(Action action) {} + protected void end(Action action) {} + + protected void parser(Action action, TaskMap taskMap) { + route(new ParserInput(action, taskMap)); + } +} diff --git a/java/exec.mimis/src/main/java/mimis/application/Application.java b/java/core.mimis/src/main/java/mimis/application/Application.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/Application.java rename to java/core.mimis/src/main/java/mimis/application/Application.java diff --git a/java/exec.mimis/src/main/java/mimis/application/cmd/CMDApplication.java b/java/core.mimis/src/main/java/mimis/application/cmd/CMDApplication.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/cmd/CMDApplication.java rename to java/core.mimis/src/main/java/mimis/application/cmd/CMDApplication.java diff --git a/java/exec.mimis/src/main/java/mimis/application/cmd/windows/WindowsApplication.java b/java/core.mimis/src/main/java/mimis/application/cmd/windows/WindowsApplication.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/cmd/windows/WindowsApplication.java rename to java/core.mimis/src/main/java/mimis/application/cmd/windows/WindowsApplication.java diff --git a/java/exec.mimis/src/main/java/mimis/application/cmd/windows/gomplayer/GomPlayerApplication.java b/java/core.mimis/src/main/java/mimis/application/cmd/windows/gomplayer/GomPlayerApplication.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/cmd/windows/gomplayer/GomPlayerApplication.java rename to java/core.mimis/src/main/java/mimis/application/cmd/windows/gomplayer/GomPlayerApplication.java diff --git a/java/exec.mimis/src/main/java/mimis/application/cmd/windows/photoviewer/PhotoViewerApplication.java b/java/core.mimis/src/main/java/mimis/application/cmd/windows/photoviewer/PhotoViewerApplication.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/cmd/windows/photoviewer/PhotoViewerApplication.java rename to java/core.mimis/src/main/java/mimis/application/cmd/windows/photoviewer/PhotoViewerApplication.java diff --git a/java/exec.mimis/src/main/java/mimis/application/cmd/windows/winamp/WinampApplication.java b/java/core.mimis/src/main/java/mimis/application/cmd/windows/winamp/WinampApplication.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/cmd/windows/winamp/WinampApplication.java rename to java/core.mimis/src/main/java/mimis/application/cmd/windows/winamp/WinampApplication.java diff --git a/java/exec.mimis/src/main/java/mimis/application/cmd/windows/wmp/WMPApplication.java b/java/core.mimis/src/main/java/mimis/application/cmd/windows/wmp/WMPApplication.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/cmd/windows/wmp/WMPApplication.java rename to java/core.mimis/src/main/java/mimis/application/cmd/windows/wmp/WMPApplication.java diff --git a/java/exec.mimis/src/main/java/mimis/application/itunes/iTunesApplication.java b/java/core.mimis/src/main/java/mimis/application/itunes/iTunesApplication.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/itunes/iTunesApplication.java rename to java/core.mimis/src/main/java/mimis/application/itunes/iTunesApplication.java diff --git a/java/exec.mimis/src/main/java/mimis/application/mpc/MPCApplication.java b/java/core.mimis/src/main/java/mimis/application/mpc/MPCApplication.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/mpc/MPCApplication.java rename to java/core.mimis/src/main/java/mimis/application/mpc/MPCApplication.java diff --git a/java/exec.mimis/src/main/java/mimis/application/robot/RobotApplication.java b/java/core.mimis/src/main/java/mimis/application/robot/RobotApplication.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/robot/RobotApplication.java rename to java/core.mimis/src/main/java/mimis/application/robot/RobotApplication.java diff --git a/java/exec.mimis/src/main/java/mimis/application/vlc/VLCApplication.java b/java/core.mimis/src/main/java/mimis/application/vlc/VLCApplication.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/application/vlc/VLCApplication.java rename to java/core.mimis/src/main/java/mimis/application/vlc/VLCApplication.java diff --git a/java/exec.mimis/src/main/java/mimis/device/Device.java b/java/core.mimis/src/main/java/mimis/device/Device.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/Device.java rename to java/core.mimis/src/main/java/mimis/device/Device.java diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/DirectionButton.java b/java/core.mimis/src/main/java/mimis/device/javainput/DirectionButton.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/javainput/DirectionButton.java rename to java/core.mimis/src/main/java/mimis/device/javainput/DirectionButton.java diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/JXInputTestDialog.java b/java/core.mimis/src/main/java/mimis/device/javainput/JXInputTestDialog.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/javainput/JXInputTestDialog.java rename to java/core.mimis/src/main/java/mimis/device/javainput/JXInputTestDialog.java diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/JavaInputDevice.java b/java/core.mimis/src/main/java/mimis/device/javainput/JavaInputDevice.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/javainput/JavaInputDevice.java rename to java/core.mimis/src/main/java/mimis/device/javainput/JavaInputDevice.java diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/JavaInputListener.java b/java/core.mimis/src/main/java/mimis/device/javainput/JavaInputListener.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/javainput/JavaInputListener.java rename to java/core.mimis/src/main/java/mimis/device/javainput/JavaInputListener.java diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/extreme3d/Extreme3DButton.java b/java/core.mimis/src/main/java/mimis/device/javainput/extreme3d/Extreme3DButton.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/javainput/extreme3d/Extreme3DButton.java rename to java/core.mimis/src/main/java/mimis/device/javainput/extreme3d/Extreme3DButton.java diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/extreme3d/Extreme3DDevice.java b/java/core.mimis/src/main/java/mimis/device/javainput/extreme3d/Extreme3DDevice.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/javainput/extreme3d/Extreme3DDevice.java rename to java/core.mimis/src/main/java/mimis/device/javainput/extreme3d/Extreme3DDevice.java diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/extreme3d/Extreme3DTaskMapCycle.java b/java/core.mimis/src/main/java/mimis/device/javainput/extreme3d/Extreme3DTaskMapCycle.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/javainput/extreme3d/Extreme3DTaskMapCycle.java rename to java/core.mimis/src/main/java/mimis/device/javainput/extreme3d/Extreme3DTaskMapCycle.java diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/rumblepad/RumblepadButton.java b/java/core.mimis/src/main/java/mimis/device/javainput/rumblepad/RumblepadButton.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/javainput/rumblepad/RumblepadButton.java rename to java/core.mimis/src/main/java/mimis/device/javainput/rumblepad/RumblepadButton.java diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/rumblepad/RumblepadDevice.java b/java/core.mimis/src/main/java/mimis/device/javainput/rumblepad/RumblepadDevice.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/javainput/rumblepad/RumblepadDevice.java rename to java/core.mimis/src/main/java/mimis/device/javainput/rumblepad/RumblepadDevice.java diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/rumblepad/RumblepadTaskMapCycle.java b/java/core.mimis/src/main/java/mimis/device/javainput/rumblepad/RumblepadTaskMapCycle.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/javainput/rumblepad/RumblepadTaskMapCycle.java rename to java/core.mimis/src/main/java/mimis/device/javainput/rumblepad/RumblepadTaskMapCycle.java diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360Button.java b/java/core.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360Button.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360Button.java rename to java/core.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360Button.java diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360Device.java b/java/core.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360Device.java similarity index 88% rename from java/exec.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360Device.java rename to java/core.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360Device.java index c7677af..f3d69e9 100644 --- a/java/exec.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360Device.java +++ b/java/core.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360Device.java @@ -16,26 +16,17 @@ */ package mimis.device.javainput.xbox360; +import base.exception.worker.ActivateException; +import de.hardcode.jxinput.event.JXInputButtonEvent; +import de.hardcode.jxinput.event.JXInputDirectionalEvent; import mimis.device.javainput.DirectionButton; import mimis.device.javainput.JavaInputDevice; import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownDirectionException; import mimis.input.Button; -import mimis.router.Router; import mimis.value.Action; -import base.exception.worker.ActivateException; -import de.hardcode.jxinput.event.JXInputButtonEvent; -import de.hardcode.jxinput.event.JXInputDirectionalEvent; public class Xbox360Device extends JavaInputDevice { - public static void main(String[] args) { - Xbox360Device device = new Xbox360Device(); - Router router = new Router(); - router.start(); - device.setRouter(router); - device.start(); - } - protected static final String TITLE = "Xbox360"; protected static final String NAME = "Controller (XBOX 360 For Windows)"; diff --git a/java/exec.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360TaskMapCycle.java b/java/core.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360TaskMapCycle.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360TaskMapCycle.java rename to java/core.mimis/src/main/java/mimis/device/javainput/xbox360/Xbox360TaskMapCycle.java diff --git a/java/exec.mimis/src/main/java/mimis/device/jintellitype/CommandButton.java b/java/core.mimis/src/main/java/mimis/device/jintellitype/CommandButton.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/jintellitype/CommandButton.java rename to java/core.mimis/src/main/java/mimis/device/jintellitype/CommandButton.java diff --git a/java/exec.mimis/src/main/java/mimis/device/jintellitype/Hotkey.java b/java/core.mimis/src/main/java/mimis/device/jintellitype/Hotkey.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/jintellitype/Hotkey.java rename to java/core.mimis/src/main/java/mimis/device/jintellitype/Hotkey.java diff --git a/java/exec.mimis/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java b/java/core.mimis/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java rename to java/core.mimis/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java diff --git a/java/exec.mimis/src/main/java/mimis/device/jintellitype/JIntellitypeTaskMapCycle.java b/java/core.mimis/src/main/java/mimis/device/jintellitype/JIntellitypeTaskMapCycle.java similarity index 94% rename from java/exec.mimis/src/main/java/mimis/device/jintellitype/JIntellitypeTaskMapCycle.java rename to java/core.mimis/src/main/java/mimis/device/jintellitype/JIntellitypeTaskMapCycle.java index f524f05..48ff3a5 100644 --- a/java/exec.mimis/src/main/java/mimis/device/jintellitype/JIntellitypeTaskMapCycle.java +++ b/java/core.mimis/src/main/java/mimis/device/jintellitype/JIntellitypeTaskMapCycle.java @@ -43,10 +43,10 @@ public class JIntellitypeTaskMapCycle extends TaskMapCycle { player = new TaskMap(); player.add( CommandButton.VOLUME_DOWN, - new Task(Action.VOLUME_DOWN, Target.APPLICATIONS)); + new Task(Action.VOLUME_DOWN, Target.CURRENT)); player.add( CommandButton.VOLUME_UP, - new Task(Action.VOLUME_UP, Target.APPLICATIONS)); + new Task(Action.VOLUME_UP, Target.CURRENT)); player.add( new Hotkey(Modifier.CTRL | Modifier.WIN, 'x'), new Task(Action.EXIT, Target.MAIN)); diff --git a/java/exec.mimis/src/main/java/mimis/device/jintellitype/Modifier.java b/java/core.mimis/src/main/java/mimis/device/jintellitype/Modifier.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/jintellitype/Modifier.java rename to java/core.mimis/src/main/java/mimis/device/jintellitype/Modifier.java diff --git a/java/exec.mimis/src/main/java/mimis/device/network/NetworkDevice.java b/java/core.mimis/src/main/java/mimis/device/network/NetworkDevice.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/device/network/NetworkDevice.java rename to java/core.mimis/src/main/java/mimis/device/network/NetworkDevice.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/ApplicationException.java b/java/core.mimis/src/main/java/mimis/exception/ApplicationException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/ApplicationException.java rename to java/core.mimis/src/main/java/mimis/exception/ApplicationException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/ButtonException.java b/java/core.mimis/src/main/java/mimis/exception/ButtonException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/ButtonException.java rename to java/core.mimis/src/main/java/mimis/exception/ButtonException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/DeviceException.java b/java/core.mimis/src/main/java/mimis/exception/DeviceException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/DeviceException.java rename to java/core.mimis/src/main/java/mimis/exception/DeviceException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/EventException.java b/java/core.mimis/src/main/java/mimis/exception/EventException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/EventException.java rename to java/core.mimis/src/main/java/mimis/exception/EventException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/ExitException.java b/java/core.mimis/src/main/java/mimis/exception/ExitException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/ExitException.java rename to java/core.mimis/src/main/java/mimis/exception/ExitException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/HandlerException.java b/java/core.mimis/src/main/java/mimis/exception/HandlerException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/HandlerException.java rename to java/core.mimis/src/main/java/mimis/exception/HandlerException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/InitialiseException.java b/java/core.mimis/src/main/java/mimis/exception/InitialiseException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/InitialiseException.java rename to java/core.mimis/src/main/java/mimis/exception/InitialiseException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/MacroException.java b/java/core.mimis/src/main/java/mimis/exception/MacroException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/MacroException.java rename to java/core.mimis/src/main/java/mimis/exception/MacroException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/TaskException.java b/java/core.mimis/src/main/java/mimis/exception/TaskException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/TaskException.java rename to java/core.mimis/src/main/java/mimis/exception/TaskException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/application/ApplicationExitException.java b/java/core.mimis/src/main/java/mimis/exception/application/ApplicationExitException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/application/ApplicationExitException.java rename to java/core.mimis/src/main/java/mimis/exception/application/ApplicationExitException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/application/ApplicationInitialiseException.java b/java/core.mimis/src/main/java/mimis/exception/application/ApplicationInitialiseException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/application/ApplicationInitialiseException.java rename to java/core.mimis/src/main/java/mimis/exception/application/ApplicationInitialiseException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/application/windows/WindowsApplicationException.java b/java/core.mimis/src/main/java/mimis/exception/application/windows/WindowsApplicationException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/application/windows/WindowsApplicationException.java rename to java/core.mimis/src/main/java/mimis/exception/application/windows/WindowsApplicationException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/button/UnknownButtonException.java b/java/core.mimis/src/main/java/mimis/exception/button/UnknownButtonException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/button/UnknownButtonException.java rename to java/core.mimis/src/main/java/mimis/exception/button/UnknownButtonException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/button/UnknownDirectionException.java b/java/core.mimis/src/main/java/mimis/exception/button/UnknownDirectionException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/button/UnknownDirectionException.java rename to java/core.mimis/src/main/java/mimis/exception/button/UnknownDirectionException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/device/DeviceExitException.java b/java/core.mimis/src/main/java/mimis/exception/device/DeviceExitException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/device/DeviceExitException.java rename to java/core.mimis/src/main/java/mimis/exception/device/DeviceExitException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/device/DeviceInitialiseException.java b/java/core.mimis/src/main/java/mimis/exception/device/DeviceInitialiseException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/device/DeviceInitialiseException.java rename to java/core.mimis/src/main/java/mimis/exception/device/DeviceInitialiseException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/device/DeviceNotFoundException.java b/java/core.mimis/src/main/java/mimis/exception/device/DeviceNotFoundException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/device/DeviceNotFoundException.java rename to java/core.mimis/src/main/java/mimis/exception/device/DeviceNotFoundException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/device/JavaInputDeviceException.java b/java/core.mimis/src/main/java/mimis/exception/device/JavaInputDeviceException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/device/JavaInputDeviceException.java rename to java/core.mimis/src/main/java/mimis/exception/device/JavaInputDeviceException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/device/javainput/JavaInputDeviceSpecificException.java b/java/core.mimis/src/main/java/mimis/exception/device/javainput/JavaInputDeviceSpecificException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/device/javainput/JavaInputDeviceSpecificException.java rename to java/core.mimis/src/main/java/mimis/exception/device/javainput/JavaInputDeviceSpecificException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/event/SpreaderException.java b/java/core.mimis/src/main/java/mimis/exception/event/SpreaderException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/event/SpreaderException.java rename to java/core.mimis/src/main/java/mimis/exception/event/SpreaderException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/event/router/GlobalRouterException.java b/java/core.mimis/src/main/java/mimis/exception/event/router/GlobalRouterException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/event/router/GlobalRouterException.java rename to java/core.mimis/src/main/java/mimis/exception/event/router/GlobalRouterException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/macro/StateOrderException.java b/java/core.mimis/src/main/java/mimis/exception/macro/StateOrderException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/macro/StateOrderException.java rename to java/core.mimis/src/main/java/mimis/exception/macro/StateOrderException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/task/ActionException.java b/java/core.mimis/src/main/java/mimis/exception/task/ActionException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/task/ActionException.java rename to java/core.mimis/src/main/java/mimis/exception/task/ActionException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/task/TaskNotSupportedException.java b/java/core.mimis/src/main/java/mimis/exception/task/TaskNotSupportedException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/task/TaskNotSupportedException.java rename to java/core.mimis/src/main/java/mimis/exception/task/TaskNotSupportedException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/task/action/ActionDeserializeException.java b/java/core.mimis/src/main/java/mimis/exception/task/action/ActionDeserializeException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/task/action/ActionDeserializeException.java rename to java/core.mimis/src/main/java/mimis/exception/task/action/ActionDeserializeException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/util/SendCommandException.java b/java/core.mimis/src/main/java/mimis/exception/util/SendCommandException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/util/SendCommandException.java rename to java/core.mimis/src/main/java/mimis/exception/util/SendCommandException.java diff --git a/java/exec.mimis/src/main/java/mimis/exception/util/SendKeyException.java b/java/core.mimis/src/main/java/mimis/exception/util/SendKeyException.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/exception/util/SendKeyException.java rename to java/core.mimis/src/main/java/mimis/exception/util/SendKeyException.java diff --git a/java/exec.mimis/src/main/java/mimis/input/Button.java b/java/core.mimis/src/main/java/mimis/input/Button.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/input/Button.java rename to java/core.mimis/src/main/java/mimis/input/Button.java diff --git a/java/exec.mimis/src/main/java/mimis/input/Feedback.java b/java/core.mimis/src/main/java/mimis/input/Feedback.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/input/Feedback.java rename to java/core.mimis/src/main/java/mimis/input/Feedback.java diff --git a/java/exec.mimis/src/main/java/mimis/input/Input.java b/java/core.mimis/src/main/java/mimis/input/Input.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/input/Input.java rename to java/core.mimis/src/main/java/mimis/input/Input.java diff --git a/java/exec.connected/src/main/java/extra/Task.java b/java/core.mimis/src/main/java/mimis/input/Task.java similarity index 95% rename from java/exec.connected/src/main/java/extra/Task.java rename to java/core.mimis/src/main/java/mimis/input/Task.java index c584d62..50687bf 100644 --- a/java/exec.connected/src/main/java/extra/Task.java +++ b/java/core.mimis/src/main/java/mimis/input/Task.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package extra; +package mimis.input; import mimis.input.Input; import mimis.value.Action; diff --git a/java/exec.mimis/src/main/java/mimis/input/button/ColorButton.java b/java/core.mimis/src/main/java/mimis/input/button/ColorButton.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/input/button/ColorButton.java rename to java/core.mimis/src/main/java/mimis/input/button/ColorButton.java diff --git a/java/exec.mimis/src/main/java/mimis/input/button/NumberButton.java b/java/core.mimis/src/main/java/mimis/input/button/NumberButton.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/input/button/NumberButton.java rename to java/core.mimis/src/main/java/mimis/input/button/NumberButton.java diff --git a/java/exec.mimis/src/main/java/mimis/input/state/Hold.java b/java/core.mimis/src/main/java/mimis/input/state/Hold.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/input/state/Hold.java rename to java/core.mimis/src/main/java/mimis/input/state/Hold.java diff --git a/java/exec.mimis/src/main/java/mimis/input/state/Press.java b/java/core.mimis/src/main/java/mimis/input/state/Press.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/input/state/Press.java rename to java/core.mimis/src/main/java/mimis/input/state/Press.java diff --git a/java/exec.mimis/src/main/java/mimis/input/state/Release.java b/java/core.mimis/src/main/java/mimis/input/state/Release.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/input/state/Release.java rename to java/core.mimis/src/main/java/mimis/input/state/Release.java diff --git a/java/exec.mimis/src/main/java/mimis/input/state/State.java b/java/core.mimis/src/main/java/mimis/input/state/State.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/input/state/State.java rename to java/core.mimis/src/main/java/mimis/input/state/State.java diff --git a/java/exec.mimis/src/main/java/mimis/input/state/sequence/Macro.java b/java/core.mimis/src/main/java/mimis/input/state/sequence/Macro.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/input/state/sequence/Macro.java rename to java/core.mimis/src/main/java/mimis/input/state/sequence/Macro.java diff --git a/java/exec.mimis/src/main/java/mimis/input/state/sequence/Sequence.java b/java/core.mimis/src/main/java/mimis/input/state/sequence/Sequence.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/input/state/sequence/Sequence.java rename to java/core.mimis/src/main/java/mimis/input/state/sequence/Sequence.java diff --git a/java/exec.mimis/src/main/java/mimis/parser/Parser.java b/java/core.mimis/src/main/java/mimis/parser/Parser.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/parser/Parser.java rename to java/core.mimis/src/main/java/mimis/parser/Parser.java diff --git a/java/exec.mimis/src/main/java/mimis/parser/ParserInput.java b/java/core.mimis/src/main/java/mimis/parser/ParserInput.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/parser/ParserInput.java rename to java/core.mimis/src/main/java/mimis/parser/ParserInput.java diff --git a/java/exec.mimis/src/main/java/mimis/router/Router.java b/java/core.mimis/src/main/java/mimis/router/Router.java similarity index 81% rename from java/exec.mimis/src/main/java/mimis/router/Router.java rename to java/core.mimis/src/main/java/mimis/router/Router.java index 1632b61..f36b9a3 100644 --- a/java/exec.mimis/src/main/java/mimis/router/Router.java +++ b/java/core.mimis/src/main/java/mimis/router/Router.java @@ -21,13 +21,10 @@ import java.util.HashMap; import java.util.Map.Entry; import mimis.Component; -import mimis.Main; -import mimis.application.Application; -import mimis.device.Device; import mimis.input.Input; import mimis.input.Task; -public class Router extends Component { +public abstract class Router extends Component { protected HashMap>> listenMap; public Router() { @@ -79,19 +76,5 @@ public class Router extends Component { } } - protected boolean target(Task task, Component component) { - switch (task.getTarget()) { - case ALL: - return true; - case MAIN: - case CURRENT: - return component instanceof Main; - case DEVICES: - return component instanceof Device; - case APPLICATIONS: - return component instanceof Application; - default: - return false; - } - } + protected abstract boolean target(Task task, Component component); } diff --git a/java/exec.mimis/src/main/java/mimis/state/Active.java b/java/core.mimis/src/main/java/mimis/state/Active.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/state/Active.java rename to java/core.mimis/src/main/java/mimis/state/Active.java diff --git a/java/exec.mimis/src/main/java/mimis/state/TaskMap.java b/java/core.mimis/src/main/java/mimis/state/TaskMap.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/state/TaskMap.java rename to java/core.mimis/src/main/java/mimis/state/TaskMap.java diff --git a/java/exec.mimis/src/main/java/mimis/state/TaskMapCycle.java b/java/core.mimis/src/main/java/mimis/state/TaskMapCycle.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/state/TaskMapCycle.java rename to java/core.mimis/src/main/java/mimis/state/TaskMapCycle.java diff --git a/java/exec.mimis/src/main/java/mimis/util/Multiplexer.java b/java/core.mimis/src/main/java/mimis/util/Multiplexer.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/util/Multiplexer.java rename to java/core.mimis/src/main/java/mimis/util/Multiplexer.java diff --git a/java/exec.mimis/src/main/java/mimis/util/Reader.java b/java/core.mimis/src/main/java/mimis/util/Reader.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/util/Reader.java rename to java/core.mimis/src/main/java/mimis/util/Reader.java diff --git a/java/exec.mimis/src/main/java/mimis/util/Swing.java b/java/core.mimis/src/main/java/mimis/util/Swing.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/util/Swing.java rename to java/core.mimis/src/main/java/mimis/util/Swing.java diff --git a/java/exec.mimis/src/main/java/mimis/util/Type.java b/java/core.mimis/src/main/java/mimis/util/Type.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/util/Type.java rename to java/core.mimis/src/main/java/mimis/util/Type.java diff --git a/java/exec.mimis/src/main/java/mimis/util/multiplexer/SignalListener.java b/java/core.mimis/src/main/java/mimis/util/multiplexer/SignalListener.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/util/multiplexer/SignalListener.java rename to java/core.mimis/src/main/java/mimis/util/multiplexer/SignalListener.java diff --git a/java/exec.mimis/src/main/java/mimis/util/swing/CycleButton.java b/java/core.mimis/src/main/java/mimis/util/swing/CycleButton.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/util/swing/CycleButton.java rename to java/core.mimis/src/main/java/mimis/util/swing/CycleButton.java diff --git a/java/exec.mimis/src/main/java/mimis/util/swing/Dialog.java b/java/core.mimis/src/main/java/mimis/util/swing/Dialog.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/util/swing/Dialog.java rename to java/core.mimis/src/main/java/mimis/util/swing/Dialog.java diff --git a/java/exec.mimis/src/main/java/mimis/util/swing/HoldButton.java b/java/core.mimis/src/main/java/mimis/util/swing/HoldButton.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/util/swing/HoldButton.java rename to java/core.mimis/src/main/java/mimis/util/swing/HoldButton.java diff --git a/java/exec.mimis/src/main/java/mimis/util/swing/HoldButtonListener.java b/java/core.mimis/src/main/java/mimis/util/swing/HoldButtonListener.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/util/swing/HoldButtonListener.java rename to java/core.mimis/src/main/java/mimis/util/swing/HoldButtonListener.java diff --git a/java/exec.mimis/src/main/java/mimis/util/swing/ToggleButton.java b/java/core.mimis/src/main/java/mimis/util/swing/ToggleButton.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/util/swing/ToggleButton.java rename to java/core.mimis/src/main/java/mimis/util/swing/ToggleButton.java diff --git a/java/exec.mimis/src/main/java/mimis/value/Action.java b/java/core.mimis/src/main/java/mimis/value/Action.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/value/Action.java rename to java/core.mimis/src/main/java/mimis/value/Action.java diff --git a/java/exec.mimis/src/main/java/mimis/value/Amount.java b/java/core.mimis/src/main/java/mimis/value/Amount.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/value/Amount.java rename to java/core.mimis/src/main/java/mimis/value/Amount.java diff --git a/java/exec.mimis/src/main/java/mimis/value/Command.java b/java/core.mimis/src/main/java/mimis/value/Command.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/value/Command.java rename to java/core.mimis/src/main/java/mimis/value/Command.java diff --git a/java/exec.mimis/src/main/java/mimis/value/Key.java b/java/core.mimis/src/main/java/mimis/value/Key.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/value/Key.java rename to java/core.mimis/src/main/java/mimis/value/Key.java diff --git a/java/exec.mimis/src/main/java/mimis/value/Signal.java b/java/core.mimis/src/main/java/mimis/value/Signal.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/value/Signal.java rename to java/core.mimis/src/main/java/mimis/value/Signal.java diff --git a/java/core.mimis/src/main/java/mimis/value/Target.java b/java/core.mimis/src/main/java/mimis/value/Target.java new file mode 100644 index 0000000..cd4f42a --- /dev/null +++ b/java/core.mimis/src/main/java/mimis/value/Target.java @@ -0,0 +1,5 @@ +package mimis.value; + +public enum Target { + MAIN, CURRENT, SELF, ALL +} diff --git a/java/exec.mimis/src/main/java/mimis/value/Type.java b/java/core.mimis/src/main/java/mimis/value/Type.java similarity index 100% rename from java/exec.mimis/src/main/java/mimis/value/Type.java rename to java/core.mimis/src/main/java/mimis/value/Type.java diff --git a/java/device.lirc/build.gradle b/java/device.lirc/build.gradle index 039bcdb..d581106 100644 --- a/java/device.lirc/build.gradle +++ b/java/device.lirc/build.gradle @@ -1,4 +1,6 @@ dependencies { compile project(':core.legacy') - compile project(':exec.mimis') + compile project(':core.mimis') + + compile 'com.github.boukefalos:jlibmimis:0.1' } \ No newline at end of file diff --git a/java/device.wiimote/build.gradle b/java/device.wiimote/build.gradle index fa68d6b..72ee848 100644 --- a/java/device.wiimote/build.gradle +++ b/java/device.wiimote/build.gradle @@ -1,5 +1,9 @@ dependencies { compile project(':core.legacy') - compile project(':exec.mimis') + compile project(':core.mimis') compile project(':device.lirc') + + compile 'com.github.boukefalos:jlibwiiuse:0.13' + + compile 'org.wiigee:wiigee:1.5.6' } \ No newline at end of file diff --git a/java/device.wiimote/src/main/java/mimis/device/wiimote/WiimoteService.java b/java/device.wiimote/src/main/java/mimis/device/wiimote/WiimoteService.java index 9b87b2a..35f79be 100644 --- a/java/device.wiimote/src/main/java/mimis/device/wiimote/WiimoteService.java +++ b/java/device.wiimote/src/main/java/mimis/device/wiimote/WiimoteService.java @@ -32,6 +32,8 @@ import wiiusej.wiiusejevents.physicalevents.IREvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -125,12 +127,6 @@ public class WiimoteService extends WiiUseApiManager implements WiimoteListener public void onGuitarHeroRemovedEvent(GuitarHeroRemovedEvent event) {} public void onClassicControllerInsertedEvent(ClassicControllerInsertedEvent event) {} public void onClassicControllerRemovedEvent(ClassicControllerRemovedEvent event) {} - - /*public void onBalanceBoardInsertedEvent(BalanceBoardInsertedEvent e) { - logger.debug("", e); - } - - public void onBalanceBoardRemovedEvent(BalanceBoardRemovedEvent e) { - - }*/ + public void onBalanceBoardInsertedEvent(BalanceBoardInsertedEvent event) {} + public void onBalanceBoardRemovedEvent(BalanceBoardRemovedEvent event) {} } diff --git a/java/exec.connected/build.gradle b/java/exec.connected/build.gradle index af3d95c..b18b4e3 100644 --- a/java/exec.connected/build.gradle +++ b/java/exec.connected/build.gradle @@ -1,5 +1,7 @@ dependencies { compile project(':core.legacy') + compile project(':core.mimis') + compile project(':device.lirc') compile project(':exec.mimis') compile 'com.esotericsoftware.yamlbeans:yamlbeans:1.09' diff --git a/java/exec.connected/src/main/java/extra/LircTaskMapCycle.java b/java/exec.connected/src/main/java/extra/LircTaskMapCycle.java index f188084..b623df0 100644 --- a/java/exec.connected/src/main/java/extra/LircTaskMapCycle.java +++ b/java/exec.connected/src/main/java/extra/LircTaskMapCycle.java @@ -19,9 +19,8 @@ package extra; import map.DenonRC176EventMap; import map.PhiliphsRCLE011EventMap; import map.SamsungBN5901015AEventMap; - -import com.github.boukefalos.lirc.state.TaskMap; -import com.github.boukefalos.lirc.state.TaskMapCycle; +import mimis.state.TaskMap; +import mimis.state.TaskMapCycle; public class LircTaskMapCycle extends TaskMapCycle { protected static final long serialVersionUID = 1L; @@ -29,8 +28,8 @@ public class LircTaskMapCycle extends TaskMapCycle { public TaskMap denonRC176, philiphsRCLE011, samsungBN5901015A; public LircTaskMapCycle() { - register(denonRC176 = new DenonRC176EventMap()); - register(philiphsRCLE011 = new PhiliphsRCLE011EventMap()); - register(samsungBN5901015A = new SamsungBN5901015AEventMap()); + add(denonRC176 = new DenonRC176EventMap()); + add(philiphsRCLE011 = new PhiliphsRCLE011EventMap()); + add(samsungBN5901015A = new SamsungBN5901015AEventMap()); } } \ No newline at end of file diff --git a/java/exec.connected/src/main/java/map/DenonRC176EventMap.java b/java/exec.connected/src/main/java/map/DenonRC176EventMap.java index 62f9192..d28d29b 100644 --- a/java/exec.connected/src/main/java/map/DenonRC176EventMap.java +++ b/java/exec.connected/src/main/java/map/DenonRC176EventMap.java @@ -18,7 +18,7 @@ package map; import com.github.boukefalos.lirc.button.remote.DenonRC176Button; -import extra.Task; +import mimis.input.Task; import mimis.state.TaskMap; import mimis.value.Action; import mimis.value.Target; @@ -28,23 +28,23 @@ public class DenonRC176EventMap extends TaskMap { public DenonRC176EventMap() { /* Mimis */ - receive(DenonRC176Button.TUNER_UP, new Task(Action.NEXT, Target.MAIN)); - receive(DenonRC176Button.TUNER_DOWN, new Task(Action.PREVIOUS, Target.MAIN)); + add(DenonRC176Button.TUNER_UP, new Task(Action.NEXT, Target.MAIN)); + add(DenonRC176Button.TUNER_DOWN, new Task(Action.PREVIOUS, Target.MAIN)); /* Application */ - receive(DenonRC176Button.AMP_POWER, new Task(Action.START, Target.CURRENT)); - receive(DenonRC176Button.CD_NEXT, new Task(Action.NEXT, Target.CURRENT)); - receive(DenonRC176Button.CD_PREVIOUS, new Task(Action.PREVIOUS, Target.CURRENT)); - receive(DenonRC176Button.TAPE_REWIND, new Task(Action.REWIND, Target.CURRENT)); - receive(DenonRC176Button.CD_PLAY, new Task(Action.PLAY, Target.CURRENT)); - receive(DenonRC176Button.CD_PAUSE, new Task(Action.PLAY, Target.CURRENT)); - receive(DenonRC176Button.TAPE_FORWARD, new Task(Action.FORWARD, Target.CURRENT)); - receive(DenonRC176Button.AMP_MUTE, new Task(Action.MUTE, Target.CURRENT)); - receive(DenonRC176Button.AMP_VOLUME_UP, new Task(Action.VOLUME_UP, Target.CURRENT)); - receive(DenonRC176Button.AMP_VOLUME_DOWN, new Task(Action.VOLUME_DOWN, Target.CURRENT)); - receive(DenonRC176Button.CD_REPEAT, new Task(Action.REPEAT, Target.CURRENT)); - receive(DenonRC176Button.CD_SHUFFLE, new Task(Action.SHUFFLE, Target.CURRENT)); - receive(DenonRC176Button.TAPE_AB, new Task(Action.LIKE, Target.CURRENT)); - receive(DenonRC176Button.TAPE_REC, new Task(Action.DISLIKE, Target.CURRENT)); + add(DenonRC176Button.AMP_POWER, new Task(Action.START, Target.CURRENT)); + add(DenonRC176Button.CD_NEXT, new Task(Action.NEXT, Target.CURRENT)); + add(DenonRC176Button.CD_PREVIOUS, new Task(Action.PREVIOUS, Target.CURRENT)); + add(DenonRC176Button.TAPE_REWIND, new Task(Action.REWIND, Target.CURRENT)); + add(DenonRC176Button.CD_PLAY, new Task(Action.PLAY, Target.CURRENT)); + add(DenonRC176Button.CD_PAUSE, new Task(Action.PLAY, Target.CURRENT)); + add(DenonRC176Button.TAPE_FORWARD, new Task(Action.FORWARD, Target.CURRENT)); + add(DenonRC176Button.AMP_MUTE, new Task(Action.MUTE, Target.CURRENT)); + add(DenonRC176Button.AMP_VOLUME_UP, new Task(Action.VOLUME_UP, Target.CURRENT)); + add(DenonRC176Button.AMP_VOLUME_DOWN, new Task(Action.VOLUME_DOWN, Target.CURRENT)); + add(DenonRC176Button.CD_REPEAT, new Task(Action.REPEAT, Target.CURRENT)); + add(DenonRC176Button.CD_SHUFFLE, new Task(Action.SHUFFLE, Target.CURRENT)); + add(DenonRC176Button.TAPE_AB, new Task(Action.LIKE, Target.CURRENT)); + add(DenonRC176Button.TAPE_REC, new Task(Action.DISLIKE, Target.CURRENT)); } } diff --git a/java/exec.connected/src/main/java/map/PhiliphsRCLE011EventMap.java b/java/exec.connected/src/main/java/map/PhiliphsRCLE011EventMap.java index 3f8725e..3228988 100644 --- a/java/exec.connected/src/main/java/map/PhiliphsRCLE011EventMap.java +++ b/java/exec.connected/src/main/java/map/PhiliphsRCLE011EventMap.java @@ -17,34 +17,34 @@ package map; import com.github.boukefalos.lirc.button.remote.PhiliphsRCLE011Button; -import com.github.boukefalos.lirc.state.TaskMap; -import com.github.boukefalos.lirc.value.Action; -import com.github.boukefalos.lirc.value.Target; -import extra.Task; +import mimis.input.Task; +import mimis.state.TaskMap; +import mimis.value.Action; +import mimis.value.Target; public class PhiliphsRCLE011EventMap extends TaskMap { protected static final long serialVersionUID = 1L; public PhiliphsRCLE011EventMap() { /* Mimis */ - receive(PhiliphsRCLE011Button.UP, new Task(Action.NEXT, Target.MAIN)); - receive(PhiliphsRCLE011Button.DOWN, new Task(Action.PREVIOUS, Target.MAIN)); + add(PhiliphsRCLE011Button.UP, new Task(Action.NEXT, Target.MAIN)); + add(PhiliphsRCLE011Button.DOWN, new Task(Action.PREVIOUS, Target.MAIN)); /* Application */ - receive(PhiliphsRCLE011Button.POWER, new Task(Action.START, Target.CURRENT)); - receive(PhiliphsRCLE011Button.PROGRAM_UP, new Task(Action.NEXT, Target.CURRENT)); - receive(PhiliphsRCLE011Button.PROGRAM_DOWN, new Task(Action.PREVIOUS, Target.CURRENT)); - receive(PhiliphsRCLE011Button.LEFT, new Task(Action.REWIND, Target.CURRENT)); - receive(PhiliphsRCLE011Button.TUNE, new Task(Action.PLAY, Target.CURRENT)); - receive(PhiliphsRCLE011Button.RIGHT, new Task(Action.FORWARD, Target.CURRENT)); - receive(PhiliphsRCLE011Button.VOLUME_DOWN, new Task(Action.VOLUME_DOWN, Target.CURRENT)); - receive(PhiliphsRCLE011Button.MUTE, new Task(Action.MUTE, Target.CURRENT)); - receive(PhiliphsRCLE011Button.VOLUME_UP, new Task(Action.VOLUME_UP, Target.CURRENT)); - receive(PhiliphsRCLE011Button.CLOCK, new Task(Action.REPEAT, Target.CURRENT)); - receive(PhiliphsRCLE011Button.OUT, new Task(Action.SHUFFLE, Target.CURRENT)); - receive(PhiliphsRCLE011Button.SQUARE, new Task(Action.FULLSCREEN, Target.CURRENT)); - receive(PhiliphsRCLE011Button.RED, new Task(Action.DISLIKE, Target.CURRENT)); - receive(PhiliphsRCLE011Button.GREEN, new Task(Action.LIKE, Target.CURRENT)); + add(PhiliphsRCLE011Button.POWER, new Task(Action.START, Target.CURRENT)); + add(PhiliphsRCLE011Button.PROGRAM_UP, new Task(Action.NEXT, Target.CURRENT)); + add(PhiliphsRCLE011Button.PROGRAM_DOWN, new Task(Action.PREVIOUS, Target.CURRENT)); + add(PhiliphsRCLE011Button.LEFT, new Task(Action.REWIND, Target.CURRENT)); + add(PhiliphsRCLE011Button.TUNE, new Task(Action.PLAY, Target.CURRENT)); + add(PhiliphsRCLE011Button.RIGHT, new Task(Action.FORWARD, Target.CURRENT)); + add(PhiliphsRCLE011Button.VOLUME_DOWN, new Task(Action.VOLUME_DOWN, Target.CURRENT)); + add(PhiliphsRCLE011Button.MUTE, new Task(Action.MUTE, Target.CURRENT)); + add(PhiliphsRCLE011Button.VOLUME_UP, new Task(Action.VOLUME_UP, Target.CURRENT)); + add(PhiliphsRCLE011Button.CLOCK, new Task(Action.REPEAT, Target.CURRENT)); + add(PhiliphsRCLE011Button.OUT, new Task(Action.SHUFFLE, Target.CURRENT)); + add(PhiliphsRCLE011Button.SQUARE, new Task(Action.FULLSCREEN, Target.CURRENT)); + add(PhiliphsRCLE011Button.RED, new Task(Action.DISLIKE, Target.CURRENT)); + add(PhiliphsRCLE011Button.GREEN, new Task(Action.LIKE, Target.CURRENT)); } } diff --git a/java/exec.connected/src/main/java/map/SamsungBN5901015AEventMap.java b/java/exec.connected/src/main/java/map/SamsungBN5901015AEventMap.java index a3385a6..e5ddfde 100644 --- a/java/exec.connected/src/main/java/map/SamsungBN5901015AEventMap.java +++ b/java/exec.connected/src/main/java/map/SamsungBN5901015AEventMap.java @@ -17,16 +17,16 @@ package map; import com.github.boukefalos.lirc.button.remote.SamsungBN5901015AButton; -import com.github.boukefalos.lirc.state.TaskMap; -import com.github.boukefalos.lirc.value.Action; -import com.github.boukefalos.lirc.value.Target; -import extra.Task; +import mimis.input.Task; +import mimis.state.TaskMap; +import mimis.value.Action; +import mimis.value.Target; public class SamsungBN5901015AEventMap extends TaskMap { protected static final long serialVersionUID = 1L; public SamsungBN5901015AEventMap() { - receive(SamsungBN5901015AButton.VOLUME_UP, new Task(Action.VOLUME_UP, Target.CURRENT)); + add(SamsungBN5901015AButton.VOLUME_UP, new Task(Action.VOLUME_UP, Target.CURRENT)); } } diff --git a/java/exec.mimis/build.gradle b/java/exec.mimis/build.gradle index 738a0bc..b6bc9ac 100644 --- a/java/exec.mimis/build.gradle +++ b/java/exec.mimis/build.gradle @@ -1,17 +1,5 @@ dependencies { - compile project(':device.lirc') - compile project(':core.legacy') - - compile 'com.github.boukefalos:jlibmimis:0.1' - compile 'com.github.boukefalos:jlibitunes:0.3' - compile 'com.github.boukefalos:jlibwiiuse:0.12' - compile 'com.github.boukefalos:jlibintellitype:1.3.9' - compile 'com.github.boukefalos:jlibxinput:1.0' - - compile 'commons-collections:commons-collections:3.+' - compile 'org.slf4j:slf4j-api:1.+' - compile 'org.slf4j:slf4j-log4j12:1.+' - compile 'org.wiigee:wiigee:1.5.6' + compile project(':core.mimis') } buildscript { diff --git a/java/exec.mimis/src/main/java/mimis/Client.java b/java/exec.mimis/src/main/java/mimis/Client.java index 03baa4b..5e46065 100644 --- a/java/exec.mimis/src/main/java/mimis/Client.java +++ b/java/exec.mimis/src/main/java/mimis/Client.java @@ -17,6 +17,9 @@ package mimis; import base.exception.worker.ActivateException; +import mimis.application.Application; +import mimis.device.Device; +import mimis.input.Task; import mimis.router.GlobalRouter; import mimis.util.swing.Dialog; @@ -26,7 +29,23 @@ public class Client extends Main { public Client(String ip, int port) { super(); - router = new GlobalRouter(ip, port); + router = new GlobalRouter(ip, port) { + protected boolean target(Task task, Component component) { + switch (task.getTarget()) { + case ALL: + return true; + case MAIN: + case CURRENT: + return component instanceof Main; + case DEVICES: + return component instanceof Device; + case APPLICATIONS: + return component instanceof Application; + default: + return false; + } + } + }; } public void activate() throws ActivateException { diff --git a/java/exec.mimis/src/main/java/mimis/Mimis.java b/java/exec.mimis/src/main/java/mimis/Mimis.java index bf6974b..7efe647 100644 --- a/java/exec.mimis/src/main/java/mimis/Mimis.java +++ b/java/exec.mimis/src/main/java/mimis/Mimis.java @@ -16,6 +16,8 @@ */ package mimis; +import mimis.application.Application; +import mimis.device.Device; import mimis.input.Feedback; import mimis.input.Task; import mimis.manager.Manager; @@ -39,7 +41,23 @@ public abstract class Mimis extends Component { super(Worker.Type.FOREGROUND); this.currentArray = initialize(false, currentArray); componentCycle = new ArrayCycle(currentArray); - router = new Router(); + router = new Router() { + protected boolean target(Task task, Component component) { + switch (task.getTarget()) { + case ALL: + return true; + case MAIN: + case CURRENT: + return component instanceof Main; + case DEVICES: + return component instanceof Device; + case APPLICATIONS: + return component instanceof Application; + default: + return false; + } + } + }; parser = new Parser(); manager = new Manager(initialize(true, router, parser)); } diff --git a/java/exec.mimis/src/main/java/mimis/input/Task.java b/java/exec.mimis/src/main/java/mimis/input/Task.java deleted file mode 100644 index 55e5447..0000000 --- a/java/exec.mimis/src/main/java/mimis/input/Task.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Copyright (C) 2015 Rik Veenboer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package mimis.input; - -import mimis.value.Action; import mimis.input.Task; - -import mimis.value.Signal; -import mimis.value.Target; - -public class Task implements Input { - protected static final long serialVersionUID = 1L; - - public static final Target TARGET = Target.ALL; - public static final Signal SIGNAL = Signal.NONE; - - protected Target target; - protected Action action; - protected Signal signal; - - public Task(Action action) { - this(action, TARGET); - } - - public Task(Action action, Target target) { - this(action, target, SIGNAL); - } - - public Task(Action action, Target target, Signal signal) { - this.target = target; - this.action = action; - this.signal = signal; - } - - public Target getTarget() { - return target; - } - - public Action getAction() { - return action; - } - - public Signal getSignal() { - return signal; - } - - public Task setSignal(Signal signal) { - return new Task(action, target, signal); - } -} diff --git a/java/exec.mimis/src/main/java/mimis/router/GlobalRouter.java b/java/exec.mimis/src/main/java/mimis/router/GlobalRouter.java index c4dfddf..0bed9e8 100644 --- a/java/exec.mimis/src/main/java/mimis/router/GlobalRouter.java +++ b/java/exec.mimis/src/main/java/mimis/router/GlobalRouter.java @@ -27,7 +27,7 @@ import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; import base.work.Work; -public class GlobalRouter extends Router { +public abstract class GlobalRouter extends Router { protected String ip; protected int port; protected Client client; diff --git a/java/settings.gradle b/java/settings.gradle index aa8e93a..c25edac 100644 --- a/java/settings.gradle +++ b/java/settings.gradle @@ -1,10 +1,12 @@ include ':application.ibuddy' include ':application.itunes' include ':application.lightroom' +include ':application.lirc' include ':core.legacy' include ':core.networking' include ':core.routing' include ':core.worker' +include ':core.mimis' include ':device.lirc' include ':device.wiimote' include ':exec.mimis'