Task updates in UI

4 files changed, 26 insertions, 10 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
index d6757cba..33343726 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
@@ -55,7 +55,7 @@ public class Cluster extends Entity {
 	}
 
 	public void deleteVolume(Volume volume) {
-		volumes.remove(volume);		
+		volumes.remove(volume);
 	}
 	
 	public void setServers(List<GlusterServer> servers) {
@@ -93,6 +93,11 @@ public class Cluster extends Entity {
 	public void addVolume(Volume volume) {
 		this.volumes.add(volume);
 	}
+	
+	public void updateVolume(String volumeName, List<Brick> bricks) {
+		Volume volume = getVolume(volumeName);
+		volume.setBricks(bricks);
+	}
 
 	public Cluster(String name, Entity parent) {
 		super(name, parent);
@@ -156,4 +161,13 @@ public class Cluster extends Entity {
 		}
 		return null;
 	}
+	
+	public Volume getVolume(String volumeName) {
+		for (Volume volume : getVolumes() ) {
+			if (volume.getName().equals(volumeName)) {
+				return volume;
+			}
+		}
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java
index 99594b5d..1e172d1c 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java
@@ -22,6 +22,7 @@ public class Event {
 	public enum EVENT_TYPE {
 		BRICKS_ADDED,
 		BRICKS_REMOVED,
+		BRICK_REPLACED,
 		NETWORK_INTERFACE_ADDED,
 		NETWORK_INTERFACE_REMOVED,
 		VOLUME_STATUS_CHANGED,
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskInfo.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskInfo.java
index 1ce2fa04..d3267ec4 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskInfo.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskInfo.java
@@ -78,28 +78,28 @@ public class TaskInfo extends Entity {
 	public void setStatus(TaskStatus status) {
 		this.status = status;
 	}
-
-	public Boolean canPause() {
+	
+	public Boolean getPauseSupported() {
 		return pauseSupported;
 	}
 
-	public void setCanPause(Boolean canPause) {
+	public void setPauseSupported(Boolean canPause) {
 		this.pauseSupported = canPause;
 	}
 
-	public Boolean canStop() {
+	public Boolean getStopSupported() {
 		return stopSupported;
 	}
-
-	public void setCanStop(Boolean canStop) {
+	
+	public void setStopSupported(Boolean canStop) {
 		this.stopSupported = canStop;
 	}
 	
-	public Boolean canCommit() {
+	public Boolean getCommitSupported() {
 		return this.commitSupported;
 	}
 	
-	public void setCanCommit(Boolean canCommit) {
+	public void setCommitSupported(Boolean canCommit) {
 		this.commitSupported = canCommit;
 	}
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskInfoListResponse.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskInfoListResponse.java
index 0ab27c35..ba1c4f9f 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskInfoListResponse.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskInfoListResponse.java
@@ -20,6 +20,7 @@
  */
 package com.gluster.storage.management.core.response;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
@@ -29,7 +30,7 @@ import com.gluster.storage.management.core.model.TaskInfo;
 
 @XmlRootElement(name = "tasks")
 public class TaskInfoListResponse {
-	private List<TaskInfo> taskInfoList;
+	private List<TaskInfo> taskInfoList = new ArrayList<TaskInfo>();
 
 	public TaskInfoListResponse() {