Story #38 - CPU Usage graph

2 files changed, 11 insertions, 11 deletions

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 7f5526a8..40b0491d 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
@@ -345,24 +345,25 @@ public class ClusterSummaryView extends ViewPart {
 		parent.layout(); // IMP: lays out the form properly
 	}
 
-	private ChartViewerComposite createAreaChartSection(ServerStats stats, String sectionTitle, int dataColumnIndex, String unit, String timestampFormat, ChartPeriodLinkListener listener) {
+	private void createAreaChartSection(ServerStats stats, String sectionTitle, int dataColumnIndex, String unit, String timestampFormat, ChartPeriodLinkListener listener) {
 		Composite section = guiHelper.createSection(form, toolkit, sectionTitle, null, 1, false);
 		
 		List<Calendar> timestamps = new ArrayList<Calendar>();
 		List<Double> data = new ArrayList<Double>();
-		extractChartData(stats, timestamps, data, dataColumnIndex);
 		
-		if(timestamps.size() == 0) {
-			toolkit.createLabel(section, "Server statistics not available!\n Please check if all services are running properly on the cluster servers.");
-			return null;
-		}
-
 		if (cluster.getServers().size() == 0) {
 			toolkit.createLabel(section, "This section will be populated after at least\none server is added to the storage cloud.");
-			return null;
+			return;
 		}
 		
-		ChartViewerComposite chart = createAreaChart(section, timestamps.toArray(new Calendar[0]), data.toArray(new Double[0]), unit, timestampFormat);
+		extractChartData(stats, timestamps, data, dataColumnIndex);
+		
+		if(timestamps.size() == 0) {
+			toolkit.createLabel(section, "Server statistics not available!\n Check if all services are running properly on the cluster servers.");
+			return;
+		}
+
+		createAreaChart(section, timestamps.toArray(new Calendar[0]), data.toArray(new Double[0]), unit, timestampFormat);
 
 //		Calendar[] timestamps = new Calendar[] { new CDateTime(1000l*1310468100), new CDateTime(1000l*1310468400), new CDateTime(1000l*1310468700),
 //				new CDateTime(1000l*1310469000), new CDateTime(1000l*1310469300), new CDateTime(1000l*1310469600), new CDateTime(1000l*1310469900),
@@ -374,7 +375,6 @@ public class ClusterSummaryView extends ViewPart {
 //		Double[] values = new Double[] { 10d, 11.23d, 17.92d, 18.69d, 78.62d, 89.11d, 92.43d, 89.31d, 57.39d, 18.46d, 10.44d, 16.28d, 13.51d, 17.53d, 12.21, 20d, 21.43d, 16.45d, 14.86d, 15.27d };
 //		createLineChart(section, timestamps, values, "%");
 		createChartLinks(section, 4, listener);
-		return chart;
 	}
 
 	private void createCPUUsageSection() {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java
index 2d5034ec..1b2bb41e 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java
@@ -528,7 +528,7 @@ public class GlusterServersResource extends AbstractServersResource {
 			return notFoundResponse("Cluster [" + clusterName + "] not found!");
 		}
 
-		if (cluster.getServers().size() == 0) {
+		if (cluster.getServers().isEmpty()) {
 			// cluster is empty. return empty stats.
 			return okResponse(new ServerStats(), mediaType);
 		}