Bug 2848 - Create volume not working

3 files changed, 48 insertions, 17 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/IActionSetIDs.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/IActionConstants.java
index 6c54bae8..5e47da3b 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/IActionSetIDs.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/IActionConstants.java
@@ -18,7 +18,7 @@
  *******************************************************************************/
 package com.gluster.storage.management.gui.actions;
 
-public interface IActionSetIDs {
+public interface IActionConstants {
 	public static final String ACTION_SET_CLUSTER = "com.gluster.storage.management.gui.actionsets.gluster";
 	public static final String ACTION_SET_VOLUMES = "com.gluster.storage.management.gui.actionsets.volumes";
 	public static final String ACTION_SET_VOLUME = "com.gluster.storage.management.gui.actionsets.volume";
@@ -30,4 +30,8 @@ public interface IActionSetIDs {
 	public static final String ACTION_SET_DISCOVERED_SERVER = "com.gluster.storage.management.gui.actionsets.serverdiscovered";
 	
 	public static final String ACTION_SET_EDIT = "com.gluster.storage.management.gui.actionsets.edit";
+	
+	public static final String COMMAND_CREATE_VOLUME = "com.gluster.storage.management.gui.commands.CreateVolume";
+	public static final String COMMAND_ADD_SERVER = "com.gluster.storage.management.gui.commands.AddServer";
+	public static final String VIEW_DISCOVERED_SERVER = "com.gluster.storage.management.gui.views.DiscoveredServerView";
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/toolbar/GlusterToolbarManager.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/toolbar/GlusterToolbarManager.java
index a98c7862..cef0bf5d 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/toolbar/GlusterToolbarManager.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/toolbar/GlusterToolbarManager.java
@@ -30,7 +30,7 @@ import com.gluster.storage.management.core.model.EntityGroup;
 import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.Server;
 import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.gui.actions.IActionSetIDs;
+import com.gluster.storage.management.gui.actions.IActionConstants;
 
 public class GlusterToolbarManager implements ToolbarManager {
 	private enum ENTITY_TYPE {
@@ -53,13 +53,13 @@ public class GlusterToolbarManager implements ToolbarManager {
 
 	private Map<ENTITY_TYPE, String> createActionSetMap() {
 		Map<ENTITY_TYPE, String> actionSetMap = new HashMap<GlusterToolbarManager.ENTITY_TYPE, String>();
-		actionSetMap.put(ENTITY_TYPE.CLUSTER, IActionSetIDs.ACTION_SET_CLUSTER);
-		actionSetMap.put(ENTITY_TYPE.VOLUMES, IActionSetIDs.ACTION_SET_VOLUMES);
-		actionSetMap.put(ENTITY_TYPE.VOLUME, IActionSetIDs.ACTION_SET_VOLUME);
-		actionSetMap.put(ENTITY_TYPE.GLUSTER_SERVERS, IActionSetIDs.ACTION_SET_GLUSTER_SERVERS);
-		actionSetMap.put(ENTITY_TYPE.GLUSTER_SERVER, IActionSetIDs.ACTION_SET_GLUSTER_SERVER);
-		actionSetMap.put(ENTITY_TYPE.DISCOVERED_SERVERS, IActionSetIDs.ACTION_SET_DISCOVERED_SERVERS);
-		actionSetMap.put(ENTITY_TYPE.DISCOVERED_SERVER, IActionSetIDs.ACTION_SET_DISCOVERED_SERVER);
+		actionSetMap.put(ENTITY_TYPE.CLUSTER, IActionConstants.ACTION_SET_CLUSTER);
+		actionSetMap.put(ENTITY_TYPE.VOLUMES, IActionConstants.ACTION_SET_VOLUMES);
+		actionSetMap.put(ENTITY_TYPE.VOLUME, IActionConstants.ACTION_SET_VOLUME);
+		actionSetMap.put(ENTITY_TYPE.GLUSTER_SERVERS, IActionConstants.ACTION_SET_GLUSTER_SERVERS);
+		actionSetMap.put(ENTITY_TYPE.GLUSTER_SERVER, IActionConstants.ACTION_SET_GLUSTER_SERVER);
+		actionSetMap.put(ENTITY_TYPE.DISCOVERED_SERVERS, IActionConstants.ACTION_SET_DISCOVERED_SERVERS);
+		actionSetMap.put(ENTITY_TYPE.DISCOVERED_SERVER, IActionConstants.ACTION_SET_DISCOVERED_SERVER);
 
 		return actionSetMap;
 	}
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 b2d2b93a..fdc32c2a 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
@@ -25,18 +25,22 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.forms.events.HyperlinkAdapter;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ImageHyperlink;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.part.ViewPart;
 
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.core.model.Cluster;
+import com.gluster.storage.management.core.model.Entity;
 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.Volume;
 import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 import com.gluster.storage.management.gui.IImageKeys;
+import com.gluster.storage.management.gui.actions.IActionConstants;
 import com.gluster.storage.management.gui.utils.GUIHelper;
 import com.gluster.storage.management.gui.views.details.tabcreators.PieChartViewerComposite;
 
@@ -50,6 +54,7 @@ public class ClusterSummaryView extends ViewPart {
 	private final FormToolkit toolkit = new FormToolkit(Display.getCurrent());
 	private ScrolledForm form;
 	private Cluster cluster;
+	private Entity entity;
 
 	/*
 	 * (non-Javadoc)
@@ -59,10 +64,10 @@ public class ClusterSummaryView extends ViewPart {
 	@Override
 	public void createPartControl(Composite parent) {
 		if (cluster == null) {
-			//cluster = (Cluster)guiHelper.getSelectedEntity(getSite(), Cluster.class);
-			cluster = (Cluster)GlusterDataModelManager.getInstance().getModel().getChildren().get(0);
+			// cluster = (Cluster)guiHelper.getSelectedEntity(getSite(), Cluster.class);
+			cluster = (Cluster) GlusterDataModelManager.getInstance().getModel().getChildren().get(0);
 		}
-		
+
 		createSections(parent);
 	}
 
@@ -75,7 +80,7 @@ public class ClusterSummaryView extends ViewPart {
 		}
 		return count;
 	}
-	
+
 	private int getServerCountByStatus(Cluster cluster, SERVER_STATUS status) {
 		int count = 0;
 		for (GlusterServer server : cluster.getServers()) {
@@ -105,12 +110,13 @@ public class ClusterSummaryView extends ViewPart {
 
 	private void createStatusChart(FormToolkit toolkit, Composite section, Double[] values) {
 		String[] categories = new String[] { "Online", "Offline" };
-		PieChartViewerComposite chartViewerComposite = new PieChartViewerComposite(section, SWT.NONE, categories, values);
+		PieChartViewerComposite chartViewerComposite = new PieChartViewerComposite(section, SWT.NONE, categories,
+				values);
 
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.widthHint = 250;
 		data.heightHint = 250;
-		chartViewerComposite.setLayoutData(data);	
+		chartViewerComposite.setLayoutData(data);
 	}
 
 	private void createActionsSection() {
@@ -120,14 +126,35 @@ public class ClusterSummaryView extends ViewPart {
 		imageHyperlink.setText("Create Volume");
 		imageHyperlink.setImage(guiHelper.getImage(IImageKeys.CREATE_VOLUME_BIG));
 		imageHyperlink.addHyperlinkListener(new HyperlinkAdapter() {
-			// TODO: Override appropriate method and handle hyperlink event
+			@Override
+			public void linkActivated(HyperlinkEvent e) {
+				IHandlerService hs = (IHandlerService) getSite().getService(IHandlerService.class);
+				try {
+					hs.executeCommand(IActionConstants.COMMAND_CREATE_VOLUME, null);
+				} catch (Exception e1) {
+					e1.printStackTrace();
+				}
+			}
 		});
 
 		imageHyperlink = toolkit.createImageHyperlink(section, SWT.NONE);
 		imageHyperlink.setText("Add Server(s)");
 		imageHyperlink.setImage(guiHelper.getImage(IImageKeys.ADD_SERVER_BIG));
 		imageHyperlink.addHyperlinkListener(new HyperlinkAdapter() {
-			// TODO: Override appropriate method and handle hyperlink event
+			@Override
+			public void linkActivated(HyperlinkEvent e) {
+				// TODO Open the "discovered servers" view programmatically"
+				IHandlerService hs = (IHandlerService) getSite().getService(IHandlerService.class);
+				try {
+					hs.executeCommand(IActionConstants.COMMAND_ADD_SERVER, null);
+				} catch (Exception e1) {
+					e1.printStackTrace();
+				}
+
+				NavigationView clusterView = (NavigationView) guiHelper
+						.getView(IActionConstants.VIEW_DISCOVERED_SERVER);
+				clusterView.selectEntity((entity));
+			}
 		});
 	}