UI feed back changes on disk views

6 files changed, 42 insertions, 24 deletions

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 d8ace927..57e46d3e 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
@@ -63,7 +63,7 @@ public class BrickTableLabelProvider extends TableLabelProviderAdapter {
 	}
 
 	private String getDiskSpaceInUse(Disk disk) {
-		if (disk.isReady()) {
+		if (disk.isReady() && disk.getSpaceInUse() != null) {
 			return NumberUtil.formatNumber(disk.getSpaceInUse());
 		} else {
 			return "NA";
@@ -71,10 +71,18 @@ public class BrickTableLabelProvider extends TableLabelProviderAdapter {
 	}
 
 	private String getDiskFreeSpace(Disk disk) {
-		if (disk.isReady()) {
+		if (disk.isReady() && disk.getFreeSpace() != null) {
 			return NumberUtil.formatNumber(disk.getFreeSpace());
 		} else {
-			return "NA";			
+			return "NA";
+		}
+	}
+	
+	private String getDiskSpace( Disk disk) {
+		if (disk.isReady() && disk.getSpace() != null && disk.getSpace() != 0.0) {
+			return NumberUtil.formatNumber(disk.getSpace());
+		} else {
+			return "NA";
 		}
 	}
 
@@ -86,11 +94,10 @@ public class BrickTableLabelProvider extends TableLabelProviderAdapter {
 
 		Brick brick = (Brick) element;
 		Disk disk = GlusterDataModelManager.getInstance().getDiskDetails(brick.getDiskName());
-		
 		return (columnIndex == BRICK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? brick.getServerName()
 				: columnIndex == BRICK_TABLE_COLUMN_INDICES.BRICK.ordinal() ? brick.getBrickDirectory()
+				: columnIndex == BRICK_TABLE_COLUMN_INDICES.SPACE.ordinal() ? getDiskSpace(disk)
 				: columnIndex == BRICK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? getDiskFreeSpace(disk)
-				: columnIndex == BRICK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal() ? getDiskSpaceInUse(disk)
 				: columnIndex == BRICK_TABLE_COLUMN_INDICES.STATUS.ordinal() ? brick.getStatusStr() : "Invalid");
 	}
 }
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 23bbadd6..48e8d11a 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
@@ -20,7 +20,6 @@ package com.gluster.storage.management.gui;
 
 import org.eclipse.swt.graphics.Image;
 
-import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Disk;
@@ -35,12 +34,13 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter {
 	@Override
 	public Image getColumnImage(Object element, int columnIndex) {
 		
-		if (!(element instanceof Brick)) {
+		if (!(element instanceof Disk)) {
 			return null;
 		}
 
-		Brick brick = (Brick) element;
-		Disk disk = GlusterDataModelManager.getInstance().getDisk(brick.getDiskName());
+		// Brick brick = (Brick) element;
+		// Disk disk = GlusterDataModelManager.getInstance().getDisk(brick.getDiskName());
+		Disk disk = (Disk) element;
 		
 		if (columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal()) {
 			DISK_STATUS status = disk.getStatus();
@@ -73,23 +73,30 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter {
 		if (disk.hasErrors() || disk.isUninitialized()) {
 			return "NA";
 		} else {
+			return NumberUtil.formatNumber(disk.getFreeSpace());
+		}
+	}
+	
+	private String getTotalDiskSpace(Disk disk) {
+		if (disk.hasErrors() || disk.isUninitialized()) {
+			return "NA";
+		} else {
 			return NumberUtil.formatNumber(disk.getSpace());
 		}
 	}
 
 	@Override
 	public String getColumnText(Object element, int columnIndex) {
-		if (!(element instanceof Brick)) {
+		if (!(element instanceof Disk)) {
 			return null;
 		}
 
-		Brick brick = (Brick) element;
-		Disk disk = GlusterDataModelManager.getInstance().getDisk(brick.getDiskName());
-		
-		return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? brick.getServerName()
-				: columnIndex == DISK_TABLE_COLUMN_INDICES.DISK.ordinal() ? brick.getBrickDirectory()
+		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.TOTAL_SPACE.ordinal() ? getTotalDiskSpace(disk)
 				: columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? getDiskFreeSpace(disk)
-				: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal() ? getDiskSpaceInUse(disk)
+				// : columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal() ? getDiskSpaceInUse(disk)
 				: columnIndex == DISK_TABLE_COLUMN_INDICES.STATUS.ordinal() ? disk.getStatusStr() : "Invalid");
 	}
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
index 6871c683..b4278518 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
@@ -35,6 +35,7 @@ import org.eclipse.ui.part.ViewPart;
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.client.VolumesClient;
 import com.gluster.storage.management.core.model.Alert;
+import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Cluster;
 import com.gluster.storage.management.core.model.DefaultClusterListener;
 import com.gluster.storage.management.core.model.Event;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
index db2bb71d..35dd0700 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
@@ -32,6 +32,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
 
 import com.gluster.storage.management.core.model.Alert;
+import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.EntityGroup;
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.core.model.RunningTask;
@@ -72,6 +73,7 @@ public class VolumesSummaryView extends ViewPart {
 				volumes = (EntityGroup<Volume>) selectedObj;
 			}
 		}
+		
 		setPartName("Summary");
 		createSections(parent);
 	}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/BricksPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/BricksPage.java
index 263c4a10..41f6b531 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/BricksPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/BricksPage.java
@@ -34,11 +34,11 @@ import com.gluster.storage.management.gui.BrickTableLabelProvider;
 public class BricksPage extends AbstractBricksPage {
 
 	public enum BRICK_TABLE_COLUMN_INDICES {
-		SERVER, BRICK, FREE_SPACE, SPACE_IN_USE, STATUS
+		SERVER, BRICK, SPACE, FREE_SPACE, STATUS
 	};
 
-	private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Server", "Brick Directory", "Free Space (GB)",
-			"Space in Use (GB)", "Status" };
+	private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Server", "Brick Directory", "Space (GB)",
+			"Free Space (GB)", "Status" };
 
 	public BricksPage(final Composite parent, int style, IWorkbenchSite site, List<Brick> bricks) {
 		super(parent, style, site, bricks);
@@ -54,8 +54,8 @@ public class BricksPage extends AbstractBricksPage {
 
 		guiHelper.setColumnProperties(table, BRICK_TABLE_COLUMN_INDICES.SERVER.ordinal(), SWT.CENTER, 100);
 		guiHelper.setColumnProperties(table, BRICK_TABLE_COLUMN_INDICES.BRICK.ordinal(), SWT.CENTER, 100);
+		guiHelper.setColumnProperties(table, BRICK_TABLE_COLUMN_INDICES.SPACE.ordinal(), SWT.CENTER, 90);
 		guiHelper.setColumnProperties(table, BRICK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal(), SWT.CENTER, 90);
-		guiHelper.setColumnProperties(table, BRICK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal(), SWT.CENTER, 90);
 	}
 
 	@Override
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/DisksPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/DisksPage.java
index 84fd6c64..6d0f2d43 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/DisksPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/DisksPage.java
@@ -33,11 +33,11 @@ import com.gluster.storage.management.gui.DiskTableLabelProvider;
 public class DisksPage extends AbstractDisksPage {
 
 	public enum DISK_TABLE_COLUMN_INDICES {
-		SERVER, DISK, FREE_SPACE, SPACE_IN_USE, STATUS
+		SERVER, DISK, TOTAL_SPACE, FREE_SPACE, STATUS
 	};
 
-	private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Server", "Brick Directory", "Free Space (GB)",
-			"Space in Use (GB)", "Status" };
+	private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Server", "Disk", "Space (GB)",
+			"Free Space (GB)", "Status" };
 
 	public DisksPage(final Composite parent, int style, IWorkbenchSite site, List<Disk> disks) {
 		super(parent, style, site, disks);
@@ -53,8 +53,9 @@ public class DisksPage extends AbstractDisksPage {
 
 		guiHelper.setColumnProperties(table, DISK_TABLE_COLUMN_INDICES.SERVER.ordinal(), SWT.CENTER, 100);
 		guiHelper.setColumnProperties(table, DISK_TABLE_COLUMN_INDICES.DISK.ordinal(), SWT.CENTER, 100);
+		guiHelper.setColumnProperties(table, DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal(), SWT.CENTER, 90);
 		guiHelper.setColumnProperties(table, DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal(), SWT.CENTER, 90);
-		guiHelper.setColumnProperties(table, DISK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal(), SWT.CENTER, 90);
+		// guiHelper.setColumnProperties(table, DISK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal(), SWT.CENTER, 90);
 	}
 
 	@Override