Move part of exec.mimis into core.mimis, correct most compile errors

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'	
 }

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 <http://www.gnu.org/licenses/>.
  */
+
 package mimis.application.cmd.windows.lightroom;
 
 import mimis.application.cmd.windows.WindowsApplication;

java/application.lirc/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+	compile project(':device.lirc')
+}

java/core.legacy/sources.txt

@@ -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

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'	
+}

java/core.mimis/src/main/java/mimis/Component.java

@@ -0,0 +1,148 @@
+/**
+ * Copyright (C) 2015 Rik Veenboer <rik.veenboer@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+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<Input> {
+    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<? extends Input> clazz) {
+        if (router == null) {
+            logger.error("Router not set");
+        } else {
+            router.listen(this, clazz);
+        }
+    }
+
+    public void ignore(Class<? extends Input> 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));
+    }
+}

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)";
 

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));

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 <http://www.gnu.org/licenses/>.
  */
-package extra;
+package mimis.input;
 
 import mimis.input.Input;
 import mimis.value.Action;

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<Component, ArrayList<Class<? extends Input>>> listenMap;
 
     public Router() {
@@ -79,19 +76,5 @@ public class Router extends Component {
         }
     }
 
-    protected boolean target(Task task, Component component) {
+    protected abstract 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;
-        }
-    }
 }

java/core.mimis/src/main/java/mimis/value/Target.java

@@ -0,0 +1,5 @@
+package mimis.value;
+
+public enum Target {
+	MAIN, CURRENT, SELF, ALL
+}