Merge branch 'tasks'

Conflicts:
	src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddBrickAction.java
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
	src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateBrickTask.java
	src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java

9 files changed, 38 insertions, 44 deletions

diff --git a/src/com.gluster.storage.management.gui/plugin.xml b/src/com.gluster.storage.management.gui/plugin.xml
index 5b18421f..b0dfa9a9 100644
--- a/src/com.gluster.storage.management.gui/plugin.xml
+++ b/src/com.gluster.storage.management.gui/plugin.xml
@@ -476,7 +476,7 @@
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.MigrateDiskAction"
+               class="com.gluster.storage.management.gui.actions.MigrateBrickAction"
                definitionId="com.gluster.storage.management.gui.commands.MigrateDisk"
                icon="icons/disk-migrate.png"
                id="com.gluster.storage.management.gui.actions.MigrateDiskAction"
@@ -593,7 +593,7 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.RemoveDiskAction"
+               class="com.gluster.storage.management.gui.actions.RemoveBrickAction"
                definitionId="com.gluster.storage.management.gui.commands.RemoveDisk"
                icon="icons/disk.png"
                id="com.gluster.storage.management.gui.actions.RemoveDiskAction"
@@ -609,7 +609,7 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.AddDiskAction"
+               class="com.gluster.storage.management.gui.actions.AddBrickAction"
                definitionId="com.gluster.storage.management.gui.commands.AddDisk"
                icon="icons/disk.png"
                id="com.gluster.storage.management.gui.actions.AddDiskAction"
@@ -659,7 +659,7 @@
                definitionId="com.gluster.storage.management.gui.commands.Commit"
                icon="icons/stop.png"
                id="com.gluster.storage.management.gui.actions.Commit"
-               label="&amp;Commit TaskTask"
+               label="&amp;Commit Task"
                menubarPath="com.gluster.storage.management.gui.menu.cluster/cluster"
                mode="FORCE_TEXT"
                pulldown="false"
@@ -1206,7 +1206,7 @@
             objectClass="com.gluster.storage.management.core.model.Volume">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.MigrateDiskAction"
+               class="com.gluster.storage.management.gui.actions.MigrateBrickAction"
                definitionId="com.gluster.storage.management.gui.commands.MigrateDisk"
                enablesFor="1"
                icon="icons/disk-migrate.png"
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddDiskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddBrickAction.java
index be2cacee..e86164ec 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddDiskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddBrickAction.java
@@ -1,5 +1,5 @@
 /**
- * AddDiskAction.java
+ * AddBrickAction.java
  *
  * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
@@ -27,9 +27,9 @@ import org.eclipse.jface.wizard.WizardDialog;
 
 import com.gluster.storage.management.client.GlusterDataModelManager;
 import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.gui.dialogs.AddDiskWizard;
+import com.gluster.storage.management.gui.dialogs.AddBrickWizard;
 
-public class AddDiskAction extends AbstractActionDelegate {
+public class AddBrickAction extends AbstractActionDelegate {
 	private Volume volume;
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
 	
@@ -43,7 +43,7 @@ public class AddDiskAction extends AbstractActionDelegate {
 		// TODO: open a dialog box
 		// MessageDialog.openInformation(getShell(), "Action captured", action.getDescription() + "\n" +
 		// volume.getName());
-		AddDiskWizard wizard = new AddDiskWizard(volume); // Also add single page
+		AddBrickWizard wizard = new AddBrickWizard(volume); // Also add single page
 
 		WizardDialog dialog = new WizardDialog(getShell(), wizard);
 		dialog.create();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
index d353898c..86e3032e 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
@@ -22,9 +22,10 @@ public class CommitTaskAction extends AbstractActionDelegate {
 			new TasksClient().commitTask(taskInfo.getName());
 			taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_SUCCESS, "Committed")));
 			modelManager.removeTask(taskInfo);
-			Volume volume = (new VolumesClient()).getVolume( taskInfo.getReference());
-			modelManager.updateVolumeBricks(getVolume(taskInfo.getReference()), volume.getBricks());
-			
+			Volume volume = (new VolumesClient()).getVolume(taskInfo.getReference());
+			modelManager.updateVolumeBricks(modelManager.getModel().getCluster().getVolume(taskInfo.getReference()),
+					volume.getBricks());
+
 			showInfoDialog(actionDesc, "Commit successful");
 		} catch (Exception e) {
 			showErrorDialog(actionDesc,
@@ -47,14 +48,4 @@ public class CommitTaskAction extends AbstractActionDelegate {
 	public void dispose() {
 
 	}
-	
-	private Volume getVolume(String volumeName) {
-		for (Volume volume : modelManager.getModel().getCluster().getVolumes() ) {
-			if (volume.getName().equals(volumeName)) {
-				return volume;
-			}
-		}
-		return null;
-	}
-
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/MigrateDiskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/MigrateBrickAction.java
index 2512a188..41770d98 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/MigrateDiskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/MigrateBrickAction.java
@@ -26,16 +26,16 @@ import org.eclipse.jface.wizard.WizardDialog;
 
 import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.gui.dialogs.MigrateDiskWizard;
+import com.gluster.storage.management.gui.dialogs.MigrateBrickWizard;
 import com.gluster.storage.management.gui.utils.GUIHelper;
 
-public class MigrateDiskAction extends AbstractActionDelegate {
+public class MigrateBrickAction extends AbstractActionDelegate {
 	private Volume volume;
 	private Brick brick;
 
 	@Override
 	protected void performAction(IAction action) {
-		MigrateDiskWizard wizard = new MigrateDiskWizard(volume, brick);
+		MigrateBrickWizard wizard = new MigrateBrickWizard(volume, brick);
 
 		WizardDialog dialog = new WizardDialog(window.getShell(), wizard);
 		dialog.create();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveBrickAction.java
index d4c5a54a..0f411a59 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveDiskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveBrickAction.java
@@ -20,7 +20,7 @@ import com.gluster.storage.management.gui.IImageKeys;
 import com.gluster.storage.management.gui.utils.GUIHelper;
 import com.gluster.storage.management.gui.views.VolumeBricksView;
 
-public class RemoveDiskAction extends AbstractActionDelegate {
+public class RemoveBrickAction extends AbstractActionDelegate {
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
 	private GUIHelper guiHelper = GUIHelper.getInstance();
 	private Set<Brick> bricks;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickPage.java
index 48a46c84..961dca88 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickPage.java
@@ -39,7 +39,7 @@ import com.richclientgui.toolbox.duallists.IRemovableContentProvider;
  * @author root
  * 
  */
-public class AddDiskPage extends WizardPage {
+public class AddBrickPage extends WizardPage {
 	private List<Disk> availableDisks = new ArrayList<Disk>();
 	private List<Disk> selectedDisks = new ArrayList<Disk>();
 	private Volume volume = null;
@@ -51,7 +51,7 @@ public class AddDiskPage extends WizardPage {
 	/**
 	 * @param pageName
 	 */
-	protected AddDiskPage(Volume volume) {
+	protected AddBrickPage(Volume volume) {
 		super(PAGE_NAME);
 		this.volume = volume;
 		setTitle("Add Brick");
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskWizard.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickWizard.java
index bb55ece1..bcb3ce3d 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddDiskWizard.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickWizard.java
@@ -38,18 +38,18 @@ import com.gluster.storage.management.core.utils.StringUtil;
 /**
  *
  */
-public class AddDiskWizard extends Wizard {
-	private AddDiskPage page;
+public class AddBrickWizard extends Wizard {
+	private AddBrickPage page;
 	private Volume volume;
 
-	public AddDiskWizard(Volume volume) {
+	public AddBrickWizard(Volume volume) {
 		setWindowTitle("Gluster Management Console - Add Brick");
 		setHelpAvailable(false); // TODO: Introduce wizard help
 		this.volume = volume;
 	}
 
 	public void addPages() {
-		page = new AddDiskPage(volume);
+		page = new AddBrickPage(volume);
 		addPage(page);
 	}
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskPage1.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java
index 4533ca23..f7ce744f 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskPage1.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java
@@ -1,21 +1,24 @@
-/*******************************************************************************
+/**
+ * MigrateBrickPage1.java
+ *
  * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
+ * Gluster Management Console is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License as published
  * by the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
- *  
- * Gluster Management Console is distributed in the hope that it will be useful, 
+ *
+ * Gluster Management Console is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
  * for more details.
- *  
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- *******************************************************************************/
+ */
+
 package com.gluster.storage.management.gui.dialogs;
 
 import java.util.List;
@@ -48,7 +51,7 @@ import com.gluster.storage.management.core.utils.NumberUtil;
 import com.gluster.storage.management.gui.TableLabelProviderAdapter;
 import com.gluster.storage.management.gui.utils.GUIHelper;
 
-public class MigrateDiskPage1 extends WizardPage {
+public class MigrateBrickPage1 extends WizardPage {
 	private static final String PAGE_NAME = "migrate.disk.page.1";
 
 	private enum DISK_TABLE_COLUMN_INDICES {
@@ -118,7 +121,7 @@ public class MigrateDiskPage1 extends WizardPage {
 	/**
 	 * Create the wizard.
 	 */
-	public MigrateDiskPage1(Volume volume, Brick brick) {
+	public MigrateBrickPage1(Volume volume, Brick brick) {
 		super(PAGE_NAME);
 		this.volume = volume;
 		this.fromBrick = brick;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickWizard.java
index 2d65a869..4693726b 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskWizard.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickWizard.java
@@ -30,12 +30,12 @@ import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.Volume;
 
-public class MigrateDiskWizard extends Wizard {
+public class MigrateBrickWizard extends Wizard {
 	private Volume volume;
 	private Brick brick;
-	private MigrateDiskPage1 page;
+	private MigrateBrickPage1 page;
 
-	public MigrateDiskWizard(Volume volume, Brick brick) {
+	public MigrateBrickWizard(Volume volume, Brick brick) {
 		setWindowTitle("Gluster Management Console - Migrate Brick [" + volume.getName() + "]");
 		this.volume = volume;
 		this.brick = brick;
@@ -44,7 +44,7 @@ public class MigrateDiskWizard extends Wizard {
 
 	@Override
 	public void addPages() {
-		page = new MigrateDiskPage1(volume, brick);
+		page = new MigrateBrickPage1(volume, brick);
 		addPage(page);
 	}