Remove disk comment fixes

3 files changed, 15 insertions, 5 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 9d479f0c..cfcf8656 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
@@ -63,9 +63,10 @@ public class DeleteVolumeAction extends AbstractActionDelegate {
 				return;
 			}
 		}
-		String confirmDelete = "";
+		
+		boolean confirmDelete = false;
 		if (deleteOption == 1) {
-			confirmDelete = "-d";
+			confirmDelete = true;
 		}
 
 		status = client.deleteVolume(volume, confirmDelete);
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/RemoveDiskAction.java
index 1524f334..0735b63f 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/RemoveDiskAction.java
@@ -32,13 +32,13 @@ public class RemoveDiskAction extends AbstractActionDelegate {
 				IImageKeys.VOLUME), "Are you sure you want to remove disks from volume [" + volume.getName()
 				+ "] ?", MessageDialog.QUESTION, new String[] { "Cancel", "Remove disks, delete volume data from them",
 				"Remove disks, back-up volume data from them" }, 2).open();
-		if (deleteOption == 0) {
+		if (deleteOption <= 0) { // By Cancel button(0) or Escape key(-1)
 			return;
 		}
 
-		String confirmDelete = "";
+		boolean confirmDelete = false;
 		if (deleteOption == 1) {
-			confirmDelete = "-d";
+			confirmDelete = true;
 		}
 
 		VolumesClient client = new VolumesClient(modelManager.getSecurityToken());
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
index e319dcca..c105fa5a 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
@@ -25,8 +25,10 @@ import java.util.Set;
 
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
@@ -195,6 +197,7 @@ public class CreateVolumePage1 extends WizardPage {
 				        	// user has customized disks. get them from the dialog box.
 				        	volume.setDisks(dialog.getSelectedBricks());
 				        	linkCustomize.setText("" + volume.getDisks().size() + " Disk(s) (<a>customize</a>)");
+				        	validateForm();
 				        }
 					}
 				});
@@ -233,6 +236,12 @@ public class CreateVolumePage1 extends WizardPage {
 				return Volume.getVolumeTypeStr(volumeType);
 			}
 		});
+		typeComboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				validateForm();				
+			}
+		});
 	}
 
 	private void createTypeLabel(Composite container) {