diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-10-20 10:14:51 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-10-20 10:14:51 +0530 |
| commit | 0fdcfc9aae7d7d0a279a4034c9470f967df2f65a (patch) | |
| tree | 137d37825711ae78eb4553117d2f07fb419e6f5f /src/com.gluster.storage.management.console/src | |
| parent | 23256a8c5d9bdabb43960770a08015f177c5b012 (diff) | |
| parent | 7e88adeca93e3a91cb94ae97dfeaaf34abeebe52 (diff) | |
Merge branch 'master' of git@github.com:gluster/console
Diffstat (limited to 'src/com.gluster.storage.management.console/src')
2 files changed, 15 insertions, 7 deletions
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java index db416c07..a8667c33 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java @@ -54,7 +54,11 @@ public class MigrateBrickAction extends AbstractActionDelegate { action.setEnabled(false); if (selectedEntity instanceof Brick) { bricks = GUIHelper.getInstance().getSelectedEntities(getWindow(), Brick.class); - brick = bricks.iterator().next(); + if ( bricks.iterator().hasNext()) { + brick = bricks.iterator().next(); + } else { + brick = null; + } action.setEnabled(brick != null); } } diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java index dfa0b352..e3d9d2bf 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java @@ -147,18 +147,18 @@ public class MigrateBrickPage1 extends WizardPage { this.volume = volume; this.fromBrick = brick; setTitle("Migrate Brick [" + volume.getName() + "]"); - setPageDescription(null, null); + setPageDescription(fromBrick.getQualifiedName(), null); setPageComplete(false); } private void setPageDescription(String source, String target) { - if (source == null || source.equals("")) { - source = "From Brick"; + if (source == null) { + source = ""; } - if (target == null || target.equals("")) { - target = "To Brick"; + if (target == null) { + target = ""; } - setDescription("Migrate volume data from \"" + source + "\" to \"" + target + "\""); + setDescription("Migrate data from \"" + source + "\" to \"" + target + "\""); } private Object getSelectedItem(TableViewer tableViewer) { @@ -194,6 +194,9 @@ public class MigrateBrickPage1 extends WizardPage { public String getTargetBrickDir() { Device targetDevice = (Device)getSelectedItem(tableViewerTo); + if (targetDevice == null) { + return ""; + } return targetDevice.getQualifiedBrickName(volume.getName()); } @@ -290,6 +293,7 @@ public class MigrateBrickPage1 extends WizardPage { @Override public void selectionChanged(SelectionChangedEvent event) { refreshButtonStatus(); + setPageDescription(getSourceBrickDir(), getTargetBrickDir()); } }); return tableViewer; |