Fixed issue #123: sort device profiles alphabetically.

jawi · Jan 26, 2013 · 723ed58 · 723ed58
1 parent 4ba27d0
commit 723ed58
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/device.logicsniffer/src/main/java/org/sump/device/logicsniffer/profile/DeviceProfile.java b/device.logicsniffer/src/main/java/org/sump/device/logicsniffer/profile/DeviceProfile.java
@@ -32,7 +32,7 @@
 /**
  * Provides a device profile.
  */
-public final class DeviceProfile implements Cloneable
+public final class DeviceProfile implements Cloneable, Comparable<DeviceProfile>
 {
   // INNER TYPES
 
@@ -205,6 +205,21 @@ public DeviceProfile clone()
     }
   }
 
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public int compareTo( DeviceProfile aProfile )
+  {
+    // Issue #123: allow device profiles to be sorted alphabetically...
+    int result = getDescription().compareTo( aProfile.getDescription() );
+    if ( result == 0 )
+    {
+      result = getType().compareTo( aProfile.getType() );
+    }
+    return result;
+  }
+
   /**
    * {@inheritDoc}
    */

diff --git a/...logicsniffer/src/main/java/org/sump/device/logicsniffer/profile/DeviceProfileManager.java b/...logicsniffer/src/main/java/org/sump/device/logicsniffer/profile/DeviceProfileManager.java
@@ -157,6 +157,8 @@ public List<DeviceProfile> getProfiles()
   {
     List<DeviceProfile> result = new ArrayList<DeviceProfile>();
     result.addAll( this.profiles.values() );
+    // Issue #123: sort device profiles alphabetically...
+    Collections.sort( result );
     return result;
   }