Task#111 - Auto-refresh of data in views

2 files changed, 12 insertions, 7 deletions

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 62f70040..7378116a 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
@@ -23,7 +23,6 @@ public class Event {
 		BRICKS_ADDED,
 		BRICKS_REMOVED,
 		BRICKS_CHANGED,
-		BRICK_REPLACED,
 		VOLUME_STATUS_CHANGED,
 		VOLUME_OPTIONS_RESET,
 		VOLUME_OPTION_SET,
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
index 7a53b88f..250d05c3 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
@@ -24,6 +24,7 @@ import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
@@ -274,8 +275,8 @@ public class Volume extends Entity {
 
 		if (!(getName().equals(volume.getName()) && getVolumeType() == volume.getVolumeType()
 				&& getTransportType() == volume.getTransportType() && getStatus() == volume.getStatus()
-				&& getReplicaCount() == volume.getReplicaCount() && getStripeCount() == volume.getStripeCount())
-				&& getOptions().equals(volume.getOptions())) {
+				&& getReplicaCount() == volume.getReplicaCount() && getStripeCount() == volume.getStripeCount()
+				&& getOptions().equals(volume.getOptions()))) {
 			return false;
 		}
 
@@ -285,10 +286,15 @@ public class Volume extends Entity {
 			}
 		}
 		
-		for (Brick brick : getBricks()) {
-			if (!(brick.equals(GlusterCoreUtil.getEntity(volume.getBricks(), brick.getName(), false)))) {
-				return false;
-			}
+		List<Brick> oldBricks = getBricks();
+		List<Brick> newBricks = volume.getBricks();
+		if(oldBricks.size() != newBricks.size()) {
+			return false;
+		}
+
+		Map<Brick, Brick> modifiedBricks = GlusterCoreUtil.getModifiedEntities(oldBricks, newBricks);
+		if(modifiedBricks.size() > 0) {
+			return false;
 		}
 		
 		return true;