Merge pull request #87 from EarlOfEgo/master

Display the device name
pbreault · Jun 10, 2018 · d59d0b4 · d59d0b4
2 parents f11b646 + 971170a
commit d59d0b4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/main/java/com/developerphil/adbidea/ui/MyDeviceChooser.java b/src/main/java/com/developerphil/adbidea/ui/MyDeviceChooser.java
@@ -419,7 +419,7 @@ public Object getValueAt(int rowIndex, int columnIndex) {
       IDevice device = myDevices[rowIndex];
       switch (columnIndex) {
         case DEVICE_NAME_COLUMN_INDEX:
-          return device;
+          return generateDeviceName(device);
         case SERIAL_COLUMN_INDEX:
           return device.getSerialNumber();
         case DEVICE_STATE_COLUMN_INDEX:
@@ -430,6 +430,13 @@ public Object getValueAt(int rowIndex, int columnIndex) {
       return null;
     }
 
+      private String generateDeviceName(IDevice device) {
+        return device.getName()
+          .replace(device.getSerialNumber(), "")
+          .replaceAll("[-_]", " ")
+          .replaceAll("[\\[\\]]", "");
+      }
+
     @Override
     public Class<?> getColumnClass(int columnIndex) {
       if (columnIndex == COMPATIBILITY_COLUMN_INDEX) {