#15: Fixed bulk removal of cluster instances

levigo · Aug 15, 2016 · fe56f6b · fe56f6b
1 parent e72427f
commit fe56f6b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...g/levigo/jadice/server/converterclient/gui/clusterhealth/ClusterHealthPaneController.java b/...g/levigo/jadice/server/converterclient/gui/clusterhealth/ClusterHealthPaneController.java
@@ -173,14 +173,14 @@ private void loadControlElements() {
     });
     settings.instances.addListener((ListChangeListener<? super String>) change -> {
       while (change.next()) {
+        change.getRemoved().forEach(removed -> {
+          controlElements.removeIf(sc -> sc.getClusterInstance().getServerName().equals(removed));
+        });
         change.getAddedSubList().forEach(added -> {
           final StatusControl newInstance = new StatusControl(new ClusterInstance(added), this);
           controlElements.add(newInstance);
           runUpdateAsyn(newInstance);
         });
-        if (change.wasRemoved()) {
-          controlElements.remove(change.getFrom());
-        }
         // TODO: Support for permutation / update
       }
       // Workaround against GridView issue #494

diff --git a/...main/java/org/levigo/jadice/server/converterclient/gui/clusterhealth/ClusterInstance.java b/...main/java/org/levigo/jadice/server/converterclient/gui/clusterhealth/ClusterInstance.java
@@ -41,6 +41,10 @@ public ClusterInstance(String jmxUrl) {
   public StringProperty serverNameProperty() {
     return serverNameProperty;
   }
+
+  public String getServerName() {
+    return serverNameProperty.get();
+  }
 
   public ObjectProperty<HealthStatus> healthProperty() {
     return healthProperty;