Disk label changed to Device

3 files changed, 25 insertions, 38 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java
index 7378116a..4ff52189 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java
@@ -28,9 +28,9 @@ public class Event {
 		VOLUME_OPTION_SET,
 		VOLUME_CHANGED,
 		GLUSTER_SERVER_CHANGED,
-		DISKS_ADDED,
-		DISKS_REMOVED,
-		DISKS_CHANGED,
+		DEVICES_ADDED,
+		DEVICES_REMOVED,
+		DEVICES_CHANGED,
 		DISCOVERED_SERVER_CHANGED
 	}
 	
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 473aab60..4a21dba7 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
@@ -318,53 +318,40 @@ public class GlusterDataModelManager {
 		}
 		for (ClusterListener listener : listeners) {
 			if (server instanceof GlusterServer) {
-				listener.serverChanged((GlusterServer) server, new Event(EVENT_TYPE.DISKS_CHANGED, modifiedDisks));
+				listener.serverChanged((GlusterServer) server, new Event(EVENT_TYPE.DEVICES_CHANGED, modifiedDisks));
 			} else {
-				listener.discoveredServerChanged(server, new Event(EVENT_TYPE.DISKS_CHANGED, modifiedDisks));
+				listener.discoveredServerChanged(server, new Event(EVENT_TYPE.DEVICES_CHANGED, modifiedDisks));
 			}
 		}
 	}
 	
 	public void updateDeviceStatus(String serverName, String deviceName, DEVICE_STATUS status) {
 		GlusterServer server = model.getCluster().getServer(serverName);
-		Device device = getDeviceDetails(serverName, deviceName);
+		Device device = getDeviceDetails(server, deviceName);
 		if (device != null) {
 			device.setStatus(status);
 			device.setType(DEVICE_TYPE.DATA);
 			for (ClusterListener listener : listeners) {
-				listener.serverChanged((GlusterServer) server, new Event(EVENT_TYPE.DISKS_CHANGED, device));
+				listener.serverChanged((GlusterServer) server, new Event(EVENT_TYPE.DEVICES_CHANGED, device));
 			}
 		}
 	}
 	
-	private Device getDeviceDetails(String serverName, String deviceName) {
-		List<Device> allDevices = getDevicesOfAllServers();
-		for (Device device : allDevices) {
-			if (device.getServerName().equals(serverName) && device.getName().equals(deviceName)) {
-				return device;
-			}
-		}
-		return null;
-	}
-
-	public List<Device> getDevicesOfAllServers() {
-		List<Device> devices = new ArrayList<Device>();
-
-		for (Server server : model.getCluster().getServers()) {
-			if (server.getStatus() == SERVER_STATUS.OFFLINE) {
-				continue;
-			}
-			for (Disk disk : server.getDisks()) {
-				if (disk.hasPartitions()) {
-					for (Partition partition : disk.getPartitions()) {
-							devices.add(partition);
+	private Device getDeviceDetails(GlusterServer server, String deviceName) {
+		for (Disk disk : server.getDisks()) {
+			if (disk.hasPartitions()) {
+				for (Partition partition : disk.getPartitions()) {
+					if (partition.getName().equals(deviceName)) {
+						return partition;
 					}
-				} else {
-					devices.add(disk);
+				}
+			} else {
+				if (disk.getName().equals(deviceName)) {
+					return (Device) disk;
 				}
 			}
 		}
-		return devices;
+		return null;
 	}
 	
 	public void addDisks(Server server, Set<Disk> disks) {
@@ -375,9 +362,9 @@ public class GlusterDataModelManager {
 		server.addDisks(disks);
 		for (ClusterListener listener : listeners) {
 			if(server instanceof GlusterServer) {
-				listener.serverChanged((GlusterServer)server, new Event(EVENT_TYPE.DISKS_ADDED, disks));
+				listener.serverChanged((GlusterServer)server, new Event(EVENT_TYPE.DEVICES_ADDED, disks));
 			} else {
-				listener.discoveredServerChanged(server, new Event(EVENT_TYPE.DISKS_ADDED, disks));
+				listener.discoveredServerChanged(server, new Event(EVENT_TYPE.DEVICES_ADDED, disks));
 			}
 		}
 	}
@@ -393,9 +380,9 @@ public class GlusterDataModelManager {
 		
 		for (ClusterListener listener : listeners) {
 			if(server instanceof GlusterServer) {
-				listener.serverChanged((GlusterServer)server, new Event(EVENT_TYPE.DISKS_REMOVED, disks));
+				listener.serverChanged((GlusterServer)server, new Event(EVENT_TYPE.DEVICES_REMOVED, disks));
 			} else {
-				listener.discoveredServerChanged(server, new Event(EVENT_TYPE.DISKS_REMOVED, disks));
+				listener.discoveredServerChanged(server, new Event(EVENT_TYPE.DEVICES_REMOVED, disks));
 			}
 		}
 	}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
index b6e224e4..b74dcd0e 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
@@ -83,9 +83,9 @@ public abstract class AbstractDisksPage extends AbstractTableTreeViewerPage<Disk
 				super.serverChanged(server, event);
 				EVENT_TYPE eventType = event.getEventType();
 				switch (eventType) {
-				case DISKS_REMOVED:
-				case DISKS_ADDED:
-				case DISKS_CHANGED:
+				case DEVICES_REMOVED:
+				case DEVICES_ADDED:
+				case DEVICES_CHANGED:
 					treeViewer.refresh();
 				default:
 					break;