summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.gui
diff options
context:
space:
mode:
authorShireesh Anjal <shireesh@gluster.com>2011-04-30 22:42:39 +0530
committerShireesh Anjal <shireesh@gluster.com>2011-04-30 22:42:39 +0530
commit3227c53d097b715efcbef0029e70abf68eff5219 (patch)
treec30988a271de4d18af96fa04136a77ccff0fdd8b /src/com.gluster.storage.management.gui
parentffcf099e6186502e750676b9b266963d23c62756 (diff)
parent60f77939c0f58886bef1249b724fd66306adf3ec (diff)
Merge branch 'master' of github.com:gluster/console
Diffstat (limited to 'src/com.gluster.storage.management.gui')
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java
index 9ddb976a..d5501082 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java
@@ -47,7 +47,7 @@ public class DeleteVolumeAction extends AbstractActionDelegate {
Integer deleteOption = new MessageDialog(getShell(), "Delete Volume", GUIHelper.getInstance().getImage(
IImageKeys.VOLUME), warningMessage, MessageDialog.QUESTION, new String[] { "Cancel",
- "Delete volume, keep back-up of data", "Delete volume and it's data" }, 2).open();
+ "Delete volume and it's data", "Delete volume, keep back-up of data" }, 2).open();
if (deleteOption == 0) {
return;
}
@@ -63,8 +63,12 @@ public class DeleteVolumeAction extends AbstractActionDelegate {
return;
}
}
+ String confirmDelete = "";
+ if (deleteOption == 1) {
+ confirmDelete = "-d";
+ }
- status = client.deleteVolume(volume, deleteOption.toString());
+ status = client.deleteVolume(volume, confirmDelete);
if (status.isSuccess()) {
showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] deleted successfully!");
modelManager.deleteVolume(volume);