diff -N RunControlDialog.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ RunControlDialog.java	23 May 2012 18:22:16 -0000	1.1
@@ -0,0 +1,75 @@

+package org.lcsim.hps.monitoring;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import org.lcsim.event.EventHeader;
+
+/**
+ * Lightweight driver for stepping through events in offline analysis, without
+ * running the MonitoringApp.
+ *
+ * @author Sho Uemura <[log in to unmask]>
+ * @version $Id: RunControlDialog.java,v 1.1 2012/05/23 18:22:16 meeg Exp $
+ */
+public class RunControlDialog implements ActionListener {
+
+    JButton nextButton;
+    JButton runButton;
+    JFrame nextFrame;
+    boolean run = false;
+    final Object syncObject = new Object();
+
+    public RunControlDialog() {
+        nextFrame = new JFrame();
+        nextFrame.setAlwaysOnTop(true);
+        nextFrame.getContentPane().setLayout(new BoxLayout(nextFrame.getContentPane(), BoxLayout.X_AXIS));
+
+        nextButton = new JButton("Next event");
+        nextButton.addActionListener(this);
+        nextFrame.add(nextButton);
+        runButton = new JButton("Run");
+        runButton.addActionListener(this);
+        nextFrame.add(runButton);
+
+        nextFrame.pack();
+        nextFrame.setVisible(true);
+        nextFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+    }
+
+	//return true to process the event; return false to discard; waits if in pause mode
+    public boolean process(EventHeader event) {
+        if (!run) {
+            synchronized (syncObject) {
+                try {
+                    syncObject.wait();
+                } catch (InterruptedException e) {
+                }
+            }
+        }
+		return true;
+    }
+
+	@Override
+    public void actionPerformed(ActionEvent ae) {
+        if (ae.getSource() == nextButton) {
+            synchronized (syncObject) {
+                syncObject.notify();
+            }
+        }
+        if (ae.getSource() == runButton) {
+            if (!run) {
+                runButton.setText("Pause");
+                run = true;
+                synchronized (syncObject) {
+                    syncObject.notify();
+                }
+            } else {
+                run = false;
+                runButton.setText("Run");
+            }
+        }
+    }
+}

diff -u -r1.4 -r1.5
--- AIDAFrame.java	4 May 2012 16:35:44 -0000	1.4
+++ AIDAFrame.java	23 May 2012 18:22:16 -0000	1.5
@@ -8,7 +8,7 @@

 /**
  *
  * @author Sho Uemura <[log in to unmask]>

- * @version $Id: AIDAFrame.java,v 1.4 2012/05/04 16:35:44 meeg Exp $

+ * @version $Id: AIDAFrame.java,v 1.5 2012/05/23 18:22:16 meeg Exp $

  */
 public class AIDAFrame extends JFrame {
 

@@ -21,10 +21,6 @@

         this.getContentPane().setLayout(new BorderLayout());
 
         menubar = new JMenuBar();

-//		JMenu menu = new JMenu("File");
-//		JMenuItem item = new JMenuItem("meeg");
-//		menu.add(item);
-//		menubar.add(menu);

         this.setJMenuBar(menubar);
 
         this.add(tabbedPane, BorderLayout.NORTH);

@@ -32,8 +28,6 @@

         controlsPanel = new JPanel();
         controlsPanel.setLayout(new BoxLayout(controlsPanel, BoxLayout.X_AXIS));
         this.add(controlsPanel, BorderLayout.SOUTH);

-
-        this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

     }
 
     public void addPlotter(IPlotter plotter) {

diff -N RunControlDriver.java
--- RunControlDriver.java	13 May 2012 21:39:24 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,84 +0,0 @@

-package org.lcsim.hps.monitoring;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import org.lcsim.event.EventHeader;
-import org.lcsim.util.Driver;
-
-/**
- * Lightweight driver for stepping through events in offline analysis, without
- * running the MonitoringApp.
- *
- * @author Sho Uemura <[log in to unmask]>
- * @version $Id: RunControlDriver.java,v 1.3 2012/05/13 21:39:24 meeg Exp $
- */
-public class RunControlDriver extends Driver implements ActionListener {
-
-    JButton nextButton;
-    JButton runButton;
-    JFrame nextFrame;
-    boolean run = false;
-    final Object syncObject;
-
-    public RunControlDriver() {
-        syncObject = new Object();
-    }
-
-    @Override
-    protected void startOfData() {
-        nextFrame = new JFrame();
-        nextFrame.setAlwaysOnTop(true);
-        nextFrame.getContentPane().setLayout(new BoxLayout(nextFrame.getContentPane(), BoxLayout.X_AXIS));
-
-        nextButton = new JButton("Next event");
-        nextButton.addActionListener(this);
-        nextFrame.add(nextButton);
-        runButton = new JButton("Run");
-        runButton.addActionListener(this);
-        nextFrame.add(runButton);
-
-        nextFrame.pack();
-        nextFrame.setVisible(true);
-    }
-
-    @Override
-    protected void process(EventHeader event) {
-        if (!run) {
-            synchronized (syncObject) {
-                try {
-                    syncObject.wait();
-                } catch (InterruptedException e) {
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void endOfData() {
-        nextFrame.setVisible(false);
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent ae) {
-        if (ae.getSource() == nextButton) {
-            synchronized (syncObject) {
-                syncObject.notify();
-            }
-        }
-        if (ae.getSource() == runButton) {
-            if (!run) {
-                runButton.setText("Pause");
-                run = true;
-                synchronized (syncObject) {
-                    syncObject.notify();
-                }
-            } else {
-                run = false;
-                runButton.setText("Run");
-            }
-        }
-    }
-}