Removed READY from device status enum

4 files changed, 22 insertions, 30 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
index 063cdd18..0f3f1539 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
@@ -19,7 +19,6 @@
 package com.gluster.storage.management.core.model;
 
 import java.io.File;
-import java.nio.channels.GatheringByteChannel;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
@@ -33,14 +32,14 @@ import com.gluster.storage.management.core.utils.StringUtil;
 public class Device extends Entity {
 	public enum DEVICE_STATUS {
 		//TODO: Status "READY" to be removed after python script is changed accordingly
-		READY, INITIALIZED, UNINITIALIZED, INITIALIZING, IO_ERROR, UNKNOWN
+		INITIALIZED, UNINITIALIZED, INITIALIZING, IO_ERROR, UNKNOWN
 	};
 	
 	public enum DEVICE_TYPE {
 		DATA, BOOT, SWAP, UNKNOWN
 	};
 
-	private static final String[] DEVICE_STATUS_STR = { "Ready", "Initialized", "Uninitialized", "Initializing", "I/O Error", "Unknown" };
+	private static final String[] DEVICE_STATUS_STR = { "Initialized", "Uninitialized", "Initializing", "I/O Error", "Unknown" };
 	private static final String[] DEVICE_TYPE_STR = { "Data", "Boot", "Swap", "Unknown" };
 
 	// type = data, boot, other
@@ -90,9 +89,7 @@ public class Device extends Entity {
 	}
 	
 	public boolean isReady() {
-		// TODO: Check if status is INITIALIZED AND type = DATA
-		// return (getStatus() == DEVICE_STATUS.INITIALIZED && getType() == DEVICE_TYPE.DATA);
-		return (getStatus() == DEVICE_STATUS.READY);
+		return (getStatus() == DEVICE_STATUS.INITIALIZED && getType() == DEVICE_TYPE.DATA);
 	}
 	
 	public DEVICE_STATUS getStatus() {
@@ -101,7 +98,8 @@ public class Device extends Entity {
 
 	public String getStatusStr() {
 		if (getStatus() == null) {
-			return DEVICE_STATUS_STR[DEVICE_STATUS.UNKNOWN.ordinal()]; // Return as Unknown
+			// Return as Unknown
+			return DEVICE_STATUS_STR[DEVICE_STATUS.UNKNOWN.ordinal()]; 
 		}
 
 		if(isReady()) {
@@ -187,12 +185,17 @@ public class Device extends Entity {
 			return false;
 		}
 		
-		Device disk = (Device)obj;
+		Device device = (Device)obj;
 		
-		if (getName().equals(disk.getName()) && getServerName().equals(disk.getServerName())
-				&& getMountPoint().equals(disk.getMountPoint()) && getStatus() == disk.getStatus()
-				&& getSpace() == disk.getSpace() && getSpaceInUse() == disk.getSpaceInUse()
-				&& getFsType().equals(disk.getFsType()) && getFsVersion().equals(disk.getFsVersion())) {
+		String mountPoint = (getMountPoint() == null ? "" : getMountPoint());
+		String fsType = (getFsType() == null ? "" : getFsType());
+		String fsVersion = (getFsVersion() == null ? "" : getFsVersion()); 
+		
+		if (getName().equals(device.getName()) && getServerName().equals(device.getServerName())
+				&& mountPoint.equals(device.getMountPoint()) && getStatus() == device.getStatus()
+				&& getSpace() == device.getSpace() && getSpaceInUse() == device.getSpaceInUse()
+				&& fsType.equals(device.getFsType()) && fsVersion.equals(device.getFsVersion())
+				&& getType() == device.getType()) {
 			return true;
 		}
 		
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java
index 7d2b1b7b..71e6e802 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java
@@ -45,9 +45,9 @@ public class BrickTableLabelProvider extends TableLabelProviderAdapter {
 
 		if (columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal()) {
 			DEVICE_STATUS status = disk.getStatus();
+			// TODO: Use different images for all four statuses
 			switch (status) {
 			case INITIALIZED:
-			case READY:
 				return guiHelper.getImage(IImageKeys.STATUS_ONLINE);
 			case IO_ERROR:
 				return guiHelper.getImage(IImageKeys.STATUS_OFFLINE);
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java
index e0f11a85..28d7c353 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java
@@ -45,9 +45,9 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter {
 
 		if (columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal()) {
 			DEVICE_STATUS status = disk.getStatus();
+			// TODO: Use different images for different statuses
 			switch (status) {
 			case INITIALIZED:
-			case READY:
 				return guiHelper.getImage(IImageKeys.STATUS_ONLINE);
 			case IO_ERROR:
 				return guiHelper.getImage(IImageKeys.STATUS_OFFLINE);
@@ -63,14 +63,6 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter {
 		return null;
 	}
 
-	private String getDiskSpaceInUse(Disk disk) {
-		if (disk.isReady()) {
-			return NumberUtil.formatNumber(disk.getSpaceInUse());
-		} else {
-			return "NA";
-		}
-	}
-
 	private String getDiskFreeSpace(Disk disk) {
 		if (disk.hasErrors() || disk.isUninitialized()) {
 			return "NA";
@@ -96,11 +88,8 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter {
 		Disk disk = (Disk) element;
 		return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName()
 				: columnIndex == DISK_TABLE_COLUMN_INDICES.DISK.ordinal() ? disk.getName()
-						: columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? getDiskFreeSpace(disk)
-								: columnIndex == DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? getTotalDiskSpace(disk)
-										// : columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal() ?
-										// getDiskSpaceInUse(disk)
-										: columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal() ? glusterDataModelManager
-												.getDiskStatus(disk) : "Invalid");
+				: columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? getDiskFreeSpace(disk)
+				: columnIndex == DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? getTotalDiskSpace(disk)
+				: columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal() ? glusterDataModelManager.getDiskStatus(disk) : "Invalid");
 	}
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java
index fe0529e6..210436cb 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java
@@ -46,10 +46,10 @@ public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter {
 			if (status == null) {
 				return  null;
 			}
-			
+
+			// TODO: Use different images for all four statuses
 			switch (status) {
 			case INITIALIZED:
-			case READY:
 				return guiHelper.getImage(IImageKeys.STATUS_ONLINE);
 			case IO_ERROR:
 				return guiHelper.getImage(IImageKeys.STATUS_OFFLINE);