working on directto benchmark--removing code like unused constructors that hinder...

[IRC.git] / Robust / src / Benchmarks / mlp / directto / mlp-java / MessageList.java

diff --git a/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java b/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
index 9554d03185da74d940c0d07f30fc8fc48f16eed9..2f268cb414a4ff7dc2008aa3e53f0f4c39a511f2 100755 (executable)
--- a/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
+++ b/Robust/src/Benchmarks/mlp/directto/mlp-java/MessageList.java
@@ -1,23 +1,22 @@
 //import java.io.*;
 //import java.util.*;
 
-class MessageList {
-  private D2 d2;
+public class MessageList {
   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 @@ 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 @@ 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();