Skip to content

Commit

Permalink
[Bug fix] - explorer doesn't remove node from network view. (corda#779)
Browse files Browse the repository at this point in the history
(cherry picked from commit eb5b03e)
  • Loading branch information
Patrick Kuo committed Apr 26, 2018
1 parent 72bd530 commit 1b31574
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ class NetworkIdentityModel {
else -> false
}
}
list.addAll(update.node)
if(update is MapChange.Modified || update is MapChange.Added){
list.addAll(update.node)
}
}

private val rpcProxy by observableValue(NodeMonitorModel::proxyObservable)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import javafx.beans.binding.Bindings
import javafx.beans.property.SimpleObjectProperty
import javafx.beans.value.ObservableValue
import javafx.collections.FXCollections
import javafx.collections.ListChangeListener
import javafx.geometry.Bounds
import javafx.geometry.Insets
import javafx.geometry.Point2D
Expand Down Expand Up @@ -69,7 +70,15 @@ class Network : CordaView() {
private val notaryButtons = notaryComponents.map { it.button }
private val peerComponents = peers.map { it.render() }
private val peerButtons = peerComponents.filtered { myIdentity.value !in it.nodeInfo.legalIdentitiesAndCerts.map { it.party } }.map { it.button }
private val allComponents = FXCollections.observableArrayList(notaryComponents, peerComponents).concatenate()
private val allComponents = FXCollections.observableArrayList(notaryComponents, peerComponents).concatenate().apply {
addListener(ListChangeListener {
if(it.next()){
it.removed.forEach {
mapPane.children.remove(it.label)
}
}
})
}
private val mapLabels = allComponents.map { it.label }

private data class MapViewComponents(val nodeInfo: NodeInfo, val button: Button, val label: Label)
Expand Down

0 comments on commit 1b31574

Please sign in to comment.