Fix: exclude lastOpened from comparison

fioan89 · fioan89 · commit 705f1861d825 · 2022-06-15T01:07:32.000+03:00
- if a connection was re-opened again from the
  recent connections view then a new entry was added
  in the tree
- instead the last opened timestamp needs to be updated
- the fix excludes the timestamp from equals/hashcode/compare
  and also uses a set instead of a list to keep only unique entries
diff --git a/src/main/kotlin/com/coder/gateway/models/RecentWorkspaceConnection.kt b/src/main/kotlin/com/coder/gateway/models/RecentWorkspaceConnection.kt
@@ -3,7 +3,7 @@ package com.coder.gateway.models
 import com.intellij.openapi.components.BaseState
 import com.intellij.util.xmlb.annotations.Attribute
 
-class RecentWorkspaceConnection() : BaseState() {
+class RecentWorkspaceConnection() : BaseState(), Comparable<RecentWorkspaceConnection> {
     constructor(hostname: String, prjPath: String, openedAt: String, productCode: String, buildNumber: String, source: String) : this() {
         coderWorkspaceHostname = hostname
         projectPath = prjPath
@@ -30,4 +30,48 @@ class RecentWorkspaceConnection() : BaseState() {
 
     @get:Attribute
     var downloadSource by string()
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        if (!super.equals(other)) return false
+
+        other as RecentWorkspaceConnection
+
+        if (coderWorkspaceHostname != other.coderWorkspaceHostname) return false
+        if (projectPath != other.projectPath) return false
+        if (ideProductCode != other.ideProductCode) return false
+        if (ideBuildNumber != other.ideBuildNumber) return false
+        if (downloadSource != other.downloadSource) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = super.hashCode()
+        result = 31 * result + (coderWorkspaceHostname?.hashCode() ?: 0)
+        result = 31 * result + (projectPath?.hashCode() ?: 0)
+        result = 31 * result + (ideProductCode?.hashCode() ?: 0)
+        result = 31 * result + (ideBuildNumber?.hashCode() ?: 0)
+        result = 31 * result + (downloadSource?.hashCode() ?: 0)
+        return result
+    }
+
+    override fun compareTo(other: RecentWorkspaceConnection): Int {
+        val i = other.coderWorkspaceHostname?.let { coderWorkspaceHostname?.compareTo(it) }
+        if (i != null && i != 0) return i
+
+        val j = other.projectPath?.let { projectPath?.compareTo(it) }
+        if (j != null && j != 0) return j
+
+        val k = other.ideProductCode?.let { ideProductCode?.compareTo(it) }
+        if (k != null && k != 0) return k
+
+        val l = other.ideBuildNumber?.let { ideBuildNumber?.compareTo(it) }
+        if (l != null && l != 0) return l
+
+        val m = other.downloadSource?.let { downloadSource?.compareTo(it) }
+        if (m != null && m != 0) return m
+        return 0
+    }
 }
diff --git a/src/main/kotlin/com/coder/gateway/models/RecentWorkspaceConnectionState.kt b/src/main/kotlin/com/coder/gateway/models/RecentWorkspaceConnectionState.kt
@@ -5,5 +5,20 @@ import com.intellij.util.xmlb.annotations.XCollection
 
 class RecentWorkspaceConnectionState : BaseState() {
     @get:XCollection
-    var recentConnections by list<RecentWorkspaceConnection>()
+    var recentConnections by treeSet<RecentWorkspaceConnection>()
+
+    fun add(connection: RecentWorkspaceConnection): Boolean {
+        // if the item is already there but with a different last update timestamp, remove it
+        recentConnections.remove(connection)
+        // and add it again with the new timestamp
+        val result = recentConnections.add(connection)
+        if (result) incrementModificationCount()
+        return result
+    }
+
+    fun remove(connection: RecentWorkspaceConnection): Boolean {
+        val result = recentConnections.remove(connection)
+        if (result) incrementModificationCount()
+        return result
+    }
 }
diff --git a/src/main/kotlin/com/coder/gateway/services/CoderRecentWorkspaceConnectionsService.kt b/src/main/kotlin/com/coder/gateway/services/CoderRecentWorkspaceConnectionsService.kt
@@ -15,9 +15,9 @@ import com.intellij.openapi.diagnostic.Logger
 class CoderRecentWorkspaceConnectionsService : PersistentStateComponent<RecentWorkspaceConnectionState> {
     var myState = RecentWorkspaceConnectionState()
 
-    fun addRecentConnection(connection: RecentWorkspaceConnection) = myState.recentConnections.add(connection)
+    fun addRecentConnection(connection: RecentWorkspaceConnection) = myState.add(connection)
 
-    fun removeConnection(connection: RecentWorkspaceConnection) = myState.recentConnections.remove(connection)
+    fun removeConnection(connection: RecentWorkspaceConnection) = myState.remove(connection)
 
     fun getAllRecentConnections() = myState.recentConnections
 
