Merge branch 'master' of github.com:Selvasundaram/console

Conflicts:
	src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AlertsClient.java
	src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
	src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java
	src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/AlertListResponse.java
	src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/RunningTask.java
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
	src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/AlertsResource.java
	src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java

4 files changed, 5 insertions, 9 deletions

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AlertsClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AlertsClient.java
index ad258797..6adf198b 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AlertsClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AlertsClient.java
@@ -27,7 +27,3 @@ public class AlertsClient  extends AbstractClient {
 		return response.getAlerts();
 	}
 }
-
-
-
-
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java
index 947867c9..cfc710df 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java
@@ -4,8 +4,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "alert")
 public class Alert {
+
 	public enum ALERT_TYPES { CPU_USAGE_ALERT, MEMORY_USAGE_ALERT, DISK_USAGE_ALERT, OFFLINE_VOLUME_DISKS_ALERT, OFFLINE_SERVERS_ALERT };
-	
 	public static final String[] ALERT_TYPE_STR = {"High CPU Usage", "High Memory Usage", "Low Disk Space", "Offline Disks", "Offline Servers" };
 
 	protected String id;
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 72987d0a..5950bd38 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
@@ -30,12 +30,10 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.Alert;
 import com.gluster.storage.management.core.model.EntityGroup;
 import com.gluster.storage.management.core.model.Cluster;
 import com.gluster.storage.management.core.model.GlusterDataModel;
-import com.gluster.storage.management.core.model.RunningTaskStatus;
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.core.model.RunningTask;
 import com.gluster.storage.management.core.model.Volume;
@@ -119,6 +117,9 @@ public class VolumesSummaryView extends ViewPart {
 
 		// Cluster cluster = GlusterDataModelManager.getInstance().getModel().getCluster();
 
+		GlusterDataModel model = GlusterDataModelManager.getInstance().getModel();
+		Cluster cluster = (Cluster) model.getChildren().get(0);
+
 		Double[] values = new Double[] { Double.valueOf(getVolumeCountByStatus(volumes, VOLUME_STATUS.ONLINE)),
 				Double.valueOf(getVolumeCountByStatus(volumes, VOLUME_STATUS.OFFLINE)) };
 		createStatusChart(toolkit, section, values);
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java
index 5bd73e15..2177085e 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java
@@ -98,10 +98,9 @@ public class RunningTaskResource {
 
 	@SuppressWarnings("rawtypes")
 	public Response startTask(@FormParam("taskType") RunningTask.TASK_TYPES taskType) {
-		
 		String taskTypeStr =  StringUtil.removeSpaces( new RunningTask().getTaskType(taskType) );
 		String managerClassName = PKG + "." + taskTypeStr + MANAGER;
-		
+
 		Class managerClass;
 		RunningTaskManager manager = null;
 		try {