Use CheckBoxMenuItem and hold Device instead of string id

Author: imilka

src/processing/mode/android/AndroidEditor.java

@@ -26,6 +26,8 @@
 import processing.mode.java.JavaEditor;
 
 import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -48,7 +50,7 @@ public UpdateDeviceListTask(JMenu deviceMenu) {
     public void run() {
       final Devices devices = Devices.getInstance();
       java.util.List<Device> deviceList = devices.findMultiple(false);
-      String selectedDeviceId = devices.getSelectedDeviceId();
+      Device selectedDevice = devices.getSelectedDevice();
 
       if(deviceList.size() == 0) {
         if(deviceMenu.getItem(0).isEnabled()) {
@@ -58,45 +60,54 @@ public void run() {
           deviceMenu.add(noDevicesItem);
         }
 
-        devices.setSelectedDeviceId(null);
+        devices.setSelectedDevice(null);
       } else {
         deviceMenu.removeAll();
-        JMenuItem deviceItem;
 
-        if(selectedDeviceId == null) {
-          selectedDeviceId = deviceList.get(0).getId();
-          devices.setSelectedDeviceId(selectedDeviceId);
+        if(selectedDevice == null) {
+          selectedDevice = deviceList.get(0);
+          devices.setSelectedDevice(selectedDevice);
         } else {
           // check if selected device is still connected
           boolean found = false;
           for (Device device : deviceList) {
-            if(device.getId().equals(selectedDeviceId)) {
+            if(device.equals(selectedDevice)) {
               found = true;
               break;
             }
           }
 
           if(!found) {
-            selectedDeviceId = deviceList.get(0).getId();
-            devices.setSelectedDeviceId(selectedDeviceId);
+            selectedDevice = deviceList.get(0);
+            devices.setSelectedDevice(selectedDevice);
           }
         }
 
         for (final Device device : deviceList) {
-          deviceItem = new JMenuItem(device.getName());
+          final JCheckBoxMenuItem deviceItem = new JCheckBoxMenuItem(device.getName());
           deviceItem.setEnabled(true);
+
+          if(device.equals(selectedDevice)) deviceItem.setState(true);
+
+          // prevent checkboxmenuitem automatic state changing onclick
+          final Device finalSelectedDevice = selectedDevice;
+          deviceItem.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+              if(device.equals(finalSelectedDevice)) deviceItem.setState(true);
+            }
+          });
+
           deviceItem.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-              devices.setSelectedDeviceId(device.getId());
+              devices.setSelectedDevice(device);
             }
           });
 
           deviceMenu.add(deviceItem);
         }
       }
-
-      deviceMenu.updateUI();
     }
   }
 

src/processing/mode/android/Device.java

@@ -317,4 +317,8 @@ public String toString() {
     return "[AndroidDevice " + getId() + "]";
   }
 
+  @Override
+  public boolean equals(Object obj) {
+    return ((Device) obj).getId().equals(getId());
+  }
 }

src/processing/mode/android/Devices.java

@@ -26,7 +26,7 @@ class Devices {
 
   private static final Devices INSTANCE = new Devices();
 
-  private String selectedDeviceId;
+  private Device selectedDevice;
 
   public static Devices getInstance() {
     return INSTANCE;
@@ -37,12 +37,12 @@ public static Devices getInstance() {
   private final ExecutorService deviceLaunchThread =
     Executors.newSingleThreadExecutor();
 
-  public String getSelectedDeviceId() {
-    return selectedDeviceId;
+  public Device getSelectedDevice() {
+    return selectedDevice;
   }
 
-  public void setSelectedDeviceId(String selectedDeviceId) {
-    this.selectedDeviceId = selectedDeviceId;
+  public void setSelectedDevice(Device selectedDevice) {
+    this.selectedDevice = selectedDevice;
   }
 
   public static void killAdbServer() {