From f66b83dd35836d1b20dec8913b30e19f06836d1a Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Tue, 3 Apr 2012 09:20:47 -0400 Subject: [PATCH] Revert "close SerialMonitor when port goes away suddenly (as when user presses Leonardo reset button)" This reverts commit e9a00eb38f3988a1fe28206bdfca618384bbda0f. --- app/src/processing/app/SerialMonitor.java | 29 +---------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/app/src/processing/app/SerialMonitor.java b/app/src/processing/app/SerialMonitor.java index fbeeff73f..6eebf539e 100644 --- a/app/src/processing/app/SerialMonitor.java +++ b/app/src/processing/app/SerialMonitor.java @@ -28,10 +28,8 @@ import javax.swing.*; import javax.swing.border.*; import javax.swing.event.*; import javax.swing.text.*; -import gnu.io.CommPortIdentifier; -import java.util.Enumeration; -public class SerialMonitor extends JFrame implements MessageConsumer, Runnable { +public class SerialMonitor extends JFrame implements MessageConsumer { private Serial serial; private String port; private JTextArea textArea; @@ -173,9 +171,6 @@ public class SerialMonitor extends JFrame implements MessageConsumer, Runnable { } } } - - Thread thread = new Thread(this); - thread.start(); } protected void setPlacement(int[] location) { @@ -233,26 +228,4 @@ public class SerialMonitor extends JFrame implements MessageConsumer, Runnable { } }}); } - - public void run() { - while (!Thread.interrupted()) { - if (serial != null) { - Enumeration portList = CommPortIdentifier.getPortIdentifiers(); - boolean portStillHere = false; - while (portList.hasMoreElements()) { - CommPortIdentifier portId = (CommPortIdentifier) portList.nextElement(); - if (portId.getName().equals(port)) { - portStillHere = true; - } - } - if (!portStillHere) { - closeSerialPort(); - setVisible(false); - } - try { - Thread.sleep(100); - } catch (InterruptedException ex) { } - } - } - } }