Task#111 - Auto-refresh of data in views

7 files changed, 19 insertions, 28 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeOptionsTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeOptionsTableLabelProvider.java
index 007c7adb..cd85d22b 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeOptionsTableLabelProvider.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeOptionsTableLabelProvider.java
@@ -20,19 +20,16 @@ package com.gluster.storage.management.gui;
 
 import java.util.Map.Entry;
 
-import com.gluster.storage.management.gui.utils.GUIHelper;
 import com.gluster.storage.management.gui.views.pages.VolumeOptionsPage.OPTIONS_TABLE_COLUMN_INDICES;
 
 public class VolumeOptionsTableLabelProvider extends TableLabelProviderAdapter {
-	private GUIHelper guiHelper = GUIHelper.getInstance();
-	
 	@Override
 	public String getColumnText(Object element, int columnIndex) {
 		if (!(element instanceof Entry)) {
 			return null;
 		}
 
-		Entry<String, String> entry = (Entry) element;
+		Entry<String, String> entry = (Entry<String, String>) element;
 		String key = entry.getKey();
 		String value = entry.getValue();
 		return (columnIndex == OPTIONS_TABLE_COLUMN_INDICES.OPTION_KEY.ordinal() ? key
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveBrickAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveBrickAction.java
index 0f411a59..f7d1207c 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveBrickAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveBrickAction.java
@@ -47,10 +47,6 @@ public class RemoveBrickAction extends AbstractActionDelegate {
 				VolumesClient client = new VolumesClient();
 				try {
 					client.removeBricks(volume.getName(), bricks, confirmDelete);
-					// Remove the bricks from the volume object
-					for (Brick brick : bricks) {
-						volume.removeBrick(brick);
-					}
 					// Update model with removed bricks in the volume
 					modelManager.removeBricks(volume, bricks);
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickPage.java
index 961dca88..bd36ff7c 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickPage.java
@@ -21,7 +21,9 @@
 package com.gluster.storage.management.gui.dialogs;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
@@ -90,12 +92,11 @@ public class AddBrickPage extends WizardPage {
 		return availableDisks;
 	}
 
-
-	public List<Disk> getChosenDisks( ) {
-		return page.getChosenDisks();
+	public Set<Disk> getChosenDisks() {
+		return new HashSet<Disk>(page.getChosenDisks());
 	}
 	
-	public List<Brick> getChosenBricks( String volumeName ) {
+	public Set<Brick> getChosenBricks( String volumeName ) {
 		return page.getChosenBricks(volumeName);
 	}
 	
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickWizard.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickWizard.java
index bcb3ce3d..58255f8c 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickWizard.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickWizard.java
@@ -20,8 +20,9 @@
  */
 package com.gluster.storage.management.gui.dialogs;
 
-import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
@@ -29,10 +30,7 @@ import org.eclipse.jface.wizard.Wizard;
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.client.VolumesClient;
 import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
 import com.gluster.storage.management.core.utils.StringUtil;
 
 /**
@@ -60,15 +58,12 @@ public class AddBrickWizard extends Wizard {
 	 */
 	@Override
 	public boolean performFinish() {
-		List<Brick> bricks = page.getChosenBricks(volume.getName());
+		Set<Brick> bricks = page.getChosenBricks(volume.getName());
 		VolumesClient volumeClient = new VolumesClient();
 		try {
-			List<String> brickList = getBrickList(bricks);
+			Set<String> brickList = getBrickList(bricks);
 			
 			volumeClient.addBricks(volume.getName(), brickList);
-			List<Disk> disks = page.getChosenDisks();
-			volume.addDisks(GlusterCoreUtil.getQualifiedDiskNames(disks));
-			volume.addBricks(bricks);
 
 			// Update model with new bricks in the volume
 			GlusterDataModelManager.getInstance().addBricks(volume, bricks);
@@ -82,8 +77,8 @@ public class AddBrickWizard extends Wizard {
 		}
 	}
 
-	private List<String> getBrickList(List<Brick> bricks) {
-		List<String> brickList = new ArrayList<String>();
+	private Set<String> getBrickList(Set<Brick> bricks) {
+		Set<String> brickList = new HashSet<String>();
 		for(Brick brick : bricks) {
 			brickList.add(brick.getServerName() + ":" + brick.getBrickDirectory());
 		}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
index fbfb52d1..db963b18 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
@@ -19,7 +19,9 @@
 package com.gluster.storage.management.gui.dialogs;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.swt.SWT;
@@ -314,11 +316,11 @@ public class BricksSelectionPage extends Composite {
 		return null;
 	}
 
-	public List<Brick> getChosenBricks(String volumeName) {
+	public Set<Brick> getChosenBricks(String volumeName) {
 		Object[] bricksArr = (Object[]) chosenBricksContentProvider.getElements(dualTableViewer);
 
 		if (bricksArr != null) {
-			List<Brick> bricks = new ArrayList<Brick>();
+			Set<Brick> bricks = new HashSet<Brick>();
 			for (Object disk : bricksArr) {
 				bricks.add(new Brick(((Disk) disk).getServerName(), BRICK_STATUS.ONLINE, ((Disk) disk).getName(),
 						((Disk) disk).getMountPoint() + "/" + volumeName)); // Assumption mount point is not having
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
index a4152899..e010ed5c 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
@@ -18,8 +18,8 @@
  *******************************************************************************/
 package com.gluster.storage.management.gui.dialogs;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -112,7 +112,7 @@ public class SelectDisksDialog extends Dialog {
 		return disksPage.getChosenDisks();
 	}
 
-	public List<Brick> getSelectedBricks(String volumeName) {
+	public Set<Brick> getSelectedBricks(String volumeName) {
 		return disksPage.getChosenBricks(volumeName);
 	}
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/NavigationView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/NavigationView.java
index 458dcf61..8acb4a75 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/NavigationView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/NavigationView.java
@@ -82,7 +82,7 @@ public class NavigationView extends ViewPart implements ISelectionListener {
 
 		// Refresh the navigation tree whenever there is a change to the data model
 		GlusterDataModelManager.getInstance().addClusterListener(new DefaultClusterListener() {
-			public void clusterChanged() {
+			public void modelChanged() {
 				treeViewer.refresh();
 			}