Merge pull request #36 from Selvasundaram/master

UI feedback changes

4 files changed, 36 insertions, 36 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java
index 34cbfb3b..556c12de 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java
@@ -37,7 +37,7 @@ public class StringUtil {
 			output.append(element).append(delimiter);
 		}
 		String outputStr = output.toString();
-		int endIndex = (list.size() > 1) ? outputStr.length() - (delimiter.length() + 1) : outputStr.length() - 1;
+		int endIndex = (list.size() > 1) ? outputStr.length() - (delimiter.length() + 1) : outputStr.length() - delimiter.length();
 		return outputStr.substring(0, endIndex);
 	}
 
diff --git a/src/com.gluster.storage.management.gui/plugin.xml b/src/com.gluster.storage.management.gui/plugin.xml
index 6c6983a3..4b0de509 100644
--- a/src/com.gluster.storage.management.gui/plugin.xml
+++ b/src/com.gluster.storage.management.gui/plugin.xml
@@ -385,7 +385,7 @@
                definitionId="org.eclipse.ui.window.preferences"
                icon="icons/preferences.png"
                id="com.gluster.storage.management.gui.actions.AddServerAction"
-               label="&Preferences"
+               label="&Settings"
                menubarPath="com.gluster.storage.management.gui.menu.edit/edit"
                mode="FORCE_TEXT"
                pulldown="false"
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 c105fa5a..fec00b7d 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
@@ -102,8 +102,8 @@ public class CreateVolumePage1 extends WizardPage {
 		createTypeLabel(container);
 		createTypeCombo(container);
 		
-		createTransportTypeLabel(container);
-		createTransportTypeValueLabel(container);
+//		createTransportTypeLabel(container);
+//		createTransportTypeValueLabel(container);
 		
 		createDisksLabel(container);
 		createDisksCustomizeLink(container);
@@ -293,7 +293,7 @@ public class CreateVolumePage1 extends WizardPage {
 		IStructuredSelection selection = (IStructuredSelection)typeComboViewer.getSelection();
 		volume.setVolumeType((VOLUME_TYPE)selection.getFirstElement());
 		
-		volume.setTransportType(TRANSPORT_TYPE.ETHERNET);
+		volume.setTransportType(TRANSPORT_TYPE.ETHERNET); // Support only for Ethernet
 		Set<NAS_PROTOCOL> nasProtocols = new HashSet<Volume.NAS_PROTOCOL>();
 		nasProtocols.add(NAS_PROTOCOL.GLUSTERFS);
 		nasProtocols.add(NAS_PROTOCOL.NFS);
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 3c633bf4..b8356ed0 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
@@ -1,5 +1,6 @@
 package com.gluster.storage.management.gui.views;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
 
@@ -29,14 +30,18 @@ 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.Cluster;
 import com.gluster.storage.management.core.model.DefaultClusterListener;
 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.GlusterServer;
+import com.gluster.storage.management.core.model.GlusterServer.SERVER_STATUS;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
 import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 import com.gluster.storage.management.core.utils.NumberUtil;
+import com.gluster.storage.management.core.utils.StringUtil;
 import com.gluster.storage.management.core.utils.ValidationUtil;
 import com.gluster.storage.management.gui.IImageKeys;
 import com.gluster.storage.management.gui.toolbar.GlusterToolbarManager;
@@ -56,6 +61,7 @@ public class VolumeSummaryView extends ViewPart {
 	private ControlDecoration errDecoration;
 	private Composite parent;
 	private static final String COURIER_FONT = "Courier";
+	private Cluster cluster = GlusterDataModelManager.getInstance().getModel().getCluster();
 
 	@Override
 	public void createPartControl(Composite parent) {
@@ -139,42 +145,36 @@ public class VolumeSummaryView extends ViewPart {
 	private void createVolumeMountingInfoSection() {
 		String glusterFs = "Gluster:";
 		String nfs = "NFS:";
-		String glusterFsSyntax = "mount -t glusterfs <SERVER-NAME>:/<VOLUME-NAME> <MOUNT-POINT>";
-		String nfsSyntax = "mount -t nfs <SERVER-NAME>:/nfs/<VOLUME-NAME> <MOUNT-POINT>";
-		String info = "<SERVER-NAME> - Any server name in the storage cloud";
-		String volumeName = volume.getName().trim();
-		String serverName = volume.getDisks().get(0).split(":")[0].trim(); // disk if the form of: "server:disk"
-
-		Composite section = guiHelper.createSection(form, toolkit, "Mounting Information", null, 2, false);
-
-		Label lbl = toolkit.createLabel(section, "Syntax");
-		final int defaultFontSize = lbl.getFont().getFontData()[0].getHeight();
-		final String defaultFontName = lbl.getFont().getFontData()[0].name;
+		String onlineServers = getOnlineServers(10); // Limited to 10 servers
+		String firstOnlineServer = onlineServers.split(",")[0].trim();
+		String glusterFsMountInfo = "mount -t glusterfs " + firstOnlineServer + ":/" + volume.getName()	+ " <mount-point>";
+		String nfsMountInfo = "mount -t nfs " + firstOnlineServer + ":/" + volume.getName() + " <mount-point>";
+		String info = "Server can be any server name in the storage cloud eg. <" + onlineServers + ">"; //TODO: if more than 10 servers... 
 		
-		setLabelStyle(lbl, defaultFontName, defaultFontSize, SWT.BOLD);
-		toolkit.createLabel(section, "");
+		Composite section = guiHelper.createSection(form, toolkit, "Mounting Information", null, 2, false);
 
-		setLabelStyle(toolkit.createLabel(section, glusterFs), defaultFontName, defaultFontSize, SWT.NORMAL);
-		setLabelStyle(toolkit.createLabel(section, glusterFsSyntax, SWT.NONE), COURIER_FONT, 10, SWT.NONE);
+		toolkit.createLabel(section, glusterFs, SWT.NORMAL);
+		setLabelStyle(toolkit.createLabel(section, glusterFsMountInfo, SWT.NONE), COURIER_FONT, 10, SWT.NONE);
 
 		// TODO: Check required if nfs is optional
-		setLabelStyle(toolkit.createLabel(section, nfs), defaultFontName, defaultFontSize, SWT.NORMAL);
-		setLabelStyle(toolkit.createLabel(section, nfsSyntax, SWT.NONE), COURIER_FONT, 10, SWT.NONE);
-
-		toolkit.createLabel(section, "");
-		setLabelStyle(toolkit.createLabel(section, info), defaultFontName, (defaultFontSize - 1), SWT.NONE);
+		toolkit.createLabel(section, nfs, SWT.NORMAL);
+		setLabelStyle(toolkit.createLabel(section, nfsMountInfo, SWT.NONE), COURIER_FONT, 10, SWT.NONE);
 
-		setLabelStyle(toolkit.createLabel(section, "Example"), defaultFontName, defaultFontSize, SWT.BOLD);
 		toolkit.createLabel(section, "");
+		toolkit.createLabel(section, info, SWT.NONE);
+	}
 
-		setLabelStyle(toolkit.createLabel(section, glusterFs), defaultFontName, defaultFontSize, SWT.NORMAL);
-		setLabelStyle(toolkit.createLabel(section, "#mount -t glusterfs " + serverName + ":/" + volumeName + " /mnt"),
-				COURIER_FONT, 10, SWT.NONE);
-
-		// TODO: Check required if nfs is optional
-		setLabelStyle(toolkit.createLabel(section, nfs), defaultFontName, defaultFontSize, SWT.NORMAL);
-		setLabelStyle(toolkit.createLabel(section, "#mount -t nfs " + serverName + ":/" + volumeName + " /mnt"),
-				COURIER_FONT, 10, SWT.NONE);
+	private String getOnlineServers(int maxServers) {
+		List<String> OnlineServers = new ArrayList<String>();
+		for (GlusterServer server : cluster.getServers()) {
+			if (server.getStatus() == SERVER_STATUS.ONLINE) {
+				OnlineServers.add(server.getName());
+				if (OnlineServers.size() >= maxServers) {
+					break;
+				}
+			}
+		}
+		return StringUtil.ListToString(OnlineServers, ", ") + ((OnlineServers.size() > maxServers) ? "..." : "");
 	}
 
 	/**
@@ -196,7 +196,7 @@ public class VolumeSummaryView extends ViewPart {
 
 		createNumOfDisksField(section);
 		createDiskSpaceField(section);
-		createTransportTypeField(section);
+//		createTransportTypeField(section);
 		createNASProtocolField(section);
 		createAccessControlField(section);
 		createStatusField(section);
@@ -398,7 +398,7 @@ public class VolumeSummaryView extends ViewPart {
 
 	private void updateVolumeStatusLabel() {
 		lblStatusValue.setText(volume.getStatusStr());
-		lblStatusValue.setImage(volume.getStatus() == Volume.VOLUME_STATUS.ONLINE ? guiHelper
+		lblStatusValue.setImage((volume.getStatus() == Volume.VOLUME_STATUS.ONLINE) ? guiHelper
 				.getImage(IImageKeys.STATUS_ONLINE) : guiHelper.getImage(IImageKeys.STATUS_OFFLINE));
 		lblStatusValue.redraw();
 	}