Icon changes

13 files changed, 75 insertions, 21 deletions

diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-available.png b/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-available.png
new file mode 100644
index 00000000..c3c5f3b1
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-available.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-error.png b/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-error.png
new file mode 100644
index 00000000..314fa2f3
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-error.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-initialisation.png b/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-initialisation.png
new file mode 100644
index 00000000..71d0107c
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-initialisation.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-inuse.png b/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-inuse.png
new file mode 100644
index 00000000..e4954c6a
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-inuse.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-uninitialized.png b/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-uninitialized.png
new file mode 100644
index 00000000..ba3b48a4
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-uninitialized.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/pause.png b/src/com.gluster.storage.management.gui/icons/tango/16x16/pause.png
new file mode 100644
index 00000000..e1bd14d9
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/16x16/pause.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/start.png b/src/com.gluster.storage.management.gui/icons/tango/16x16/start.png
new file mode 100644
index 00000000..2d6c7ab9
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/16x16/start.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/stop.png b/src/com.gluster.storage.management.gui/icons/tango/16x16/stop.png
new file mode 100644
index 00000000..78c4433d
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/tango/16x16/stop.png
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java
index 26795ebd..62d67e43 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java
@@ -71,16 +71,19 @@ public class DeviceTableLabelProvider extends LabelProvider implements ITableLab
 				return null;
 			}
 
-			// TODO: Use different images for all four statuses
 			switch (status) {
 			case INITIALIZED:
-				return guiHelper.getImage(IImageKeys.STATUS_ONLINE);
+				if(modelManager.isDeviceUsed(device)) {
+					return guiHelper.getImage(IImageKeys.DISK_IN_USE);
+				} else {
+					return guiHelper.getImage(IImageKeys.DISK_AVAILABLE);
+				}
 			case IO_ERROR:
-				return guiHelper.getImage(IImageKeys.STATUS_OFFLINE);
+				return guiHelper.getImage(IImageKeys.IO_ERROR);
 			case UNINITIALIZED:
 				return guiHelper.getImage(IImageKeys.DISK_UNINITIALIZED);
 			case INITIALIZING:
-				return guiHelper.getImage(IImageKeys.WORK_IN_PROGRESS);
+				return guiHelper.getImage(IImageKeys.DISK_INITIALIZING);
 			default:
 				throw new GlusterRuntimeException("Invalid disk status [" + status + "]");
 			}
@@ -142,7 +145,14 @@ public class DeviceTableLabelProvider extends LabelProvider implements ITableLab
 				return "";
 			}
 		} else if (columnIndex == DEVICE_COLUMN_INDICES.STATUS.ordinal()) {
-			return modelManager.getDeviceStatus(device);
+			if(device.isUninitialized()) {
+				return "";
+			}
+			if(modelManager.isDeviceUsed(device)) {
+				return "In Use";
+			} else {
+				return device.getStatusStr();
+			}
 		} else {
 			return "";
 		}
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 5ec3aedf..54407fbd 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
@@ -757,15 +757,15 @@ public class GlusterDataModelManager {
 		return false;
 	}
 
-	public String getDeviceStatus(Device device) {
+	public boolean isDeviceUsed(Device device) {
 		if (device.getStatus() == DEVICE_STATUS.INITIALIZED) {
 			for (Volume volume : model.getCluster().getVolumes()) {
 				if (isDeviceUsed(volume, device)) {
-					return "In use";
+					return true;
 				}
 			}
 		}
-		return device.getStatusStr();
+		return false;
 	}
 	
 	public List<String> getVolumesOfServer(String serverName) {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java
index 9252eb45..49e2871b 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java
@@ -52,7 +52,12 @@ public interface IImageKeys {
 	public static final String CHECKBOX_CHECKED = "icons/ui-check-box.png";
 	public static final String DISK = "icons/tango/16x16/disk.svg";
 	public static final String DISKS = "icons/tango/16x16/disk.svg";
-	public static final String DISK_UNINITIALIZED = "icons/disk-uninitialized.png";
+	public static final String DISK_UNINITIALIZED = "icons/tango/16x16/disk-uninitialized.png";
+	public static final String IO_ERROR = "icons/tango/16x16/disk-error.png";
+	public static final String DISK_AVAILABLE = "icons/tango/16x16/disk-available.png";
+	public static final String DISK_INITIALIZING = "icons/tango/16x16/disk-initialisation.png";
+	public static final String DISK_IN_USE = "icons/tango/16x16/disk-inuse.png";
+	
 	public static final String SEARCH = "icons/tango/22x22/system-search.png";
 	public static final String ARROW_UP = "icons/arrow-up.png";
 	public static final String ARROW_DOWN = "icons/arrow-down.png";
@@ -65,12 +70,15 @@ public interface IImageKeys {
 	public static final String DISK_OFFLINE = "icons/status-offline.png";
 	public static final String BRICK_OFFLINE = "icons/status-offline.png";
 	
-	
 	public static final String bricks = "icons/tango/16x16/bricks.png";
 
 	public static final String PAUSE_TASK = "icons/tango/32x32/pause.svg";
 	public static final String RESUME_TASK = "icons/tango/32x32/start.svg";
 	public static final String STOP_TASK = "icons/tango/32x32/stop.svg";
+	public static final String PAUSE_TASK_SMALL = "icons/tango/16x16/pause.png";
+	public static final String RESUME_TASK_SMALL = "icons/tango/16x16/start.png";
+	public static final String STOP_TASK_SMALL = "icons/tango/16x16/stop.png";
+	
 	public static final String CLEAR_TASK = "icons/close_task.gif";
 	
 	public static final String OVERLAY_OFFLINE = "icons/status-offline-small.png";
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 96d3dc8a..a5b64e28 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
@@ -20,16 +20,14 @@ package com.gluster.storage.management.gui;
 
 import org.eclipse.swt.graphics.Image;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
 import com.gluster.storage.management.core.model.Device;
+import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
 import com.gluster.storage.management.core.model.Disk;
 import com.gluster.storage.management.core.model.Partition;
 import com.gluster.storage.management.core.utils.NumberUtil;
 import com.gluster.storage.management.gui.DeviceTableLabelProvider.DEVICE_COLUMN_INDICES;
 import com.gluster.storage.management.gui.utils.GUIHelper;
-//import com.gluster.storage.management.gui.views.pages.ServerDisksPage.SERVER_DISK_TABLE_COLUMN_INDICES;
 import com.gluster.storage.management.gui.views.pages.ServerDisksPage.SERVER_DISK_TABLE_COLUMN_INDICES;
 
 public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter {
@@ -38,13 +36,13 @@ public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter {
 
 	@Override
 	public Image getColumnImage(Object element, int columnIndex) {
-		if (!(element instanceof Disk)) {
+		if (!(element instanceof Device)) {
 			return null;
 		}
 
-		Disk disk = (Disk) element;
+		Device device = (Device) element;
 		if (columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.STATUS.ordinal()) {
-			DEVICE_STATUS status = disk.getStatus();
+			DEVICE_STATUS status = device.getStatus();
 			
 			if (status == null) {
 				return  null;
@@ -55,16 +53,19 @@ public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter {
 				return null;
 			}
 
-			// TODO: Use different images for all four statuses
 			switch (status) {
 			case INITIALIZED:
-				return guiHelper.getImage(IImageKeys.STATUS_ONLINE);
+				if(glusterDataModelManager.isDeviceUsed(device)) {
+					return guiHelper.getImage(IImageKeys.DISK_IN_USE);
+				} else {
+					return guiHelper.getImage(IImageKeys.DISK_AVAILABLE);
+				}
 			case IO_ERROR:
-				return guiHelper.getImage(IImageKeys.STATUS_OFFLINE);
+				return guiHelper.getImage(IImageKeys.IO_ERROR);
 			case UNINITIALIZED:
 				return guiHelper.getImage(IImageKeys.DISK_UNINITIALIZED);
 			case INITIALIZING:
-				return guiHelper.getImage(IImageKeys.WORK_IN_PROGRESS);
+				return guiHelper.getImage(IImageKeys.DISK_INITIALIZING);
 			default:
 				throw new GlusterRuntimeException("Invalid disk status [" + status + "]");
 			}
@@ -116,7 +117,14 @@ public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter {
 				return "";
 			}
 		} else if (columnIndex == DEVICE_COLUMN_INDICES.STATUS.ordinal()) {
-			return glusterDataModelManager.getDeviceStatus(device);
+			if(device.isUninitialized()) {
+				return "";
+			}
+			if(glusterDataModelManager.isDeviceUsed(device)) {
+				return "In Use";
+			} else {
+				return device.getStatusStr();
+			}
 		} else {
 			return "";
 		}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/TasksTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/TasksTableLabelProvider.java
index 82aa1f44..13335226 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/TasksTableLabelProvider.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/TasksTableLabelProvider.java
@@ -22,14 +22,42 @@ package com.gluster.storage.management.gui;
 
 import org.eclipse.swt.graphics.Image;
 
+import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo;
+import com.gluster.storage.management.core.model.TaskStatus;
+import com.gluster.storage.management.gui.DeviceTableLabelProvider.DEVICE_COLUMN_INDICES;
+import com.gluster.storage.management.gui.utils.GUIHelper;
 import com.gluster.storage.management.gui.views.pages.TasksPage.TASK_TABLE_COLUMN_INDICES;
 
 
 public class TasksTableLabelProvider extends TableLabelProviderAdapter {
+	private GUIHelper guiHelper = GUIHelper.getInstance();
 	
 	@Override
 	public Image getColumnImage(Object element, int columnIndex) {
+
+		if (!(element instanceof TaskInfo)) {
+			return null;
+		}
+	
+		TaskInfo taskInfo = (TaskInfo) element;
+		if (columnIndex == TASK_TABLE_COLUMN_INDICES.STATUS.ordinal()) {
+			int statusCode = taskInfo.getStatus().getCode();
+			
+			switch (statusCode) {
+			case Status.STATUS_CODE_SUCCESS:
+				return guiHelper.getImage(IImageKeys.STATUS_ONLINE);
+			case Status.STATUS_CODE_PAUSE:
+				return guiHelper.getImage(IImageKeys.PAUSE_TASK_SMALL);
+			case Status.STATUS_CODE_RUNNING:
+				return guiHelper.getImage(IImageKeys.RESUME_TASK_SMALL);
+			case Status.STATUS_CODE_FAILURE:
+				return guiHelper.getImage(IImageKeys.STATUS_OFFLINE);				
+			default:
+				break;
+			}
+		}
+		
 		return null;
 	}