serialization works?!

6 files changed, 22 insertions, 16 deletions

diff --git a/sources/core/VSTaskManager.java b/sources/core/VSTaskManager.java
index 471b54f..a435401 100644
--- a/sources/core/VSTaskManager.java
+++ b/sources/core/VSTaskManager.java
@@ -508,14 +508,14 @@ public class VSTaskManager implements VSSerializable {
         ArrayList<VSTask> serializeThoseTasks = new ArrayList<VSTask>();
 
         for (VSTask task : fullfilledProgrammedTasks) {
-			if (!task.hasNotSerializableEvent())
-            	serializeThoseTasks.add(task);
-		}
+            if (!task.hasNotSerializableEvent())
+                serializeThoseTasks.add(task);
+        }
 
         for (VSTask task : globalTasks) {
-			if (!task.hasNotSerializableEvent())
-            	serializeThoseTasks.add(task);
-		}
+            if (!task.hasNotSerializableEvent())
+                serializeThoseTasks.add(task);
+        }
 
         ArrayList<VSProcess> processes = simulatorCanvas.getProcesses();
 
@@ -523,16 +523,16 @@ public class VSTaskManager implements VSSerializable {
             for (VSProcess process : processes) {
                 VSPriorityQueue<VSTask> localTasks = process.getTasks();
                 for (VSTask task : localTasks) {
-					if (!task.hasNotSerializableEvent())
-                   		 serializeThoseTasks.add(task);
-				}
+                    if (!task.hasNotSerializableEvent())
+                        serializeThoseTasks.add(task);
+                }
             }
         }
 
         objectOutputStream.writeObject(
-				new Integer(serializeThoseTasks.size()));
+            new Integer(serializeThoseTasks.size()));
         for (VSTask task : serializeThoseTasks)
-			task.serialize(serialize, objectOutputStream);
+            task.serialize(serialize, objectOutputStream);
 
         /** For later backwards compatibility, to add more stuff */
         objectOutputStream.writeObject(new Boolean(false));
@@ -561,6 +561,10 @@ public class VSTaskManager implements VSSerializable {
         }
 
         int numTasks = ((Integer) objectInputStream.readObject()).intValue();
+
+        if (VSSerialize.DEBUG)
+            System.out.println("Num of tasks: " + numTasks);
+
         for (int i = 0; i < numTasks; ++i) {
             VSTask task = new VSTask(serialize, objectInputStream);
             addTask(task, task.isProgrammed());
diff --git a/sources/events/internal/VSAbstractInternalEvent.java b/sources/events/internal/VSAbstractInternalEvent.java
index 10a23b7..5921945 100644
--- a/sources/events/internal/VSAbstractInternalEvent.java
+++ b/sources/events/internal/VSAbstractInternalEvent.java
@@ -70,5 +70,7 @@ abstract public class VSAbstractInternalEvent extends VSAbstractEvent {
         /** For later backwards compatibility, to add more stuff */
         objectInputStream.readObject();
 
+        /** For later backwards compatibility, to add more stuff */
+        objectInputStream.readObject();
     }
 }
diff --git a/sources/events/internal/VSMessageReceiveEvent.java b/sources/events/internal/VSMessageReceiveEvent.java
index 072c2d6..bc930e6 100644
--- a/sources/events/internal/VSMessageReceiveEvent.java
+++ b/sources/events/internal/VSMessageReceiveEvent.java
@@ -35,8 +35,8 @@ import serialize.VSNotSerializable;
  *
  * @author Paul C. Buetow
  */
-public class VSMessageReceiveEvent extends VSAbstractInternalEvent 
-implements VSNotSerializable {
+public class VSMessageReceiveEvent extends VSAbstractInternalEvent
+            implements VSNotSerializable {
     /** The serioal version uid */
     private static final long serialVersionUID = 1L;
 
diff --git a/sources/events/internal/VSProtocolEvent.java b/sources/events/internal/VSProtocolEvent.java
index ba110c0..f75edc5 100644
--- a/sources/events/internal/VSProtocolEvent.java
+++ b/sources/events/internal/VSProtocolEvent.java
@@ -173,6 +173,7 @@ public class VSProtocolEvent extends VSAbstractInternalEvent {
         objectInputStream.readObject();
 
         protocolClassname = (String) objectInputStream.readObject();
+
         isClientProtocol = ((Boolean)
                             objectInputStream.readObject()).booleanValue();;
         isProtocolActivation = ((Boolean)
diff --git a/sources/events/internal/VSProtocolScheduleEvent.java b/sources/events/internal/VSProtocolScheduleEvent.java
index 3c334be..bab0a63 100644
--- a/sources/events/internal/VSProtocolScheduleEvent.java
+++ b/sources/events/internal/VSProtocolScheduleEvent.java
@@ -36,8 +36,8 @@ import serialize.*;
  *
  * @author Paul C. Buetow
  */
-public class VSProtocolScheduleEvent extends VSAbstractInternalEvent 
-implements VSNotSerializable {
+public class VSProtocolScheduleEvent extends VSAbstractInternalEvent
+            implements VSNotSerializable {
     /** The serial version uid */
     private static final long serialVersionUID = 1L;
 
diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java
index 2c25867..fb34dec 100644
--- a/sources/simulator/VSSimulator.java
+++ b/sources/simulator/VSSimulator.java
@@ -1087,7 +1087,6 @@ public class VSSimulator extends JPanel implements VSSerializable {
 
         for (int i = 0; i < numProcesses; ++i) {
             int processID = simulatorCanvas.getProcess(i).getProcessID();
-            System.out.println("FOO " + processID + " index " + i);
 
             processesComboBox.removeItemAt(i);
             localPIDComboBox.removeItemAt(i);