diff options
| author | Shireesh Anjal <anjalshireesh@gmail.com> | 2011-07-28 01:51:39 -0700 |
|---|---|---|
| committer | Shireesh Anjal <anjalshireesh@gmail.com> | 2011-07-28 01:51:39 -0700 |
| commit | 2e78f308846a4318a4e124fe7cbdcb7da5cc3fb5 (patch) | |
| tree | e119e2b78ab6b5516aa1587b9b8505f3a1ed38ad | |
| parent | 9d68dfd93f71ccae9c1a6dc0455e55279d1fcc58 (diff) | |
| parent | 3083315feff6f57f9c0b58ee05370fd73aa2ff04 (diff) | |
Merge pull request #161 from Selvasundaram/master
Add only the online gluster servers to discovered servers while removing
2 files changed, 9 insertions, 5 deletions
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java index e19645a5..017549de 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java @@ -668,11 +668,13 @@ public class GlusterDataModelManager { listener.serverRemoved(server); } - // add it to discovered servers list - Server removedServer = new Server(); - removedServer.copyFrom(server); - removedServer.addDisks(server.getDisks()); - addDiscoveredServer(removedServer); + // add it to discovered servers list if it is online server + if (server.isOnline()) { + Server removedServer = new Server(); + removedServer.copyFrom(server); + removedServer.addDisks(server.getDisks()); + addDiscoveredServer(removedServer); + } } public void deleteVolume(Volume volume) { diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java index 69434e96..d8b8387e 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java @@ -139,6 +139,8 @@ public class VolumeOptionsPage extends Composite { switch (event.getEventType()) { case VOLUME_OPTIONS_RESET: if (!tableViewer.getControl().isDisposed()) { + //While reseting the options, clear the filter text before refreshing the tree + filterText.setText(""); tableViewer.refresh(); setAddButtonsEnabled(true); } |