From af90f2ca0b63d6acd6f168e61b7e6b903a30eaa3 Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Mon, 8 Aug 2011 21:10:28 +0530 Subject: Fixed Bug 3201 - Task view should open in GUI when a task is started. --- .../management/console/actions/RebalanceVolumeAction.java | 1 + .../storage/management/console/dialogs/MigrateBrickWizard.java | 2 ++ .../gluster/storage/management/console/utils/GUIHelper.java | 4 ++++ .../management/console/views/pages/AbstractDisksPage.java | 2 +- .../management/gateway/constants/VolumeOptionsDefaults.java | 10 ++-------- 5 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java index d154439e..14c001aa 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java @@ -46,6 +46,7 @@ public class RebalanceVolumeAction extends AbstractActionDelegate { GlusterDataModelManager.getInstance().getModel().getCluster().addTaskInfo(taskInfo); } showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] rebalance started successfully!"); + guiHelper.showTaskView(); } catch (Exception e) { showErrorDialog(actionDesc, "Volume rebalance could not be started on [" + volume.getName() + "]! Error: [" + e.getMessage() + "]"); diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java index b52125c7..eef810fe 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java @@ -26,6 +26,7 @@ import org.eclipse.jface.wizard.Wizard; import com.gluster.storage.management.client.TasksClient; import com.gluster.storage.management.client.VolumesClient; import com.gluster.storage.management.console.GlusterDataModelManager; +import com.gluster.storage.management.console.utils.GUIHelper; import com.gluster.storage.management.core.model.Brick; import com.gluster.storage.management.core.model.Cluster; import com.gluster.storage.management.core.model.TaskInfo; @@ -85,6 +86,7 @@ public class MigrateBrickWizard extends Wizard { } } MessageDialog.openInformation(getShell(), dialogTitle, "Brick migration started successfully"); + GUIHelper.getInstance().showTaskView(); } catch (Exception e) { MessageDialog.openError(getShell(), dialogTitle, "Brick Migration failed! [" + e.getMessage() + "]"); diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java index 9f53c047..caeca0fa 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java @@ -80,6 +80,7 @@ import org.eclipse.ui.forms.widgets.Section; import org.eclipse.ui.progress.IProgressConstants; import com.gluster.storage.management.console.Application; +import com.gluster.storage.management.console.GlusterDataModelManager; import com.gluster.storage.management.console.IImageKeys; import com.gluster.storage.management.console.views.NavigationView; import com.gluster.storage.management.console.views.TasksView; @@ -458,6 +459,9 @@ public class GUIHelper { public void showTaskView() { try { + NavigationView navigationView = (NavigationView) getView(NavigationView.ID); + navigationView.selectEntity(GlusterDataModelManager.getInstance().getModel().getCluster()); + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() .showView( TasksView.ID ); } catch (PartInitException e) { diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java index 62bbd871..cf702ef5 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java @@ -268,7 +268,7 @@ public abstract class AbstractDisksPage extends AbstractTableTreeViewerPage", "") - .replaceAll("", "").replaceAll("", "", ""); - Object response = serverUtil.unmarshal(VolumeOptionInfoListResponse.class, xml); - if (response instanceof Status) { - throw new GlusterRuntimeException(((Status) response).getMessage()); - } - return (VolumeOptionInfoListResponse) response; + xml = xml.replaceAll("", "").replaceAll("", ""); + return serverUtil.unmarshal(VolumeOptionInfoListResponse.class, xml); } -- cgit