From f0417d8be30f23f2d6e5ee4b7e5e9ddf291fbe32 Mon Sep 17 00:00:00 2001
From: nifi <nifi>
Date: Thu, 28 Oct 2010 21:49:01 +0000
Subject: [PATCH] Made exit configurable

---
 .../sics/contiki/collect/CollectServer.java   | 47 ++++++++++++++-----
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java b/examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java
index 97b443422..57d791041 100644
--- a/examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java
+++ b/examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CollectServer.java,v 1.32 2010/10/28 14:17:10 nifi Exp $
+ * $Id: CollectServer.java,v 1.33 2010/10/28 21:49:01 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
@@ -34,14 +34,15 @@
  *
  * Authors : Joakim Eriksson, Niclas Finne
  * Created : 3 jul 2008
- * Updated : $Date: 2010/10/28 14:17:10 $
- *           $Revision: 1.32 $
+ * Updated : $Date: 2010/10/28 21:49:01 $
+ *           $Revision: 1.33 $
  */
 
 package se.sics.contiki.collect;
 import java.awt.BorderLayout;
 import java.awt.GraphicsEnvironment;
 import java.awt.Rectangle;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -63,7 +64,6 @@ import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Properties;
-
 import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.BorderFactory;
@@ -147,6 +147,10 @@ public class CollectServer implements SerialConnectionListener {
   private boolean doSendInitAtStartup = false;
   private String initScript;
 
+  private boolean hasStarted = false;
+  private boolean doExitOnRequest = true;
+  private JMenuItem exitItem;
+
   private int defaultMaxItemCount = 250;
   private long nodeTimeDelta;
 
@@ -660,15 +664,15 @@ public class CollectServer implements SerialConnectionListener {
     fileMenu.add(item);
 
     fileMenu.addSeparator();
-    item = new JMenuItem("Exit", KeyEvent.VK_X);
-    item.addActionListener(new ActionListener() {
+    exitItem = new JMenuItem("Exit", KeyEvent.VK_X);
+    exitItem.addActionListener(new ActionListener() {
 
       public void actionPerformed(ActionEvent e) {
         exit();
       }
 
     });
-    fileMenu.add(item);
+    fileMenu.add(exitItem);
 
     JMenu toolsMenu = new JMenu("Tools");
     toolsMenu.setMnemonic(KeyEvent.VK_T);
@@ -765,10 +769,11 @@ public class CollectServer implements SerialConnectionListener {
     return -1;
   }
 
-  void start(SerialConnection connection) {
-    if (this.serialConnection != null) {
+  public void start(SerialConnection connection) {
+    if (hasStarted) {
       throw new IllegalStateException("already started");
     }
+    hasStarted = true;
     this.serialConnection = connection;
     if (isSensorLogUsed) {
       initSensorData();
@@ -793,7 +798,7 @@ public class CollectServer implements SerialConnectionListener {
     }
   }
 
-  private void exit() {
+  public void stop() {
     save();
     if (serialConnection != null) {
       serialConnection.close();
@@ -802,7 +807,27 @@ public class CollectServer implements SerialConnectionListener {
     if (output != null) {
       output.close();
     }
-    System.exit(0);
+    window.setVisible(false);
+  }
+
+  public void setExitOnRequest(boolean doExit) {
+    this.doExitOnRequest = doExit;
+    if (exitItem != null) {
+      SwingUtilities.invokeLater(new Runnable() {
+        public void run() {
+          exitItem.setEnabled(doExitOnRequest);
+        }
+      });
+    }
+  }
+
+  private void exit() {
+    if (doExitOnRequest) {
+      stop();
+      System.exit(0);
+    } else {
+      Toolkit.getDefaultToolkit().beep();
+    }
   }
 
   private void sleep(long delay) {