From ac1480d24c147c742f6f7fc5c8262d4a024221a0 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Tue, 22 Feb 2011 22:26:01 +0000 Subject: [PATCH] * pakket value gemaakt voor algemene enums * LanTextClient in eigen pakket client gezet * TextDevice en LanTextDevice nog generieker gemaakt: - standaard thread model toegepast met start en stop methoden - threads verplaatst buiten devices: -- devices zouden run methode uit de task listener overriden -- run methode uit tasklistener final gemaakt --- java/src/pm/Main.java | 7 +-- java/src/pm/Task.java | 3 ++ .../example/ExampleApplication.java | 2 +- .../application/itunes/iTunesApplication.java | 2 +- .../application/winamp/WinampApplication.java | 2 +- .../windows/WindowsApplication.java | 2 + .../gomplayer/GomPlayerApplication.java | 6 +-- .../windows/wmp/WMPApplication.java | 2 +- .../LanTextClient.java | 19 ++++---- java/src/pm/device/example/ExampleDevice.java | 4 +- java/src/pm/device/gui/GUIDeviceUI.java | 4 +- .../javainput/extreme3d/Extreme3DDevice.java | 4 +- .../javainput/rumblepad/RumblepadDevice.java | 4 +- java/src/pm/device/jintellitype/Hotkey.java | 2 +- .../jintellitype/JIntellitypeDevice.java | 6 +-- .../pm/device/lantextinput/LanTextDevice.java | 31 ------------ .../device/lantextinput/LanTextListener.java | 39 --------------- .../InputListener.java} | 27 +++++++---- java/src/pm/device/text/TextDevice.java | 19 ++++++++ .../src/pm/device/text/lan/LanTextDevice.java | 27 +++++++++++ .../pm/device/text/lan/SocketListener.java | 47 +++++++++++++++++++ java/src/pm/device/wiimote/WiimoteDevice.java | 4 +- java/src/pm/task/Continuous.java | 4 +- java/src/pm/task/Dynamic.java | 4 +- java/src/pm/task/TaskListener.java | 4 +- java/src/pm/task/TaskManager.java | 2 +- java/src/pm/todo/TODO | 14 ++++-- java/src/pm/{ => value}/Action.java | 2 +- .../{application/windows => value}/Key.java | 2 +- java/src/pm/{ => value}/Target.java | 2 +- .../{application/windows => value}/Type.java | 2 +- 31 files changed, 172 insertions(+), 127 deletions(-) rename java/src/pm/{device/lantextinput => client}/LanTextClient.java (69%) delete mode 100644 java/src/pm/device/lantextinput/LanTextDevice.java delete mode 100644 java/src/pm/device/lantextinput/LanTextListener.java rename java/src/pm/device/{textinput/TextDevice.java => text/InputListener.java} (65%) create mode 100644 java/src/pm/device/text/TextDevice.java create mode 100644 java/src/pm/device/text/lan/LanTextDevice.java create mode 100644 java/src/pm/device/text/lan/SocketListener.java rename java/src/pm/{ => value}/Action.java (86%) rename java/src/pm/{application/windows => value}/Key.java (94%) rename java/src/pm/{ => value}/Target.java (77%) rename java/src/pm/{application/windows => value}/Type.java (86%) diff --git a/java/src/pm/Main.java b/java/src/pm/Main.java index f33f9a3..2a2339c 100644 --- a/java/src/pm/Main.java +++ b/java/src/pm/Main.java @@ -11,15 +11,16 @@ import pm.application.windows.wmp.WMPApplication; import pm.device.gui.GUIDevice; import pm.device.javainput.rumblepad.RumblepadDevice; import pm.device.jintellitype.JIntellitypeDevice; -import pm.device.lantextinput.LanTextDevice; import pm.device.player.PlayerDevice; -import pm.device.textinput.TextDevice; +import pm.device.text.TextDevice; +import pm.device.text.lan.LanTextDevice; import pm.device.wiimote.WiimoteDevice; import pm.exception.application.ApplicationExitException; import pm.exception.device.DeviceExitException; import pm.exception.device.DeviceInitialiseException; import pm.task.TaskManager; import pm.task.TaskListener; +import pm.value.Action; public class Main extends TaskListener { //protected String[] deviceClassArray; @@ -45,7 +46,7 @@ public class Main extends TaskListener { //add(new RumblepadDevice()); //add(new WiimoteDevice()); //add(new GUIDevice()); - //add(new TextDevice()); + add(new TextDevice()); add(new LanTextDevice()); for (Device device : deviceList) { try { diff --git a/java/src/pm/Task.java b/java/src/pm/Task.java index e426e6f..bda0d5c 100644 --- a/java/src/pm/Task.java +++ b/java/src/pm/Task.java @@ -1,5 +1,8 @@ package pm; +import pm.value.Action; +import pm.value.Target; + public class Task { protected Action action; protected Target target; diff --git a/java/src/pm/application/example/ExampleApplication.java b/java/src/pm/application/example/ExampleApplication.java index 93f52bb..8d9ebb9 100644 --- a/java/src/pm/application/example/ExampleApplication.java +++ b/java/src/pm/application/example/ExampleApplication.java @@ -1,7 +1,7 @@ package pm.application.example; -import pm.Action; import pm.Application; +import pm.value.Action; public class ExampleApplication extends Application { protected void action(Action action) { diff --git a/java/src/pm/application/itunes/iTunesApplication.java b/java/src/pm/application/itunes/iTunesApplication.java index 289af22..1415923 100644 --- a/java/src/pm/application/itunes/iTunesApplication.java +++ b/java/src/pm/application/itunes/iTunesApplication.java @@ -1,8 +1,8 @@ package pm.application.itunes; -import pm.Action; import pm.Application; import pm.exception.application.ApplicationExitException; +import pm.value.Action; import com.dt.iTunesController.ITCOMDisabledReason; import com.dt.iTunesController.ITTrack; diff --git a/java/src/pm/application/winamp/WinampApplication.java b/java/src/pm/application/winamp/WinampApplication.java index 872063f..3bd5b76 100644 --- a/java/src/pm/application/winamp/WinampApplication.java +++ b/java/src/pm/application/winamp/WinampApplication.java @@ -1,9 +1,9 @@ package pm.application.winamp; -import pm.Action; import pm.Application; import pm.exception.application.ApplicationExitException; import pm.exception.application.ApplicationInitialiseException; +import pm.value.Action; import com.qotsa.exception.InvalidHandle; import com.qotsa.exception.InvalidParameter; diff --git a/java/src/pm/application/windows/WindowsApplication.java b/java/src/pm/application/windows/WindowsApplication.java index 04487eb..738e693 100644 --- a/java/src/pm/application/windows/WindowsApplication.java +++ b/java/src/pm/application/windows/WindowsApplication.java @@ -9,6 +9,8 @@ import pm.exception.application.windows.SendCommandException; import pm.exception.application.windows.SendKeyException; import pm.util.Native; import pm.util.Windows; +import pm.value.Key; +import pm.value.Type; import com.eaio.nativecall.IntCall; import com.eaio.nativecall.NativeCall; diff --git a/java/src/pm/application/windows/gomplayer/GomPlayerApplication.java b/java/src/pm/application/windows/gomplayer/GomPlayerApplication.java index 91653c8..7133c21 100644 --- a/java/src/pm/application/windows/gomplayer/GomPlayerApplication.java +++ b/java/src/pm/application/windows/gomplayer/GomPlayerApplication.java @@ -1,12 +1,12 @@ package pm.application.windows.gomplayer; -import pm.Action; import pm.application.windows.Command; -import pm.application.windows.Type; -import pm.application.windows.Key; import pm.application.windows.WindowsApplication; import pm.exception.application.windows.SendCommandException; import pm.exception.application.windows.SendKeyException; +import pm.value.Action; +import pm.value.Key; +import pm.value.Type; public class GomPlayerApplication extends WindowsApplication { protected final static String PROGRAM = "GOM.exe"; diff --git a/java/src/pm/application/windows/wmp/WMPApplication.java b/java/src/pm/application/windows/wmp/WMPApplication.java index 3d9818c..82bc0dd 100644 --- a/java/src/pm/application/windows/wmp/WMPApplication.java +++ b/java/src/pm/application/windows/wmp/WMPApplication.java @@ -1,10 +1,10 @@ package pm.application.windows.wmp; -import pm.Action; import pm.application.windows.Command; import pm.application.windows.WindowsApplication; import pm.exception.application.ApplicationInitialiseException; import pm.exception.application.windows.SendCommandException; +import pm.value.Action; public class WMPApplication extends WindowsApplication { protected final static String PROGRAM = "wmplayer.exe"; diff --git a/java/src/pm/device/lantextinput/LanTextClient.java b/java/src/pm/client/LanTextClient.java similarity index 69% rename from java/src/pm/device/lantextinput/LanTextClient.java rename to java/src/pm/client/LanTextClient.java index ef586fd..b8cc90a 100644 --- a/java/src/pm/device/lantextinput/LanTextClient.java +++ b/java/src/pm/client/LanTextClient.java @@ -1,19 +1,18 @@ -package pm.device.lantextinput; +package pm.client; import java.io.PrintStream; import java.net.Socket; import java.util.Scanner; public class LanTextClient { - static final String HOST = "127.0.0.1"; //localhost + static final String HOST = "127.0.0.1"; // localhost static final int PORT = 1234; - protected boolean run; protected Socket socket; protected Scanner input; protected PrintStream output; - LanTextClient(){ + public LanTextClient(String host, int port) { try { socket = new Socket(HOST, PORT); input = new Scanner(System.in); @@ -22,13 +21,17 @@ public class LanTextClient { e.printStackTrace(); } } - - protected void start(){ - while(run){ + + public LanTextClient() { + this(HOST, PORT); + } + + protected void start() { + while (true) { output.println(input.nextLine()); } } - + public static void main(String[] argv) { new LanTextClient().start(); } diff --git a/java/src/pm/device/example/ExampleDevice.java b/java/src/pm/device/example/ExampleDevice.java index 140927b..86e3ded 100644 --- a/java/src/pm/device/example/ExampleDevice.java +++ b/java/src/pm/device/example/ExampleDevice.java @@ -1,8 +1,8 @@ package pm.device.example; -import pm.Action; import pm.Device; -import pm.Target; +import pm.value.Action; +import pm.value.Target; public class ExampleDevice extends Device { public void initialise() { diff --git a/java/src/pm/device/gui/GUIDeviceUI.java b/java/src/pm/device/gui/GUIDeviceUI.java index 05d5f59..c2e8049 100644 --- a/java/src/pm/device/gui/GUIDeviceUI.java +++ b/java/src/pm/device/gui/GUIDeviceUI.java @@ -5,10 +5,10 @@ import java.awt.event.ActionListener; import javax.swing.JButton; import javax.swing.JFrame; -import pm.Action; -import pm.Target; import pm.Task; import pm.task.TaskManager; +import pm.value.Action; +import pm.value.Target; import layout.TableLayout; import layout.TableLayoutConstraints; diff --git a/java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java b/java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java index 2b92e17..70922b6 100644 --- a/java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java +++ b/java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java @@ -1,9 +1,7 @@ package pm.device.javainput.extreme3d; -import pm.Action; import pm.Button; import pm.Macro; -import pm.Target; import pm.Task; import pm.device.javainput.DirectionButton; import pm.device.javainput.JavaInputDevice; @@ -14,6 +12,8 @@ import pm.exception.event.UnknownDirectionException; import pm.macro.event.Hold; import pm.macro.event.Press; import pm.macro.event.Release; +import pm.value.Action; +import pm.value.Target; import de.hardcode.jxinput.event.JXInputButtonEvent; import de.hardcode.jxinput.event.JXInputDirectionalEvent; diff --git a/java/src/pm/device/javainput/rumblepad/RumblepadDevice.java b/java/src/pm/device/javainput/rumblepad/RumblepadDevice.java index 6ab9b02..9c7c60a 100644 --- a/java/src/pm/device/javainput/rumblepad/RumblepadDevice.java +++ b/java/src/pm/device/javainput/rumblepad/RumblepadDevice.java @@ -1,8 +1,6 @@ package pm.device.javainput.rumblepad; -import pm.Action; import pm.Button; -import pm.Target; import pm.Task; import pm.device.javainput.DirectionButton; import pm.device.javainput.JavaInputDevice; @@ -13,6 +11,8 @@ import pm.macro.event.Hold; import pm.macro.event.Press; import pm.task.Continuous; import pm.task.Dynamic; +import pm.value.Action; +import pm.value.Target; import de.hardcode.jxinput.event.JXInputButtonEvent; import de.hardcode.jxinput.event.JXInputDirectionalEvent; diff --git a/java/src/pm/device/jintellitype/Hotkey.java b/java/src/pm/device/jintellitype/Hotkey.java index 40bf55a..f8189f6 100644 --- a/java/src/pm/device/jintellitype/Hotkey.java +++ b/java/src/pm/device/jintellitype/Hotkey.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import com.melloware.jintellitype.JIntellitype; -import pm.application.windows.Key; import pm.macro.event.Press; +import pm.value.Key; public class Hotkey extends Press { protected static ArrayList hotkeyList; diff --git a/java/src/pm/device/jintellitype/JIntellitypeDevice.java b/java/src/pm/device/jintellitype/JIntellitypeDevice.java index 10fe708..22d4be5 100644 --- a/java/src/pm/device/jintellitype/JIntellitypeDevice.java +++ b/java/src/pm/device/jintellitype/JIntellitypeDevice.java @@ -6,16 +6,16 @@ import com.melloware.jintellitype.HotkeyListener; import com.melloware.jintellitype.IntellitypeListener; import com.melloware.jintellitype.JIntellitype; -import pm.Action; import pm.Device; -import pm.Target; import pm.Task; -import pm.application.windows.Key; import pm.exception.EventException; import pm.exception.device.DeviceInitialiseException; import pm.macro.event.Press; import pm.macro.event.Release; import pm.task.Continuous; +import pm.value.Action; +import pm.value.Key; +import pm.value.Target; public class JIntellitypeDevice extends Device implements HotkeyListener, IntellitypeListener { protected ArrayList hotkeyList; diff --git a/java/src/pm/device/lantextinput/LanTextDevice.java b/java/src/pm/device/lantextinput/LanTextDevice.java deleted file mode 100644 index 22f5f79..0000000 --- a/java/src/pm/device/lantextinput/LanTextDevice.java +++ /dev/null @@ -1,31 +0,0 @@ -package pm.device.lantextinput; - -import java.io.IOException; -import java.net.ServerSocket; -import pm.Device; - -public class LanTextDevice extends Device implements Runnable { - static final int PORT = 1234; - - protected ServerSocket socket; - - public void initialise() { - try { - socket = new ServerSocket(PORT); - } catch (IOException e) { - e.printStackTrace(); - } - new Thread(this).start(); - } - - public void run() { - while(true){ - try { - new LanTextListener(socket.accept()); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - -} diff --git a/java/src/pm/device/lantextinput/LanTextListener.java b/java/src/pm/device/lantextinput/LanTextListener.java deleted file mode 100644 index 5d6177e..0000000 --- a/java/src/pm/device/lantextinput/LanTextListener.java +++ /dev/null @@ -1,39 +0,0 @@ -package pm.device.lantextinput; - -import java.io.IOException; -import java.net.Socket; -import java.util.Scanner; - -import pm.device.textinput.TextDevice; - -public class LanTextListener extends TextDevice { - protected Socket socket; - - public LanTextListener(Socket socket) { - this.socket = socket; - initialise(); - } - - public void initialise() { - try { - input = new Scanner(socket.getInputStream()); - } catch (IOException e) { - e.printStackTrace(); - } - run = true; - new Thread(this).start(); - } - - protected boolean running() { - return run && socket.isConnected() && input.hasNext(); - } - - public void exit() { - run = false; - try { - socket.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } -} diff --git a/java/src/pm/device/textinput/TextDevice.java b/java/src/pm/device/text/InputListener.java similarity index 65% rename from java/src/pm/device/textinput/TextDevice.java rename to java/src/pm/device/text/InputListener.java index 7f689a7..3a8fabc 100644 --- a/java/src/pm/device/textinput/TextDevice.java +++ b/java/src/pm/device/text/InputListener.java @@ -1,21 +1,24 @@ -package pm.device.textinput; +package pm.device.text; +import java.io.InputStream; import java.util.Scanner; -import pm.Action; -import pm.Device; -import pm.Target; import pm.Task; import pm.task.TaskManager; +import pm.value.Action; +import pm.value.Target; -public class TextDevice extends Device implements Runnable { - static final int SLEEP = 100; - +public class InputListener implements Runnable { + protected static final int SLEEP = 100; + protected boolean run; protected Scanner input; - public void initialise() { - input = new Scanner(System.in); + public InputListener(InputStream inputStream) { + input = new Scanner(inputStream); + } + + public void start() { new Thread(this).start(); } @@ -36,8 +39,12 @@ public class TextDevice extends Device implements Runnable { } } } - + protected boolean running() { return run && input.hasNext(); } + + public void stop() { + run = false; + } } diff --git a/java/src/pm/device/text/TextDevice.java b/java/src/pm/device/text/TextDevice.java new file mode 100644 index 0000000..a98dfd0 --- /dev/null +++ b/java/src/pm/device/text/TextDevice.java @@ -0,0 +1,19 @@ +package pm.device.text; + +import pm.Device; + +public class TextDevice extends Device implements Runnable { + InputListener inputListener; + + public TextDevice() { + inputListener = new InputListener(System.in); + } + + public void initialise() { + inputListener.start(); + } + + public void exit() { + inputListener.stop(); + } +} diff --git a/java/src/pm/device/text/lan/LanTextDevice.java b/java/src/pm/device/text/lan/LanTextDevice.java new file mode 100644 index 0000000..54ab8a7 --- /dev/null +++ b/java/src/pm/device/text/lan/LanTextDevice.java @@ -0,0 +1,27 @@ +package pm.device.text.lan; + +import java.io.IOException; +import java.net.ServerSocket; +import pm.Device; +import pm.exception.device.DeviceInitialiseException; + +public class LanTextDevice extends Device { + static final int PORT = 1234; + + protected ServerSocket socket; + protected SocketListener socketListener; + + public void initialise() throws DeviceInitialiseException { + try { + socket = new ServerSocket(PORT); + socketListener = new SocketListener(socket); + socketListener.start(); + } catch (IOException e) { + throw new DeviceInitialiseException(); + } + } + + public void exit() { + socketListener.stop(); + } +} diff --git a/java/src/pm/device/text/lan/SocketListener.java b/java/src/pm/device/text/lan/SocketListener.java new file mode 100644 index 0000000..21c5180 --- /dev/null +++ b/java/src/pm/device/text/lan/SocketListener.java @@ -0,0 +1,47 @@ +package pm.device.text.lan; + +import java.io.IOException; +import java.io.InputStream; +import java.net.ServerSocket; +import java.net.Socket; +import java.util.ArrayList; + +import pm.device.text.InputListener; + +public class SocketListener implements Runnable { + protected boolean run; + + protected ServerSocket server; + protected ArrayList inputListenerList; + + public SocketListener(ServerSocket server) { + this.server = server; + inputListenerList = new ArrayList(); + } + + public void start() { + new Thread(this).start(); + } + + public void run() { + run = true; + while (run) { + try { + Socket socket = server.accept(); + InputStream inputStream = socket.getInputStream(); + InputListener inputListener = new InputListener(inputStream); + inputListenerList.add(inputListener); + inputListener.start(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + public void stop() { + run = false; + for (InputListener inputListener : inputListenerList) { + inputListener.stop(); + } + } +} diff --git a/java/src/pm/device/wiimote/WiimoteDevice.java b/java/src/pm/device/wiimote/WiimoteDevice.java index 2a42788..cf27f3a 100644 --- a/java/src/pm/device/wiimote/WiimoteDevice.java +++ b/java/src/pm/device/wiimote/WiimoteDevice.java @@ -4,10 +4,8 @@ import org.wiigee.event.GestureEvent; import org.wiigee.event.GestureListener; import org.wiigee.util.Log; -import pm.Action; import pm.Button; import pm.Device; -import pm.Target; import pm.Task; import pm.device.javainput.rumblepad.RumblepadButton; import pm.device.wiimote.gesture.GestureDevice; @@ -18,6 +16,8 @@ import pm.macro.event.Press; import pm.macro.event.Release; import pm.task.Continuous; import pm.task.Dynamic; +import pm.value.Action; +import pm.value.Target; import wiiusej.Wiimote; import wiiusej.values.Acceleration; diff --git a/java/src/pm/task/Continuous.java b/java/src/pm/task/Continuous.java index 3768a95..4cd3c0d 100644 --- a/java/src/pm/task/Continuous.java +++ b/java/src/pm/task/Continuous.java @@ -1,8 +1,8 @@ package pm.task; -import pm.Action; -import pm.Target; import pm.Task; +import pm.value.Action; +import pm.value.Target; public class Continuous extends Task { protected static final int SLEEP = 0; diff --git a/java/src/pm/task/Dynamic.java b/java/src/pm/task/Dynamic.java index ba83463..b3535e4 100644 --- a/java/src/pm/task/Dynamic.java +++ b/java/src/pm/task/Dynamic.java @@ -1,7 +1,7 @@ package pm.task; -import pm.Action; -import pm.Target; +import pm.value.Action; +import pm.value.Target; public class Dynamic extends Continuous { protected static final int RATE = 10; diff --git a/java/src/pm/task/TaskListener.java b/java/src/pm/task/TaskListener.java index 92db8e3..dda8230 100644 --- a/java/src/pm/task/TaskListener.java +++ b/java/src/pm/task/TaskListener.java @@ -3,8 +3,8 @@ package pm.task; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import pm.Action; import pm.Task; +import pm.value.Action; public abstract class TaskListener implements Runnable { protected static final int SLEEP = 100; @@ -21,7 +21,7 @@ public abstract class TaskListener implements Runnable { new Thread(this).start(); } - public void run() { + public final void run() { run = true; while (run) { if (taskQueue.isEmpty()) { diff --git a/java/src/pm/task/TaskManager.java b/java/src/pm/task/TaskManager.java index 3717927..ca3c4b8 100644 --- a/java/src/pm/task/TaskManager.java +++ b/java/src/pm/task/TaskManager.java @@ -5,9 +5,9 @@ import java.util.ArrayList; import pm.Application; import pm.Device; import pm.Main; -import pm.Target; import pm.Task; import pm.application.ApplicationCycle; +import pm.value.Target; public class TaskManager { protected static ArrayList taskListenerList; diff --git a/java/src/pm/todo/TODO b/java/src/pm/todo/TODO index 2471826..3b7e55e 100644 --- a/java/src/pm/todo/TODO +++ b/java/src/pm/todo/TODO @@ -9,29 +9,35 @@ exeptions en foutmeldingen nakijken/afhandelen/loggen initialises en exits controleren op succes. tussendoor afgesloten apps en devs herkennen en restarten? op runtime nieuwe applicaties of devices toevoegen of sluiten. -feedback systeem implementeren, rumble voor zowel wiimote als rumblepad - nummerinfo weergeven, waar? via feedback? javadoc maken, class diagram opstellen enz..... meer applicaties implementeren, zoals VLC, WMP, Youtube? (interface naar flash?) -logo ontwerpen - client maken die remote devices kan beheren en lokaal acties kan uitvoeren mogelijkheid tot webstart onderzoeken +alle listeners in gezamelijk pakket plaatsen? + +algemene listener parent class / interface maken? die zou standaard thread functies implementeren / vereisen: start, run, stop IN PROGRESS ------------- naamgeving en indeling classes/packages controleren +TaskGatherererer hernoemt naar TaskManager ++value package waar algemene (gedeelde) enums in komen exporteren naar uitvoerbare jar file +Eclipse kan exporteren, maar bij uitvoeren gebeurd er niets. Moet er een status scherm komen? (Een swing console bijvoorbeeld) +logo ontwerpen ++logo is af, favicon maken? + +feedback systeem implementeren, rumble voor zowel wiimote als rumblepad ++feedback voor rumblepad komt er niet, te veel werk en gebruikte api lijkt niet eenvoudig aanpasbaar + DONE ------------- lantextdevice generiek maken met normale textdevice \ No newline at end of file diff --git a/java/src/pm/Action.java b/java/src/pm/value/Action.java similarity index 86% rename from java/src/pm/Action.java rename to java/src/pm/value/Action.java index 244948a..f71dc18 100644 --- a/java/src/pm/Action.java +++ b/java/src/pm/value/Action.java @@ -1,4 +1,4 @@ -package pm; +package pm.value; public enum Action { EXIT, diff --git a/java/src/pm/application/windows/Key.java b/java/src/pm/value/Key.java similarity index 94% rename from java/src/pm/application/windows/Key.java rename to java/src/pm/value/Key.java index 9c8d6bd..6f6e47b 100644 --- a/java/src/pm/application/windows/Key.java +++ b/java/src/pm/value/Key.java @@ -1,4 +1,4 @@ -package pm.application.windows; +package pm.value; public enum Key { /* diff --git a/java/src/pm/Target.java b/java/src/pm/value/Target.java similarity index 77% rename from java/src/pm/Target.java rename to java/src/pm/value/Target.java index ee21785..e8ed194 100644 --- a/java/src/pm/Target.java +++ b/java/src/pm/value/Target.java @@ -1,4 +1,4 @@ -package pm; +package pm.value; public enum Target { ALL, MAIN, DEVICES, APPLICATIONS, APPLICATION; diff --git a/java/src/pm/application/windows/Type.java b/java/src/pm/value/Type.java similarity index 86% rename from java/src/pm/application/windows/Type.java rename to java/src/pm/value/Type.java index 3bd42c8..d8216cd 100644 --- a/java/src/pm/application/windows/Type.java +++ b/java/src/pm/value/Type.java @@ -1,4 +1,4 @@ -package pm.application.windows; +package pm.value; public enum Type { UP (0x0101), // WM_KEYUP