[WIP] Rework serial ports handling

app/.classpath

@@ -38,7 +38,7 @@
 	<classpathentry kind="lib" path="lib/jackson-databind-2.6.3.jar"/>
 	<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.6.3.jar"/>
 	<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
-	<classpathentry kind="lib" path="lib/jmdns-3.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/jmdns-3.4.2.jar"/>
 	<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
 	<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
 	<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.8.1+arduino.jar"/>

app/src/cc/arduino/UpdatableBoardsLibsFakeURLsHandler.java

@@ -53,22 +53,28 @@ public void hyperlinkUpdate(HyperlinkEvent event) {
     }
 
     URL url = event.getURL();
+    openBoardLibManager(url);
+  }
 
+  public void openBoardLibManager(URL url) {
     if (BOARDSMANAGER.equals(url.getHost())) {
       try {
-        base.openBoardsManager("", "DropdownUpdatableCoresItem");
+        base.openBoardsManager(url.getRef() == null ? "": url.getRef() , url.getPath() == null ? "" : url.getPath().replace("/", ""));
       } catch (Exception e) {
         e.printStackTrace();
       }
       return;
     }
 
+    System.out.println(url.getRef() + " " + url.getHost() + " " + url.getPath());
+
     if (LIBRARYMANAGER.equals(url.getHost())) {
-      base.openLibraryManager("DropdownUpdatableLibrariesItem");
+      base.openLibraryManager(url.getRef() == null ? "": url.getRef() , url.getPath() == null ? "" : url.getPath().replace("/", ""));
       return;
     }
 
     throw new IllegalArgumentException(url.getHost() + " is invalid");
+
   }
 
 }

app/src/cc/arduino/contributions/ContributionsSelfCheck.java

@@ -83,9 +83,9 @@ public void run() {
 
     String text;
     if (updatableLibraries > 0 && updatablePlatforms <= 0) {
-      text = I18n.format(tr("Updates available for some of your {0}libraries{1}"), "<a href=\"http://librarymanager\">", "</a>");
+      text = I18n.format(tr("Updates available for some of your {0}libraries{1}"), "<a href=\"http://librarymanager/DropdownUpdatableLibrariesItem\">", "</a>");
     } else if (updatableLibraries <= 0 && updatablePlatforms > 0) {
-      text = I18n.format(tr("Updates available for some of your {0}boards{1}"), "<a href=\"http://boardsmanager\">", "</a>");
+      text = I18n.format(tr("Updates available for some of your {0}boards{1}"), "<a href=\"http://boardsmanager/DropdownUpdatableCoresItem\">", "</a>");
     } else {
       text = I18n.format(tr("Updates available for some of your {0}boards{1} and {2}libraries{3}"), "<a href=\"http://boardsmanager\">", "</a>", "<a href=\"http://librarymanager\">", "</a>");
     }

app/src/cc/arduino/contributions/libraries/filters/UpdatableLibraryPredicate.java

@@ -54,7 +54,8 @@ public boolean test(ContributedLibrary contributedLibrary) {
     }
     List<ContributedLibrary> libraries = BaseNoGui.librariesIndexer.getIndex().find(libraryName);
     return libraries.stream()
-      .filter(library -> versionComparator.greaterThan(library.getParsedVersion(), installed.getParsedVersion()))
+      .filter(library -> versionComparator.greaterThan(library.getParsedVersion(), installed.getParsedVersion())
+        && library.getArchitectures().containsAll(installed.getArchitectures()))
       .count() > 0;
   }
 }

app/src/cc/arduino/view/NotificationPopup.java

@@ -61,7 +61,7 @@ public NotificationPopup(Frame parent, HyperlinkListener hyperlinkListener,
     super(parent, false);
     setLayout(new FlowLayout());
     setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-    setAlwaysOnTop(true);
+    //setAlwaysOnTop(true);
     setUndecorated(true);
     setResizable(false);
 

app/src/processing/app/Base.java

@@ -1135,7 +1135,7 @@ public void rebuildImportMenu(JMenu importMenu) {
     importMenu.removeAll();
 
     JMenuItem menu = new JMenuItem(tr("Manage Libraries..."));
-    menu.addActionListener(e -> openLibraryManager(""));
+    menu.addActionListener(e -> openLibraryManager("", ""));
     importMenu.add(menu);
     importMenu.addSeparator();
 
@@ -1264,7 +1264,7 @@ public void onBoardOrPortChange() {
     }
   }
 
-  public void openLibraryManager(String dropdownItem) {
+  public void openLibraryManager(final String filterText, String dropdownItem) {
     if (contributionsSelfCheck != null) {
       contributionsSelfCheck.cancel();
     }
@@ -1280,6 +1280,9 @@ protected void onIndexesUpdated() throws Exception {
         if (StringUtils.isNotEmpty(dropdownItem)) {
           selectDropdownItemByClassName(dropdownItem);
         }
+        if (StringUtils.isNotEmpty(filterText)) {
+          setFilterText(filterText);
+        }
       }
     };
     managerUI.setLocationRelativeTo(activeEditor);

app/src/processing/app/Editor.java

@@ -29,6 +29,7 @@
 import cc.arduino.view.GoToLineNumber;
 import cc.arduino.view.StubMenuListener;
 import cc.arduino.view.findreplace.FindReplace;
+import cc.arduino.UpdatableBoardsLibsFakeURLsHandler;
 import com.jcraft.jsch.JSchException;
 import jssc.SerialPortException;
 import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
@@ -145,6 +146,8 @@ public boolean test(Sketch sketch) {
 
   private int numTools = 0;
 
+  public boolean avoidMultipleOperations = false;
+
   private final EditorToolbar toolbar;
   // these menus are shared so that they needn't be rebuilt for all windows
   // each time a sketch is created, renamed, or moved.
@@ -197,7 +200,7 @@ public boolean test(Sketch sketch) {
   private Runnable stopHandler;
   Runnable exportHandler;
   private Runnable exportAppHandler;
-
+  private Runnable timeoutUploadHandler;
 
   public Editor(Base ibase, File file, int[] storedLocation, int[] defaultLocation, Platform platform) throws Exception {
     super("Arduino");
@@ -811,6 +814,9 @@ public void actionPerformed(ActionEvent e) {
       portMenu = new JMenu(tr("Port"));
     populatePortMenu();
     toolsMenu.add(portMenu);
+    item = new JMenuItem(tr("Get Board Info"));
+    item.addActionListener(e -> handleBoardInfo());
+    toolsMenu.add(item);
     toolsMenu.addSeparator();
 
     base.rebuildProgrammerMenu();
@@ -1015,9 +1021,15 @@ private SketchTextArea createTextArea() throws IOException {
     textArea.setTabSize(PreferencesData.getInteger("editor.tabs.size"));
     textArea.addHyperlinkListener(evt -> {
       try {
-        platform.openURL(sketch.getFolder(), evt.getURL().toExternalForm());
-      } catch (Exception e) {
-        Base.showWarning(e.getMessage(), e.getMessage(), e);
+        UpdatableBoardsLibsFakeURLsHandler boardLibHandler = new UpdatableBoardsLibsFakeURLsHandler(base);
+        boardLibHandler.openBoardLibManager(evt.getURL());
+      }
+      catch (Exception e) {
+        try {
+          platform.openURL(sketch.getFolder(), evt.getURL().toExternalForm());
+        } catch (Exception f) {
+          Base.showWarning(f.getMessage(), f.getMessage(), f);
+        }
       }
     });
     textArea.addCaretListener(e -> {
@@ -1641,6 +1653,7 @@ private void resetHandlers() {
     stopHandler = new DefaultStopHandler();
     exportHandler = new DefaultExportHandler();
     exportAppHandler = new DefaultExportAppHandler();
+    timeoutUploadHandler = new TimeoutUploadHandler();
   }
 
 
@@ -1972,6 +1985,7 @@ public void run() {
 
       status.unprogress();
       toolbar.deactivateRun();
+      avoidMultipleOperations = false;
     }
   }
 
@@ -2360,6 +2374,7 @@ synchronized public void handleExport(final boolean usingProgrammer) {
     console.clear();
     status.progress(tr("Uploading to I/O Board..."));
 
+    new Thread(timeoutUploadHandler).start();
     new Thread(usingProgrammer ? exportAppHandler : exportHandler).start();
   }
 
@@ -2399,6 +2414,7 @@ public void run() {
         e.printStackTrace();
       } finally {
         populatePortMenu();
+        avoidMultipleOperations = false;
       }
       status.unprogress();
       uploading = false;
@@ -2426,13 +2442,14 @@ private void resumeOrCloseSerialMonitor() {
         }
       }
       try {
-        if (serialMonitor != null)
-          serialMonitor.resume(boardPort);
-        if (boardPort == null) {
-          serialMonitor.close();
-          handleSerial();
-        } else {
+        if (serialMonitor != null) {
           serialMonitor.resume(boardPort);
+          if (boardPort == null) {
+            serialMonitor.close();
+            handleSerial();
+          } else {
+            serialMonitor.resume(boardPort);
+          }
         }
       } catch (Exception e) {
         statusError(e);
@@ -2493,6 +2510,7 @@ public void run() {
       } catch (Exception e) {
         e.printStackTrace();
       } finally {
+        avoidMultipleOperations = false;
         populatePortMenu();
       }
       status.unprogress();
@@ -2507,6 +2525,20 @@ public void run() {
     }
   }
 
+  class TimeoutUploadHandler implements Runnable {
+
+    public void run() {
+      try {
+        //10 seconds, than reactivate upload functionality and let the programmer pid being killed
+        Thread.sleep(1000 * 10);
+        if (uploading) {
+          avoidMultipleOperations = false;
+        }
+      } catch (InterruptedException e) {
+          // noop
+      }
+    }
+  }
 
   public void handleSerial() {
     if(serialPlotter != null) {
@@ -2547,11 +2579,11 @@ public void handleSerial() {
     }
 
     serialMonitor = new MonitorFactory().newMonitor(port);
-    serialMonitor.setIconImage(getIconImage());
+    base.setIcon(serialMonitor);
 
     // If currently uploading, disable the monitor (it will be later
     // enabled when done uploading)
-    if (uploading) {
+    if (uploading || avoidMultipleOperations) {
       try {
         serialMonitor.suspend();
       } catch (Exception e) {
@@ -2575,8 +2607,10 @@ public void handleSerial() {
       }
 
       try {
-        serialMonitor.open();
         serialMonitor.setVisible(true);
+        if (!avoidMultipleOperations) {
+          serialMonitor.open();
+        }
         success = true;
       } catch (ConnectException e) {
         statusError(tr("Unable to connect: is the sketch using the bridge?"));
@@ -2643,7 +2677,7 @@ public void handlePlotter() {
     }
 
     serialPlotter = new SerialPlotter(port);
-    serialPlotter.setIconImage(getIconImage());
+    base.setIcon(serialPlotter);
 
     // If currently uploading, disable the plotter (it will be later
     // enabled when done uploading)
@@ -2723,6 +2757,59 @@ private void handleBurnBootloader() {
     }).start();
   }
 
+  private void handleBoardInfo() {
+    console.clear();
+
+    String selectedPort = PreferencesData.get("serial.port");
+    List<BoardPort> ports = Base.getDiscoveryManager().discovery();
+
+    String label = "";
+    String vid = "";
+    String pid = "";
+    String iserial = "";
+    String protocol = "";
+    boolean found = false;
+
+    for (BoardPort port : ports) {
+      if (port.getAddress().equals(selectedPort)) {
+        label = port.getBoardName();
+        vid = port.getVID();
+        pid = port.getPID();
+        iserial = port.getISerial();
+        protocol = port.getProtocol();
+        found = true;
+        break;
+      }
+    }
+
+    if (!found) {
+      statusNotice(tr("Please select a port to obtain board info"));
+      return;
+    }
+
+    if (protocol.equals("network")) {
+      statusNotice(tr("Network port, can't obtain info"));
+      return;
+    }
+
+    if (vid == null || vid.equals("") || vid.equals("0000")) {
+      statusNotice(tr("Native serial port, can't obtain info"));
+      return;
+    }
+
+    if (iserial == null || iserial.equals("")) {
+      iserial = tr("Upload any sketch to obtain it");
+    }
+
+    if (label == null) {
+      label = tr("Unknown board");
+    }
+
+    String infos = I18n.format("BN: {0}\nVID: {1}\nPID: {2}\nSN: {3}", label, vid, pid, iserial);
+    JTextArea textArea = new JTextArea(infos);
+
+    JOptionPane.showMessageDialog(this, textArea, tr("Board Info"), JOptionPane.PLAIN_MESSAGE);
+  }
 
   /**
    * Handler for File &rarr; Page Setup.

app/src/processing/app/EditorLineStatus.java

@@ -52,6 +52,7 @@ public class EditorLineStatus extends JComponent {
   String text = "";
   String name = "";
   String serialport = "";
+  String serialnumber = "";
 
   public EditorLineStatus() {
     background = Theme.getColor("linestatus.bgcolor");
@@ -129,6 +130,10 @@ public void setSerialPort(String serialport) {
     this.serialport = serialport;
   }
 
+  public void setSerialNumber(String serialnumber) {
+    this.serialnumber = serialnumber;
+  }
+
   public Dimension getPreferredSize() {
     return scale(new Dimension(300, height));
   }

app/src/processing/app/EditorToolbar.java

@@ -341,7 +341,10 @@ public void mousePressed(MouseEvent e) {
 
     switch (sel) {
       case RUN:
-        editor.handleRun(false, editor.presentHandler, editor.runHandler);
+        if (!editor.avoidMultipleOperations) {
+          editor.handleRun(false, editor.presentHandler, editor.runHandler);
+          editor.avoidMultipleOperations = true;
+        }
         break;
 
 //    case STOP:
@@ -370,7 +373,11 @@ public void mousePressed(MouseEvent e) {
         break;
 
       case EXPORT:
-        editor.handleExport(e.isShiftDown());
+        // launch a timeout timer which can reenable to upload button functionality an
+        if (!editor.avoidMultipleOperations) {
+          editor.handleExport(e.isShiftDown());
+          editor.avoidMultipleOperations = true;
+        }
         break;
 
       case SERIAL: