SelectedDeviceId logic

Author: imilka

src/processing/mode/android/AndroidEditor.java

@@ -30,12 +30,76 @@
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
-import java.util.TimerTask;
 import java.util.Timer;
+import java.util.TimerTask;
 
 public class AndroidEditor extends JavaEditor {
   private AndroidMode androidMode;
 
+  class UpdateDeviceListTask extends TimerTask {
+
+    private JMenu deviceMenu;
+
+    public UpdateDeviceListTask(JMenu deviceMenu) {
+      this.deviceMenu = deviceMenu;
+    }
+
+    @Override
+    public void run() {
+      final Devices devices = Devices.getInstance();
+      java.util.List<Device> deviceList = devices.findMultiple(false);
+      String selectedDeviceId = devices.getSelectedDeviceId();
+
+      if(deviceList.size() == 0) {
+        if(deviceMenu.getItem(0).isEnabled()) {
+          deviceMenu.removeAll();
+          JMenuItem noDevicesItem = new JMenuItem("No connected devices");
+          noDevicesItem.setEnabled(false);
+          deviceMenu.add(noDevicesItem);
+        }
+
+        devices.setSelectedDeviceId(null);
+      } else {
+        deviceMenu.removeAll();
+        JMenuItem deviceItem;
+
+        if(selectedDeviceId == null) {
+          selectedDeviceId = deviceList.get(0).getId();
+          devices.setSelectedDeviceId(selectedDeviceId);
+        } else {
+          // check if selected device is still connected
+          boolean found = false;
+          for (Device device : deviceList) {
+            if(device.getId().equals(selectedDeviceId)) {
+              found = true;
+              break;
+            }
+          }
+
+          if(!found) {
+            selectedDeviceId = deviceList.get(0).getId();
+            devices.setSelectedDeviceId(selectedDeviceId);
+          }
+        }
+
+        for (final Device device : deviceList) {
+          deviceItem = new JMenuItem(device.getName());
+          deviceItem.setEnabled(true);
+          deviceItem.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+              devices.setSelectedDeviceId(device.getId());
+            }
+          });
+
+          deviceMenu.add(deviceItem);
+        }
+      }
+
+      deviceMenu.updateUI();
+    }
+  }
+
   protected AndroidEditor(Base base, String path, EditorState state, Mode mode) throws Exception {
     super(base, path, state, mode);
     androidMode = (AndroidMode) mode;
@@ -128,31 +192,7 @@ public void actionPerformed(ActionEvent e) {
     menu.add(deviceMenu);
 
     // start updating device menus
-    TimerTask task = new TimerTask() {
-      @Override
-      public void run() {
-        Devices devices = Devices.getInstance();
-        java.util.List<Device> deviceList = devices.findMultiple(false);
-
-        if(deviceList.size() == 0) {
-          if(deviceMenu.getItem(0).isEnabled()) {
-            deviceMenu.removeAll();
-            JMenuItem noDevicesItem = new JMenuItem("No connected devices");
-            noDevicesItem.setEnabled(false);
-            deviceMenu.add(noDevicesItem);
-          }
-        } else {
-          deviceMenu.removeAll();
-          JMenuItem deviceItem;
-
-          for(int i = 0; i < deviceList.size(); i++) {
-            deviceItem = new JMenuItem(deviceList.get(i).getName());
-            deviceItem.setEnabled(true);
-            deviceMenu.add(deviceItem);
-          }
-        }
-      }
-    };
+    UpdateDeviceListTask task = new UpdateDeviceListTask(deviceMenu);
     Timer timer = new Timer();
     timer.schedule(task, 0, 5000);
 

src/processing/mode/android/Devices.java

@@ -26,6 +26,8 @@ class Devices {
 
   private static final Devices INSTANCE = new Devices();
 
+  private String selectedDeviceId;
+
   public static Devices getInstance() {
     return INSTANCE;
   }
@@ -35,6 +37,13 @@ public static Devices getInstance() {
   private final ExecutorService deviceLaunchThread =
     Executors.newSingleThreadExecutor();
 
+  public String getSelectedDeviceId() {
+    return selectedDeviceId;
+  }
+
+  public void setSelectedDeviceId(String selectedDeviceId) {
+    this.selectedDeviceId = selectedDeviceId;
+  }
 
   public static void killAdbServer() {
     System.out.println("Shutting down any existing adb server...");