summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSelvasundaram <selvam@gluster.com>2011-07-19 15:35:58 +0530
committerSelvasundaram <selvam@gluster.com>2011-07-19 15:35:58 +0530
commit3ee5ef2d7f86d9b0ebd70391375d05330b23da21 (patch)
tree92baed7ba3968051d3fe655fec97fdba5faabc15 /src
parent640b11b99f65de55d68750b6139583e5a12e611c (diff)
parentce3119b58a842a01d8a7ea1af9bc8860aeff991d (diff)
Merge branch 'master' of github.com:gluster/console
Diffstat (limited to 'src')
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java12
1 files changed, 6 insertions, 6 deletions
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 4ac01d14..31fb71b8 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
@@ -90,18 +90,18 @@ public class BricksSelectionPage extends Composite {
@Override
public String getColumnText(Object element, int columnIndex) {
- if (!(element instanceof Disk)) {
+ if (!(element instanceof Device)) {
return null;
}
- Disk disk = (Disk) element;
- return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName()
- : columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? disk.getMountPoint()
+ Device device = (Device) element;
+ return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? device.getServerName()
+ : columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? device.getMountPoint()
+ "/" + volumeName
: columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? NumberUtil
- .formatNumber((disk.getFreeSpace() / 1024))
+ .formatNumber((device.getFreeSpace() / 1024))
: columnIndex == DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? NumberUtil
- .formatNumber((disk.getSpace() / 1024)) : "Invalid");
+ .formatNumber((device.getSpace() / 1024)) : "Invalid");
}
};
}