Show BoardName.boardName field in 'Ports' menu

...instead of putting it into the 'label' field during discovery.

Author: cmaglie

app/src/processing/app/Editor.java

@@ -1065,7 +1065,9 @@ class BoardPortJCheckBoxMenuItem extends JCheckBoxMenuItem {
     private BoardPort port;
 
     public BoardPortJCheckBoxMenuItem(BoardPort port) {
-      super(port.getLabel());
+      super();
+      this.port = port;
+      setText(toString());
       addActionListener(e -> {
         selectSerialPort(port.getAddress(), port.getBoardId());
         if (port.getBoardId() != null && PreferencesData.getBoolean("editor.autoselectboard")) {
@@ -1076,13 +1078,16 @@ public BoardPortJCheckBoxMenuItem(BoardPort port) {
         }
         base.onBoardOrPortChange();
       });
-      this.port = port;
     }
 
     @Override
     public String toString() {
       // This is required for serialPrompt()
-      return port.getLabel();
+      String label = port.getLabel();
+      if (port.getBoardName() != null && !port.getBoardName().isEmpty()) {
+        label += " (" + port.getBoardName() + ")";
+      }
+      return label;
     }
   }
 

arduino-core/src/cc/arduino/packages/discoverers/serial/SerialDiscovery.java

@@ -196,9 +196,6 @@ public synchronized void forceRefresh() {
         TargetBoard board = (TargetBoard) boardData.get("board");
         if (board != null) {
           String boardName = board.getName();
-          if (boardName != null) {
-            label += " (" + boardName + ")";
-          }
           boardPort.setBoardName(boardName);
           boardPort.setBoardId(board.getId());
         }