Merge pull request #41 from Dhandapani/master

Story #78: UI Feedback changes 

8 files changed, 92 insertions, 130 deletions

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
index 4085d62b..873c26f6 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
@@ -28,7 +28,6 @@ import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Cluster;
 import com.gluster.storage.management.core.model.ClusterListener;
 import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Disk.DISK_STATUS;
 import com.gluster.storage.management.core.model.Event;
 import com.gluster.storage.management.core.model.Event.EVENT_TYPE;
 import com.gluster.storage.management.core.model.GlusterDataModel;
@@ -77,6 +76,7 @@ public class GlusterDataModelManager {
 	public static GlusterDataModelManager getInstance() {
 		return instance;
 	}
+
 	public void initializeModel(String securityToken, String knownServer) {
 		model = new GlusterDataModel("Gluster Data Model");
 		setSecurityToken(securityToken);
@@ -86,9 +86,9 @@ public class GlusterDataModelManager {
 		initializeVolumes(cluster);
 
 		initializeAutoDiscoveredServers(cluster);
-		initializeDisks();
+		// initializeDisks();
 
-		createDummyLogMessages();
+		createDummyLogMessages(cluster);
 
 		initializeRunningTasks(cluster);
 		initializeAlerts(cluster);
@@ -98,7 +98,8 @@ public class GlusterDataModelManager {
 	}
 
 	private void initializeGlusterServers(Cluster cluster, String knownServer) {
-		GlusterServerListResponse glusterServerListResponse = new GlusterServersClient(securityToken).getServers(knownServer);
+		GlusterServerListResponse glusterServerListResponse = new GlusterServersClient(securityToken)
+				.getServers(knownServer);
 		if (!glusterServerListResponse.getStatus().isSuccess()) {
 			throw new GlusterRuntimeException(glusterServerListResponse.getStatus().getMessage());
 		}
@@ -106,7 +107,8 @@ public class GlusterDataModelManager {
 	}
 
 	private void initializeAutoDiscoveredServers(Cluster cluster) {
-		ServerListResponse discoveredServerListResponse = new DiscoveredServersClient(securityToken).getDiscoveredServerDetails();
+		ServerListResponse discoveredServerListResponse = new DiscoveredServersClient(securityToken)
+				.getDiscoveredServerDetails();
 		if (!discoveredServerListResponse.getStatus().isSuccess()) {
 			throw new GlusterRuntimeException(discoveredServerListResponse.getStatus().getMessage());
 		}
@@ -130,7 +132,7 @@ public class GlusterDataModelManager {
 		}
 		this.volumeOptionsDefaults = response.getOptions();
 	}
-	
+
 	public void initializeRunningTasks(Cluster cluster) {
 		RunningTaskListResponse runningTaskResponse = new RunningTaskClient(securityToken).getRunningTasks();
 		if (!runningTaskResponse.getStatus().isSuccess()) {
@@ -143,7 +145,6 @@ public class GlusterDataModelManager {
 		cluster.setAlerts(new AlertsClient(securityToken).getAllAlerts());
 	}
 
-
 	private void addVolumeOptions() {
 		for (Volume vol : new Volume[] { volume1, volume2, volume3, volume4, volume5 }) {
 			for (int i = 1; i <= 5; i++) {
@@ -162,65 +163,6 @@ public class GlusterDataModelManager {
 		return volume;
 	}
 
-
-	private void initializeDisks() {
-		s1da = new Disk(server1, "sda", "/export/md0", 100d, 80d, DISK_STATUS.READY);
-		s1db = new Disk(server1, "sdb", "/export/md1", 100d, 67.83, DISK_STATUS.READY);
-
-		s2da = new Disk(server2, "sda", "/export/md0", 200d, 157.12, DISK_STATUS.READY);
-		s2db = new Disk(server2, "sdb", "/export/md1", 200d, 182.27, DISK_STATUS.READY);
-		s2dc = new Disk(server2, "sdc", "/export/md0", 200d, -1d, DISK_STATUS.UNINITIALIZED);
-		s2dd = new Disk(server2, "sdd", "/export/md1", 200d, 124.89, DISK_STATUS.READY);
-
-		// disk name unavailable since server is offline
-
-		s3da = new Disk(server3, "NA", "/export/md0", -1d, -1d, DISK_STATUS.IO_ERROR);
-
-		s4da = new Disk(server4, "sda", "/export/md0", 100d, 85.39, DISK_STATUS.READY);
-
-		s5da = new Disk(server5, "sda", "/export/md1", 100d, 92.83, DISK_STATUS.READY);
-		s5db = new Disk(server5, "sdb", "/export/md1", 200d, 185.69, DISK_STATUS.READY);
-	}
-
-	private void addDisksToServers() {
-		server1.addDisk(s1da);
-		server1.addDisk(s1db);
-
-		server2.addDisk(s2da);
-		server2.addDisk(s2db);
-		server2.addDisk(s2dc);
-		server2.addDisk(s2dd);
-
-		// server3.addDisk(s3da);
-
-		server4.addDisk(s4da);
-
-		server5.addDisk(s5da);
-		server5.addDisk(s5db);
-	}
-
-	private void addDisksToVolumes() {
-		volume1.addDisk("server1:sda");
-
-		volume2.addDisk("server2:sda");
-		volume2.addDisk("server1:sdb");
-		volume2.addDisk("server3:sda");
-		volume2.addDisk("server4:sda");
-
-		volume3.addDisk("server2:sdb");
-		volume3.addDisk("server4:sda");
-		volume3.addDisk("server5:sda");
-
-		volume4.addDisk("server1:sda");
-		volume4.addDisk("server3:sda");
-		volume4.addDisk("server4:sda");
-		volume4.addDisk("server5:sdb");
-
-		volume5.addDisk("server2:sda");
-		volume5.addDisk("server5:sdb");
-	}
-
-
 	private void addMessages(List<LogMessage> messages, Disk disk, String severity, int count) {
 		for (int i = 1; i <= count; i++) {
 			String message = severity + "message" + i;
@@ -235,17 +177,26 @@ public class GlusterDataModelManager {
 		addMessages(logMessages, disk, "INFO", 5);
 	}
 
+	private List<Disk> getAllDisks(Cluster cluster) {
+		List<Disk> disks = new ArrayList<Disk>();
+		for (GlusterServer server : cluster.getServers()) {
+			disks.addAll(server.getDisks());
+		}
+		return disks;
+	}
+	public List<LogMessage> createDummyLogMessages(Cluster cluster) {
+		for(Disk disk: getAllDisks(cluster)) {
+			addMessagesForDisk(logMessages, disk);
+		}
 
-	public List<LogMessage> createDummyLogMessages() {
-		addMessagesForDisk(logMessages, s1da);
-		addMessagesForDisk(logMessages, s1db);
-		addMessagesForDisk(logMessages, s2da);
-		addMessagesForDisk(logMessages, s2db);
-		addMessagesForDisk(logMessages, s2dc);
-		addMessagesForDisk(logMessages, s2dd);
-		addMessagesForDisk(logMessages, s4da);
-		addMessagesForDisk(logMessages, s5da);
-		addMessagesForDisk(logMessages, s5db);
+		// addMessagesForDisk(logMessages, s1db);
+		// addMessagesForDisk(logMessages, s2da);
+		// addMessagesForDisk(logMessages, s2db);
+		// addMessagesForDisk(logMessages, s2dc);
+		// addMessagesForDisk(logMessages, s2dd);
+		// addMessagesForDisk(logMessages, s4da);
+		// addMessagesForDisk(logMessages, s5da);
+		// addMessagesForDisk(logMessages, s5db);
 		return logMessages;
 	}
 
@@ -254,7 +205,8 @@ public class GlusterDataModelManager {
 	}
 
 	/**
-	 * @param serverPartition Qualified name of the disk to be returned (serverName:diskName)
+	 * @param serverPartition
+	 *            Qualified name of the disk to be returned (serverName:diskName)
 	 * @return The disk object for given qualified name
 	 */
 	public Disk getDisk(String serverPartition) {
@@ -267,9 +219,10 @@ public class GlusterDataModelManager {
 		}
 		return null;
 	}
-	
+
 	/*
 	 * @param diskName (sda)
+	 * 
 	 * @return The disk object for given disk name
 	 */
 	public Disk getDiskDetails(String diskName) {
@@ -299,27 +252,26 @@ public class GlusterDataModelManager {
 		}
 		return volumeDisks;
 	}
-	
-	
+
 	public List<Brick> getOnlineBricks(Volume volume) {
 		List<Brick> onlineBricks = new ArrayList<Brick>();
-		for(Brick brick : volume.getBricks()) {
+		for (Brick brick : volume.getBricks()) {
 			if (isOnlineDisk(brick.getDiskName())) {
 				onlineBricks.add(brick);
 			}
 		}
 		return onlineBricks;
 	}
-	
+
 	public boolean isOnlineDisk(String diskName) {
-		for( Disk disk : getReadyDisksOfAllServers() ) {
+		for (Disk disk : getReadyDisksOfAllServers()) {
 			if (disk.getName().equals(diskName) && disk.isReady()) {
 				return true;
 			}
 		}
 		return false;
 	}
-	
+
 	public List<Disk> getReadyDisksOfAllVolumes() {
 		List<Disk> disks = new ArrayList<Disk>();
 		for (Volume volume : model.getCluster().getVolumes()) {
@@ -436,9 +388,9 @@ public class GlusterDataModelManager {
 		volume.setAccessControlList(accessControlList);
 		setVolumeOption(volume, getOptionEntry(volume, Volume.OPTION_AUTH_ALLOW));
 	}
-	
+
 	public Server getGlusterServer(String serverName) {
-		for(Server server : model.getCluster().getServers() ) {
+		for (Server server : model.getCluster().getServers()) {
 			if (server.getName().equals(serverName)) {
 				return server;
 			}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
index e54d2335..d351ad93 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
@@ -45,6 +45,10 @@ public class Disk extends Entity {
 	public Double getSpace() {
 		return space;
 	}
+	
+	public Double getFreeSpace() {
+		return getSpace() - getSpaceInUse();
+	}
 
 	public void setSpace(Double space) {
 		this.space = space;
@@ -61,7 +65,7 @@ public class Disk extends Entity {
 	public boolean isReady() {
 		return getStatus() == DISK_STATUS.READY;
 	}
-
+	
 	public DISK_STATUS getStatus() {
 		return status;
 	}
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 deaea17c..64defb60 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
@@ -48,7 +48,7 @@ public class BrickTableLabelProvider extends TableLabelProviderAdapter {
 			switch (status) {
 			case READY:
 				return guiHelper.getImage(IImageKeys.STATUS_ONLINE);
-			case OFFLINE:
+			case IO_ERROR:
 				return guiHelper.getImage(IImageKeys.STATUS_OFFLINE);
 			default:
 				throw new GlusterRuntimeException("Invalid brick status [" + status + "]");
@@ -66,11 +66,11 @@ public class BrickTableLabelProvider extends TableLabelProviderAdapter {
 		}
 	}
 
-	private String getDiskSpace(Disk disk) {
-		if (disk.isOffline()) {
-			return "NA";
+	private String getDiskFreeSpace(Disk disk) {
+		if (disk.isReady()) {
+			return NumberUtil.formatNumber(disk.getFreeSpace());
 		} else {
-			return NumberUtil.formatNumber(disk.getSpace());
+			return "NA";			
 		}
 	}
 
@@ -85,7 +85,7 @@ public class BrickTableLabelProvider extends TableLabelProviderAdapter {
 		
 		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 8362c477..23bbadd6 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
@@ -69,7 +69,7 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter {
 		}
 	}
 
-	private String getDiskSpace(Disk disk) {
+	private String getDiskFreeSpace(Disk disk) {
 		if (disk.hasErrors() || disk.isUninitialized()) {
 			return "NA";
 		} else {
@@ -88,7 +88,7 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter {
 		
 		return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? brick.getServerName()
 				: columnIndex == DISK_TABLE_COLUMN_INDICES.DISK.ordinal() ? brick.getBrickDirectory()
-				: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE.ordinal() ? getDiskSpace(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.STATUS.ordinal() ? disk.getStatusStr() : "Invalid");
 	}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
index b5a89939..7e47f047 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
@@ -51,10 +51,11 @@ import com.richclientgui.toolbox.duallists.TableColumnData;
 
 public class BricksSelectionPage extends Composite {
 	private enum DISK_TABLE_COLUMN_INDICES {
-		SERVER, BRICK_DIRECTORY, SPACE, SPACE_USED
+		SERVER, BRICK_DIRECTORY, FREE_SPACE, SPACE_USED
 	}
 
-	private static final String[] DISK_TABLE_COLUMNS_NAMES = { "Server", "Brick Directory", "Space (GB)", "Used Space (GB)" };
+	private static final String[] DISK_TABLE_COLUMNS_NAMES = { "Server", "Brick Directory", "Free Space (GB)",
+			"Used Space (GB)" };
 
 	private GUIHelper guiHelper = GUIHelper.getInstance();
 	private CustomTableDualListComposite<Disk> dualTableViewer;
@@ -68,14 +69,15 @@ public class BricksSelectionPage extends Composite {
 
 	private Button btnDown;
 
-	public BricksSelectionPage(final Composite parent, int style, List<Disk> allDisks, List<Disk> selectedDisks, String volumeName) {
+	public BricksSelectionPage(final Composite parent, int style, List<Disk> allDisks, List<Disk> selectedDisks,
+			String volumeName) {
 		super(parent, style);
 
 		createPage(allDisks, selectedDisks, volumeName);
 
 		parent.layout();
 	}
-	
+
 	public void addDiskSelectionListener(ListContentChangedListener<Disk> listener) {
 		dualTableViewer.addChosenListChangedSelectionListener(listener);
 	}
@@ -91,9 +93,10 @@ public class BricksSelectionPage extends Composite {
 
 				Disk disk = (Disk) element;
 				return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName()
-						: columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? disk.getMountPoint() + "/" + volumeName
-								: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE.ordinal() ? NumberUtil
-										.formatNumber(disk.getSpace())
+						: columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? disk.getMountPoint()
+								+ "/" + volumeName
+								: columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? NumberUtil
+										.formatNumber(disk.getFreeSpace())
 										: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE_USED.ordinal() ? NumberUtil
 												.formatNumber(disk.getSpaceInUse()) : "Invalid");
 			}
@@ -101,14 +104,14 @@ public class BricksSelectionPage extends Composite {
 	}
 
 	private int indexOf(List<Disk> disks, Disk searchDisk) {
-		for(Disk disk : disks) {
-			if(disk.getQualifiedName().equals(searchDisk.getQualifiedName())) {
+		for (Disk disk : disks) {
+			if (disk.getQualifiedName().equals(searchDisk.getQualifiedName())) {
 				return disks.indexOf(disk);
 			}
 		}
 		return -1;
 	}
-	
+
 	private void createPage(List<Disk> allDisks, List<Disk> selectedDisks, String volumeName) {
 		setupPageLayout();
 
@@ -135,9 +138,9 @@ public class BricksSelectionPage extends Composite {
 			public void widgetSelected(SelectionEvent e) {
 				chosenDisks = getChosenDisks();
 				List<Disk> selectedDisks = getSelectedChosenDisks();
-				
+
 				chosenBricksContentProvider.removeElements(chosenDisks);
-				for(Disk disk : selectedDisks) {
+				for (Disk disk : selectedDisks) {
 					int index = chosenDisks.indexOf(disk);
 					Disk diskAbove = chosenDisks.get(index - 1);
 					chosenDisks.set(index - 1, disk);
@@ -153,15 +156,15 @@ public class BricksSelectionPage extends Composite {
 		btnDown.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, true, false));
 		btnDown.setImage(guiHelper.getImage(IImageKeys.ARROW_DOWN));
 		btnDown.addSelectionListener(new SelectionAdapter() {
-			
+
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 
 				chosenDisks = getChosenDisks();
 				List<Disk> selectedDisks = getSelectedChosenDisks();
-				
+
 				chosenBricksContentProvider.removeElements(chosenDisks);
-				for(Disk disk : selectedDisks) {
+				for (Disk disk : selectedDisks) {
 					int index = chosenDisks.indexOf(disk);
 					Disk diskBelow = chosenDisks.get(index + 1);
 					chosenDisks.set(index + 1, disk);
@@ -170,7 +173,7 @@ public class BricksSelectionPage extends Composite {
 				chosenBricksContentProvider.addElements(chosenDisks);
 				dualTableViewer.refreshChosenViewer();
 				updateButtons();
-				
+
 			}
 		});
 	}
@@ -179,7 +182,7 @@ public class BricksSelectionPage extends Composite {
 		TableItem[] selectedItems = dualTableViewer.getChosenTable().getSelection();
 		List<Disk> selectedDisks = new ArrayList<Disk>();
 		for (TableItem item : selectedItems) {
-			selectedDisks.add((Disk)item.getData());
+			selectedDisks.add((Disk) item.getData());
 		}
 		return selectedDisks;
 	}
@@ -234,9 +237,11 @@ public class BricksSelectionPage extends Composite {
 		chosenBricksContentProvider = new RemovableContentProvider<Disk>(selectedDisks);
 		dualTableViewer.setChosenContentProvider(chosenBricksContentProvider);
 		dualTableViewer.setChosenLabelProvider(diskLabelProvider);
-		
+
 		dualTableViewer.getChosenTable().addSelectionListener(new SelectionAdapter() {
-			/* (non-Javadoc)
+			/*
+			 * (non-Javadoc)
+			 * 
 			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
 			 */
 			@Override
@@ -251,12 +256,12 @@ public class BricksSelectionPage extends Composite {
 		btnDown.setEnabled(true);
 		List<Disk> selectedChosenDisks = getSelectedChosenDisks();
 		List<Disk> chosenDisks = getChosenDisks();
-		for(Disk disk : selectedChosenDisks) {
-			int index = chosenDisks.indexOf(disk); 
-			if(index == 0) {
+		for (Disk disk : selectedChosenDisks) {
+			int index = chosenDisks.indexOf(disk);
+			if (index == 0) {
 				btnUp.setEnabled(false);
 			}
-			if(index == chosenDisks.size() - 1) {
+			if (index == chosenDisks.size() - 1) {
 				btnDown.setEnabled(false);
 			}
 		}
@@ -296,14 +301,13 @@ public class BricksSelectionPage extends Composite {
 
 		setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 	}
-	
-	
+
 	public List<Disk> getChosenDisks() {
 		Object[] disksArr = (Object[]) chosenBricksContentProvider.getElements(dualTableViewer);
 		if (disksArr != null) {
 			List<Disk> disks = new ArrayList<Disk>();
 			for (Object disk : disksArr) {
-				disks.add( (Disk)disk ); 
+				disks.add((Disk) disk);
 			}
 			return disks;
 		}
@@ -312,16 +316,17 @@ public class BricksSelectionPage extends Composite {
 
 	public List<Brick> getChosenBricks(String volumeName) {
 		Object[] bricksArr = (Object[]) chosenBricksContentProvider.getElements(dualTableViewer);
-		
+
 		if (bricksArr != null) {
 			List<Brick> bricks = new ArrayList<Brick>();
 			for (Object disk : bricksArr) {
-				bricks.add( new Brick( ((Disk) disk).getServerName(), BRICK_STATUS.ONLINE, ((Disk) disk).getName(), ((Disk) disk).getMountPoint() + "/" + volumeName)); // Assumption mount point is not having trailing "/"
+				bricks.add(new Brick(((Disk) disk).getServerName(), BRICK_STATUS.ONLINE, ((Disk) disk).getName(),
+						((Disk) disk).getMountPoint() + "/" + volumeName)); // Assumption mount point is not having
+																			// trailing "/"
 			}
 			return bricks;
 		}
 		return null;
 	}
 
-	
 }
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 7587d0b8..263c4a10 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,10 +34,10 @@ import com.gluster.storage.management.gui.BrickTableLabelProvider;
 public class BricksPage extends AbstractBricksPage {
 
 	public enum BRICK_TABLE_COLUMN_INDICES {
-		SERVER, BRICK, SPACE, SPACE_IN_USE, STATUS
+		SERVER, BRICK, FREE_SPACE, SPACE_IN_USE, STATUS
 	};
 
-	private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Server", "Brick Directory", "Space (GB)",
+	private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Server", "Brick Directory", "Free Space (GB)",
 			"Space in Use (GB)", "Status" };
 
 	public BricksPage(final Composite parent, int style, IWorkbenchSite site, List<Brick> bricks) {
@@ -54,7 +54,7 @@ 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);
 	}
 
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 a8d6f125..84fd6c64 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,10 +33,10 @@ import com.gluster.storage.management.gui.DiskTableLabelProvider;
 public class DisksPage extends AbstractDisksPage {
 
 	public enum DISK_TABLE_COLUMN_INDICES {
-		SERVER, DISK, SPACE, SPACE_IN_USE, STATUS
+		SERVER, DISK, FREE_SPACE, SPACE_IN_USE, STATUS
 	};
 
-	private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Server", "Brick Directory", "Space (GB)",
+	private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Server", "Brick Directory", "Free Space (GB)",
 			"Space in Use (GB)", "Status" };
 
 	public DisksPage(final Composite parent, int style, IWorkbenchSite site, List<Disk> disks) {
@@ -53,7 +53,7 @@ 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.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);
 	}
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java
index c0a69693..3e8e8baa 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java
@@ -88,6 +88,7 @@ public class VolumeOptionsPage extends Composite {
 
 		setupPageLayout();
 		filterText = guiHelper.createFilterText(toolkit, this);
+		createAddButton();
 		setupOptionsTableViewer(filterText);
 		
 		createAddButton();