X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FBenchmarks%2Fmlp%2Fdirectto%2Fmlp-java%2FMessageList.java;h=2f268cb414a4ff7dc2008aa3e53f0f4c39a511f2;hb=a8c79270b350827f80b87a3a1a914a0a983cd502;hp=b5af4b372e9297fcf44cb8d7339a52b699f7e171;hpb=ecea89dac16c80cef725c068326d395e3ef0d30f;p=IRC.git

diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
index b5af4b37..2f268cb4 100755
--- a/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
+++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
@@ -2,22 +2,21 @@
 //import java.util.*;
 
 public class MessageList {
-  private D2 d2;
   private Vector messages;
     
-  public MessageList( D2 d2 ) { 
-    this.d2 = d2; 
+  public MessageList() { 
     messages=new Vector();
   }
 
   public Message data() {
     Message m = (Message) messages.elementAt(0);
-    messages.removeElementAt(0);
     return m;
   }
     
   public Message next() {
-    return data();
+    Message m = (Message) messages.elementAt(0);
+    messages.removeElementAt(0);
+    return m;
   }
 
   public boolean hasNext() {
@@ -38,7 +37,7 @@ public class MessageList {
     StringTokenizer st=new StringTokenizer(line);
     int time=Integer.parseInt(st.nextToken());
     String type=st.nextToken();	
-    Message newMessage=new Message(d2,time,type,st);
+    Message newMessage=disjoint msgs new Message(time,type,st);
     messages.addElement(newMessage);
     if (type.equals("DO_WORK"))
       return true;
@@ -46,10 +45,11 @@ public class MessageList {
     return false;
   }
   
-  public void executeAll() {
+  public void executeAll(D2 d2) {
     System.out.println("executeAll: we have "+messages.size()+" messages.");
     while(hasNext())
-      next().executeMessage();     
+      next().executeMessage(d2);     
+
     d2.getStatic().printInfo();
     d2.getFixList().printInfo();
     d2.getAircraftList().printInfo();