Keep Serial Monitor open during upload

Keep Serial Monitor open during upload and don't break existing
functions.

Author: holgerlembke

app/src/processing/app/AbstractMonitor.java

@@ -41,6 +41,7 @@ public abstract class AbstractMonitor extends JFrame implements ActionListener {
   protected JScrollPane scrollPane;
   protected JTextField textField;
   protected JButton sendButton;
+ 
   protected JCheckBox autoscrollBox;
   protected JComboBox lineEndings;
   protected JComboBox serialRates;
@@ -228,6 +229,9 @@ public String getAuthorizationKey() {
 
   public abstract void close() throws Exception;
 
+  public abstract void openSerial() throws Exception;
+  public abstract void closeSerial() throws Exception;
+    
   public synchronized void addToUpdateBuffer(char buff[], int n) {
     updateBuffer.append(buff, 0, n);
   }

app/src/processing/app/Editor.java

@@ -2422,11 +2422,12 @@ synchronized public void handleExport(final boolean usingProgrammer) {
   // DAM: in Arduino, this is upload
   class DefaultExportHandler implements Runnable {
     public void run() {
+	  boolean serialMonitorWasOpen = false; 	
 
       try {
         if (serialMonitor != null) {
-          serialMonitor.close();
-          serialMonitor.setVisible(false);
+          serialMonitor.closeSerial();
+		  serialMonitorWasOpen=true;
         }
 
         uploading = true;
@@ -2458,17 +2459,28 @@ public void run() {
       uploading = false;
       //toolbar.clear();
       toolbar.deactivate(EditorToolbar.EXPORT);
+	  
+      try {
+        if ( (serialMonitor != null) && (serialMonitorWasOpen) ){
+          serialMonitor.openSerial();
+        }
+      } catch (Exception e) {
+		// we are in deep trouble....
+        e.printStackTrace();
+      }
+		
     }
   }
 
   // DAM: in Arduino, this is upload (with verbose output)
   class DefaultExportAppHandler implements Runnable {
     public void run() {
+	  boolean serialMonitorWasOpen = false; 	
 
       try {
         if (serialMonitor != null) {
-          serialMonitor.close();
-          serialMonitor.setVisible(false);
+          serialMonitor.closeSerial();
+		  serialMonitorWasOpen=true;
         }
 
         uploading = true;
@@ -2500,6 +2512,15 @@ public void run() {
       uploading = false;
       //toolbar.clear();
       toolbar.deactivate(EditorToolbar.EXPORT);
+	  
+      try {
+        if ( (serialMonitor != null) && (serialMonitorWasOpen) ){
+          serialMonitor.openSerial();
+        }
+      } catch (Exception e) {
+    	// uh, deep trouble....
+        e.printStackTrace();
+      }
     }
   }
 

app/src/processing/app/SerialMonitor.java

@@ -65,6 +65,7 @@ public void actionPerformed(ActionEvent e) {
         textField.setText("");
       }
     });
+
   }
 
   private void send(String s) {
@@ -88,7 +89,7 @@ private void send(String s) {
     }
   }
 
-  public void open() throws Exception {
+  public void openSerial() throws Exception {
     if (serial != null) return;
 
     serial = new Serial(port, serialRate) {
@@ -98,8 +99,8 @@ protected void message(char buff[], int n) {
       }
     };
   }
-
-  public void close() throws Exception {
+  
+  public void closeSerial() throws Exception {
     if (serial != null) {
       int[] location = getPlacement();
       String locationStr = PApplet.join(PApplet.str(location), ",");
@@ -110,4 +111,12 @@ public void close() throws Exception {
     }
   }
 
+  public void open() throws Exception {
+	  openSerial();
+  }
+
+  public void close() throws Exception {
+	  closeSerial();
+  }
+  
 }