From a8b0a229d75dbf6651d60d01f33de386d290e896 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Mon, 9 May 2011 18:52:24 +0000
Subject: [PATCH] In NetworkSpreader Feedback opvangen.

---
 java/src/pm/device/network/NetworkDevice.java |  2 --
 .../pm/event/spreader/NetworkSpreader.java    | 22 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/java/src/pm/device/network/NetworkDevice.java b/java/src/pm/device/network/NetworkDevice.java
index cf2a85b..694662e 100644
--- a/java/src/pm/device/network/NetworkDevice.java
+++ b/java/src/pm/device/network/NetworkDevice.java
@@ -3,7 +3,6 @@ package pm.device.network;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
@@ -15,7 +14,6 @@ import pm.Event;
 import pm.Worker;
 import pm.event.Feedback;
 import pm.exception.device.DeviceInitialiseException;
-import pm.value.Action;
 
 public class NetworkDevice extends Device {
     public static final int PORT = 6789;
diff --git a/java/src/pm/event/spreader/NetworkSpreader.java b/java/src/pm/event/spreader/NetworkSpreader.java
index 07154ae..ba44453 100644
--- a/java/src/pm/event/spreader/NetworkSpreader.java
+++ b/java/src/pm/event/spreader/NetworkSpreader.java
@@ -1,21 +1,43 @@
 package pm.event.spreader;
 
 import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.net.Socket;
 import java.net.UnknownHostException;
 import pm.Event;
+import pm.Worker;
 import pm.event.EventSpreader;
+import pm.event.Feedback;
 import pm.exception.event.spreader.NetworkSpreaderException;
 
 public class NetworkSpreader extends EventSpreader {
     protected Socket socket;
     protected ObjectOutputStream objectOutputStream;
+    protected ObjectInputStream objectInputStream;
 
     public NetworkSpreader(String ip, int port) throws NetworkSpreaderException {
         try {
             socket = new Socket(ip, port);
             objectOutputStream = new ObjectOutputStream(socket.getOutputStream());
+            objectInputStream = new ObjectInputStream(socket.getInputStream());
+            new Worker() {
+                public void run() {
+                    try {
+                        Object object;
+                        do {
+                            object = objectInputStream.readObject();
+                            if (object instanceof Feedback) {
+                                add((Feedback) object);
+                            }                 
+                        } while (object != null);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    } catch (ClassNotFoundException e) {
+                        e.printStackTrace();
+                    }
+                }
+            };
             return;
         } catch (UnknownHostException e) {
         } catch (IOException e) {}