From 19fa8d34dd4df7ba6eeb6efad42692b726c3515d Mon Sep 17 00:00:00 2001
From: Bram Veenboer <ram.veenboer@gmail.com>
Date: Tue, 15 Feb 2011 21:28:00 +0000
Subject: [PATCH] Kleine aanpassingen gemaakt aan (Lan)TextDevice

---
 .../pm/device/lantextinput/LanTextDevice.java |  8 ++-----
 .../device/lantextinput/LanTextListener.java  | 12 +++++-----
 java/src/pm/device/textinput/TextDevice.java  | 24 +++++++------------
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/java/src/pm/device/lantextinput/LanTextDevice.java b/java/src/pm/device/lantextinput/LanTextDevice.java
index cfb0aa9..63b4eee 100644
--- a/java/src/pm/device/lantextinput/LanTextDevice.java
+++ b/java/src/pm/device/lantextinput/LanTextDevice.java
@@ -7,18 +7,14 @@ import pm.Device;
 public class LanTextDevice extends Device implements Runnable {
     static final int PORT = 1234;
     
-    ServerSocket socket;
+    protected ServerSocket socket;
 
-    public LanTextDevice() {
+    public void initialise() {
         try {
             socket = new ServerSocket(PORT);
         } catch (IOException e) {
             e.printStackTrace();
         }
-        initialise();
-    }
-
-    public void initialise() {
         new Thread(this).start();
     }
 
diff --git a/java/src/pm/device/lantextinput/LanTextListener.java b/java/src/pm/device/lantextinput/LanTextListener.java
index 5198fcb..7631c3f 100644
--- a/java/src/pm/device/lantextinput/LanTextListener.java
+++ b/java/src/pm/device/lantextinput/LanTextListener.java
@@ -9,8 +9,8 @@ import pm.Target;
 import pm.Task;
 import pm.task.TaskGatherer;
 
-public class LanTextListener implements Runnable{
-    static final int SLEEP = 50;
+public class LanTextListener implements Runnable {
+    static final int SLEEP = 100;
     
     protected boolean run;
     protected Socket socket;
@@ -19,7 +19,7 @@ public class LanTextListener implements Runnable{
     public LanTextListener(Socket socket){
         this.socket = socket;
         try {
-            this.input = new Scanner(socket.getInputStream());
+            input = new Scanner(socket.getInputStream());
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -28,13 +28,13 @@ public class LanTextListener implements Runnable{
     }
        
     public void run() {
-        while(run  && socket.isConnected() && input.hasNext()) {
+        while (run && socket.isConnected() && input.hasNext()) {
             String textinput = input.next().toUpperCase();
             if(textinput != null) {
                 try {
                     TaskGatherer.add(
-                            new Task(Action.valueOf(textinput), Target.APPLICATION));
-                } catch(IllegalArgumentException e) { }
+                        new Task(Action.valueOf(textinput), Target.APPLICATION));
+                } catch (IllegalArgumentException e) {}
             }
             try {
                 Thread.sleep(SLEEP);
diff --git a/java/src/pm/device/textinput/TextDevice.java b/java/src/pm/device/textinput/TextDevice.java
index d9d52fc..49cfa7d 100644
--- a/java/src/pm/device/textinput/TextDevice.java
+++ b/java/src/pm/device/textinput/TextDevice.java
@@ -9,31 +9,25 @@ import pm.Task;
 import pm.task.TaskGatherer;
 
 public class TextDevice extends Device implements Runnable {
-    static final int SLEEP = 50;
-   
+    static final int SLEEP = 100;
+
     protected boolean run;
     protected Scanner input;
-    
-    public TextDevice() {
-        initialise();
-        run = true;
-        new Thread(this).start();
-    }
-    
+
     public void initialise() {
         input = new Scanner(System.in);
+        new Thread(this).start();
     }
-    
+
     public void run() {
-        System.out.println("TextDevice activated");
-        while(run) {
+        run = true;
+        while (run) {
             String textinput = input.next().toUpperCase();
             if(textinput != null) {
-                System.out.println(textinput);
                 try {
                     TaskGatherer.add(
-                            new Task(Action.valueOf(textinput), Target.APPLICATION));
-                } catch(IllegalArgumentException e) { }
+                        new Task(Action.valueOf(textinput), Target.APPLICATION));
+                } catch(IllegalArgumentException e) {}
             }
             try {
                 Thread.sleep(SLEEP);