UI Changes - Disk to brick label changes

6 files changed, 20 insertions, 20 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeLogTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeLogTableLabelProvider.java
index 9858a25b..396d1821 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeLogTableLabelProvider.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeLogTableLabelProvider.java
@@ -19,21 +19,21 @@
 package com.gluster.storage.management.gui;
 
 
-import com.gluster.storage.management.core.model.LogMessage;
+import com.gluster.storage.management.core.model.VolumeLogMessage;
 import com.gluster.storage.management.core.utils.DateUtil;
 import com.gluster.storage.management.gui.views.details.VolumeLogsPage.LOG_TABLE_COLUMN_INDICES;
 
 public class VolumeLogTableLabelProvider extends TableLabelProviderAdapter {
 	@Override
 	public String getColumnText(Object element, int columnIndex) {
-		if (!(element instanceof LogMessage)) {
+		if (!(element instanceof VolumeLogMessage)) {
 			return null;
 		}
 
-		LogMessage logMessage = (LogMessage) element;
+		VolumeLogMessage logMessage = (VolumeLogMessage) element;
 		return (columnIndex == LOG_TABLE_COLUMN_INDICES.DATE.ordinal() ? DateUtil.formatDate(logMessage.getTimestamp()) 
 			: columnIndex == LOG_TABLE_COLUMN_INDICES.TIME.ordinal() ? DateUtil.formatTime(logMessage.getTimestamp())
-			: columnIndex == LOG_TABLE_COLUMN_INDICES.DISK.ordinal() ? logMessage.getDisk()
+			: columnIndex == LOG_TABLE_COLUMN_INDICES.BRICK.ordinal() ? logMessage.getBrickDirectory()
 			: columnIndex == LOG_TABLE_COLUMN_INDICES.SEVERITY.ordinal() ? "" + logMessage.getSeverity()
 			: columnIndex == LOG_TABLE_COLUMN_INDICES.MESSAGE.ordinal() ? logMessage.getMessage() : "Invalid");
 	}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
index d46c71d8..e7f46a66 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
@@ -213,7 +213,7 @@ public class CreateVolumePage1 extends WizardPage {
 	private void createDisksLabel(Composite container) {
 		Label lblDisks = new Label(container, SWT.RIGHT);
 		lblDisks.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-		lblDisks.setText("Disks: ");
+		lblDisks.setText("Bricks: ");
 	}
 
 	private void createTransportTypeValueLabel(Composite container) {
@@ -340,15 +340,15 @@ public class CreateVolumePage1 extends WizardPage {
 		int diskCount = selectedDisks.size();
 		
 		if(diskCount  < 1) {
-			setError("At least one disk must be selected!");
+			setError("At least one brick must be selected!");
 		}
 
 		VOLUME_TYPE volumeType = (VOLUME_TYPE) ((IStructuredSelection) typeComboViewer
 				.getSelection()).getFirstElement();
 		if (volumeType == VOLUME_TYPE.DISTRIBUTED_MIRROR && diskCount % 2 != 0) {
-			setError("Mirror type volume requires disks in multiples of two");
+			setError("Mirror type volume requires bricks in multiples of two");
 		} else if (volumeType == VOLUME_TYPE.DISTRIBUTED_STRIPE && diskCount % 4 != 0) {
-			setError("Stripe type volume requires disks in multiples of four");
+			setError("Stripe type volume requires bricks in multiples of four");
 		}
 	}
 	
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java
index da9d6544..cc5c2b63 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java
@@ -184,7 +184,7 @@ public class ClusterSummaryView extends ViewPart {
 		CLabel lblAlert = new CLabel(section, SWT.FLAT);
 		Image alertImage = null;
 		switch (alert.getType()) {
-		case OFFLINE_VOLUME_DISKS_ALERT:
+		case OFFLINE_VOLUME_BRICKS_ALERT:
 			alertImage = guiHelper.getImage(IImageKeys.DISK_OFFLINE);
 			break;
 		case DISK_USAGE_ALERT:
@@ -293,7 +293,7 @@ public class ClusterSummaryView extends ViewPart {
 		case DISK_FORMAT:
 			taskImage = guiHelper.getImage(IImageKeys.DISK);
 			break;
-		case DISK_MIGRATE:
+		case BRICK_MIGRATE:
 			taskImage = guiHelper.getImage(IImageKeys.DISK_MIGRATE);
 			break;
 		case VOLUME_REBALANCE:
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 11717ee7..2d9b8700 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
@@ -127,7 +127,7 @@ public class VolumeSummaryView extends ViewPart {
 		List<Alert> alerts = GlusterDataModelManager.getInstance().getModel().getCluster().getAlerts();
 
 		for (int i = 0; i < alerts.size(); i++) {
-			if (alerts.get(i).getType() == Alert.ALERT_TYPES.OFFLINE_VOLUME_DISKS_ALERT
+			if (alerts.get(i).getType() == Alert.ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT
 					&& alerts.get(i).getReference().split(":")[0].trim().equals(volume.getName())) {
 				addAlertLabel(section, alerts.get(i));
 			}
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 7909f155..990e569c 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
@@ -96,7 +96,7 @@ public class VolumesSummaryView extends ViewPart {
 	}
 
 	private void addAlertLabel(Composite section, Alert alert) {
-		if (alert.getType() == Alert.ALERT_TYPES.OFFLINE_VOLUME_DISKS_ALERT) {
+		if (alert.getType() == Alert.ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT) {
 			CLabel lblAlert = new CLabel(section, SWT.NONE);
 			lblAlert.setImage((alert.getType() == Alert.ALERT_TYPES.DISK_USAGE_ALERT) ? guiHelper
 					.getImage(IImageKeys.LOW_DISK_SPACE) : guiHelper.getImage(IImageKeys.DISK_OFFLINE));
@@ -118,14 +118,14 @@ public class VolumesSummaryView extends ViewPart {
 
 	private void addRunningTaskLabel(Composite section, RunningTask task) {
 		// Task related to Volumes context
-		if (task.getType() == RunningTask.TASK_TYPES.DISK_MIGRATE
+		if (task.getType() == RunningTask.TASK_TYPES.BRICK_MIGRATE
 				|| task.getType() == RunningTask.TASK_TYPES.VOLUME_REBALANCE) {
 			if (task.getStatus().isPercentageSupported()) {
 				// TODO Progress bar
 			}
 			CLabel lblAlert = new CLabel(section, SWT.NONE);
 			lblAlert.setText(task.getTaskInfo());
-			lblAlert.setImage((task.getType() == RunningTask.TASK_TYPES.DISK_MIGRATE) ? guiHelper
+			lblAlert.setImage((task.getType() == RunningTask.TASK_TYPES.BRICK_MIGRATE) ? guiHelper
 					.getImage(IImageKeys.DISK_MIGRATE) : guiHelper.getImage(IImageKeys.VOLUME_REBALANCE));
 			lblAlert.redraw();
 		}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java
index 811b4c5c..a7249dab 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeLogsPage.java
@@ -51,7 +51,7 @@ import com.gluster.storage.management.client.VolumesClient;
 import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.constants.GlusterConstants;
 import com.gluster.storage.management.core.constants.GlusterConstants.VOLUME_LOG_LEVELS;
-import com.gluster.storage.management.core.model.LogMessage;
+import com.gluster.storage.management.core.model.VolumeLogMessage;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.response.LogMessageListResponse;
@@ -68,10 +68,10 @@ public class VolumeLogsPage extends Composite {
 	private Volume volume;
 
 	public enum LOG_TABLE_COLUMN_INDICES {
-		DATE, TIME, DISK, SEVERITY, MESSAGE
+		DATE, TIME, BRICK, SEVERITY, MESSAGE
 	};
 
-	private static final String[] LOG_TABLE_COLUMN_NAMES = new String[] { "Date", "Time", "Disk", "Severity", "Message" };
+	private static final String[] LOG_TABLE_COLUMN_NAMES = new String[] { "Date", "Time", "Brick", "Severity", "Message" };
 	private TableViewer tableViewer;
 	private Combo disksCombo;
 	private Combo severityCombo;
@@ -189,8 +189,8 @@ public class VolumeLogsPage extends Composite {
 						severityCombo.getText(), fromTimestamp, toTimestamp, Integer.parseInt(lineCountText.getText()));
 				Status status = response.getStatus();
 				if (status.isSuccess()) {
-					List<LogMessage> logMessages = response.getLogMessages();
-					tableViewer.setInput(logMessages.toArray(new LogMessage[0]));
+					List<VolumeLogMessage> logMessages = response.getLogMessages();
+					tableViewer.setInput(logMessages.toArray(new VolumeLogMessage[0]));
 					tableViewer.refresh();
 				} else {
 					MessageDialog.openError(getShell(), "Volume Logs", "Error while fetching volume logs: [" + status
@@ -373,7 +373,7 @@ public class VolumeLogsPage extends Composite {
 
 		setColumnProperties(table, LOG_TABLE_COLUMN_INDICES.DATE, SWT.CENTER, 50);
 		setColumnProperties(table, LOG_TABLE_COLUMN_INDICES.TIME, SWT.CENTER, 50);
-		setColumnProperties(table, LOG_TABLE_COLUMN_INDICES.DISK, SWT.CENTER, 50);
+		setColumnProperties(table, LOG_TABLE_COLUMN_INDICES.BRICK, SWT.CENTER, 50);
 		setColumnProperties(table, LOG_TABLE_COLUMN_INDICES.SEVERITY, SWT.CENTER, 50);
 		setColumnProperties(table, LOG_TABLE_COLUMN_INDICES.MESSAGE, SWT.LEFT, 100);
 	}