Added new plug-in project for help, Changed title of all summary views to "Summary", modified not to show the disk usage pie chart when the storage cloud is empty.

8 files changed, 31 insertions, 7 deletions

diff --git a/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF
index 076a2805..55029ee6 100644
--- a/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF
+++ b/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
  com.ibm.icu;bundle-version="4.2.1",
  com.richclientgui.rcptoolbox;bundle-version="1.0.5",
  org.eclipse.core.resources,
- org.apache.commons.lang;bundle-version="2.3.0"
+ org.apache.commons.lang;bundle-version="2.3.0",
+ com.gluster.storage.management.console.help;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/src/com.gluster.storage.management.gui/preferences.ini b/src/com.gluster.storage.management.gui/preferences.ini
index 91228592..24389288 100644
--- a/src/com.gluster.storage.management.gui/preferences.ini
+++ b/src/com.gluster.storage.management.gui/preferences.ini
@@ -1 +1,2 @@
-org.eclipse.ui/KEY_CONFIGURATION_ID = com.gluster.storage.management.gui.KeyConfig
\ No newline at end of file
+org.eclipse.ui/KEY_CONFIGURATION_ID = com.gluster.storage.management.gui.KeyConfig
+org.eclipse.help.base/help_home=/com.gluster.storage.management.console.help/html/help_home.html
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java
index 3f6cb7d5..fa613efd 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java
@@ -46,6 +46,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
 	 */
 	private IWorkbenchAction exitAction;
 	private IWorkbenchAction aboutAction;
+	private IWorkbenchAction helpContentsAction;
 
 	private GUIHelper guiHelper = GUIHelper.getInstance();
 
@@ -68,6 +69,11 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
 		aboutAction.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Application.PLUGIN_ID,
 				IImageKeys.HELP));
 		register(aboutAction);
+		
+		helpContentsAction = ActionFactory.HELP_CONTENTS.create(window);
+		helpContentsAction.setText("&Contents");
+		//helpContentsAction.setImageDescriptor(newImage)
+		register(helpContentsAction);
 	}
 
 	protected void fillMenuBar(IMenuManager menuBar) {
@@ -78,6 +84,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
 
 		// Help
 		MenuManager helpMenu = new MenuManager("&Help", IWorkbenchActionConstants.M_HELP);
+		helpMenu.add(helpContentsAction);
 		helpMenu.add(aboutAction);
 
 		menuBar.add(fileMenu);
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 4ec1f586..c37bcd76 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
@@ -78,7 +78,7 @@ public class ClusterSummaryView extends ViewPart {
 		if (cluster == null) {
 			cluster = model.getCluster();
 		}
-
+		setPartName("Summary");
 		createSections(parent);
 	}
 
@@ -127,6 +127,10 @@ public class ClusterSummaryView extends ViewPart {
 	
 	private void createDiskSpaceSection() {
 		Composite section = guiHelper.createSection(form, toolkit, "Disk Space", null, 3, false);
+		if (cluster.getServers().size() == 0) {
+			toolkit.createLabel(section, "This section will be populated after at least one server is added to the storage cloud.");
+			return;
+		}
 		
 		double totalDiskSpace = cluster.getTotalDiskSpace();
 		double diskSpaceInUse = cluster.getDiskSpaceInUse();
@@ -241,6 +245,7 @@ public class ClusterSummaryView extends ViewPart {
 		createServersSection();
 		createDiskSpaceSection();
 		createCPUUsageSection();
+		createNetworkUsageSection();
 		//createMemoryUsageSection();
 		createActionsSection();
 		createAlertsSection();
@@ -256,9 +261,18 @@ public class ClusterSummaryView extends ViewPart {
 
 	private void createCPUUsageSection() {
 		Composite section = guiHelper.createSection(form, toolkit, "CPU Usage (aggregated)", null, 1, false);
+		if (cluster.getServers().size() == 0) {
+			toolkit.createLabel(section, "This section will be populated after at least one server is added to the storage cloud.");
+			return;
+		}
 		toolkit.createLabel(section, "Historical CPU Usage graph aggregated across all servers will be displayed here.");
 	}
 
+	private void createNetworkUsageSection() {
+		Composite section = guiHelper.createSection(form, toolkit, "Network Usage", null, 1, false);
+		toolkit.createLabel(section, "Historical Network Usage graph will be displayed here.");
+	}
+
 	private void createRunningTasksSection() {
 		Composite section = guiHelper.createSection(form, toolkit, "Running Tasks", null, 1, false);
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java
index 87ad17d6..d43cab15 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java
@@ -68,6 +68,7 @@ public class GlusterServerSummaryView extends ViewPart {
 		if (server == null) {
 			server = (GlusterServer) guiHelper.getSelectedEntity(getSite(), GlusterServer.class);
 		}
+		setPartName("Summary");
 		createSections(parent);
 	}
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java
index bb9114b3..080ebace 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java
@@ -54,7 +54,7 @@ public class GlusterServersSummaryView extends ViewPart {
 		if (servers == null) {
 			servers = (EntityGroup<GlusterServer>)guiHelper.getSelectedEntity(getSite(), EntityGroup.class);
 		}
-		
+		setPartName("Summary");
 		createSections(parent);
 	}
 
@@ -62,12 +62,11 @@ public class GlusterServersSummaryView extends ViewPart {
 	 * @param parent
 	 */
 	private void createSections(Composite parent) {
-		form = guiHelper.setupForm(parent, toolkit, "Volumes - Summary");
+		form = guiHelper.setupForm(parent, toolkit, "Servers - Summary");
 		
 		createSummarySection();
 		createRunningTasksSection();
 		createAlertsSection();
-
 		
 		parent.layout(); // IMP: lays out the form properly
 	}
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 1c9577ac..3c633bf4 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
@@ -64,6 +64,7 @@ public class VolumeSummaryView extends ViewPart {
 		}
 
 		this.parent = parent;
+		setPartName("Summary");
 		createSections();
 
 		// Refresh the navigation tree whenever there is a change to the data model
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 2b9d7178..bc136b61 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
@@ -72,7 +72,7 @@ public class VolumesSummaryView extends ViewPart {
 				volumes = (EntityGroup<Volume>) selectedObj;
 			}
 		}
-
+		setPartName("Summary");
 		createSections(parent);
 	}