Merge pull request #156 from Selvasundaram/master

White space character validation added for change password feature. 

2 files changed, 21 insertions, 3 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ChangePasswordDialog.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ChangePasswordDialog.java
index b1367e00..9fc8fd3c 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ChangePasswordDialog.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ChangePasswordDialog.java
@@ -177,7 +177,7 @@ public class ChangePasswordDialog extends Dialog {
 			return;
 		}
 
-		if (confirmPwd.equals(CoreConstants.DEFAULT_PASSWORD)) {
+		if (confirmPwd.equals(CoreConstants.DEFAULT_PASSWORD) || isContainsWhiteSpace(confirmPwd)) {
 			okButton.setEnabled(false);
 			return;
 		}
@@ -199,6 +199,10 @@ public class ChangePasswordDialog extends Dialog {
 		setupDataBinding();
 	}
 
+	public boolean isContainsWhiteSpace(String text) {
+		return text.matches(".*[\\s\\\\].*"); // White space or backslash
+	}
+	
 	public class ConfirmPasswordValidator extends StringRequiredValidator {
 		public ConfirmPasswordValidator(String errorText, ControlDecoration controlDecoration, Control linkedControl) {
 			super(errorText, controlDecoration, linkedControl);
@@ -210,6 +214,10 @@ public class ChangePasswordDialog extends Dialog {
 			IStatus status = super.validate(value);
 			if (status.isOK()) {
 				String errMsg = null;
+				if (errMsg == null && isContainsWhiteSpace( newPassword.getText())) {
+					errMsg = "Password should not contain space or back slash characters";
+				}
+				
 				if (!value.equals(newPassword.getText())) {
 					errMsg = "Passwords mismatched";
 				}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
index 9879f2af..91a4e9b2 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
@@ -78,6 +78,9 @@ public class VolumeSummaryView extends ViewPart {
 	private String nfsMountInfo;
 	private Label nfsLabel;
 	private String nfs;
+	
+	private Label numberOfBricks;
+	private Label totalDiskSpace;
 
 	@Override
 	public void createPartControl(Composite parent) {
@@ -97,6 +100,7 @@ public class VolumeSummaryView extends ViewPart {
 				updateVolumeStatusLabel();
 				populateAccessControlText();
 				changeNFSStatus(volume.isNfsEnabled());
+				updateBrickChanges(volume);
 				toolbarManager.updateToolbar(volume);
 			}
 		};
@@ -420,6 +424,12 @@ public class VolumeSummaryView extends ViewPart {
 		nfsLabel.setVisible(isNFSExported);
 		nfsCheckBox.setSelection(isNFSExported);
 	}
+	
+	
+	private void updateBrickChanges(Volume volume) {
+		numberOfBricks.setText("" + volume.getNumOfBricks());
+		totalDiskSpace.setText("" + NumberUtil.formatNumber((getTotalDiskSpace() / 1024)));
+	}
 
 //	private void createChangeLinkForNASProtocol(Composite section, final Button nfsCheckBox) {
 //		final Hyperlink nasChangeLink = toolkit.createHyperlink(section, "change", SWT.NONE);
@@ -489,7 +499,7 @@ public class VolumeSummaryView extends ViewPart {
 	private void createDiskSpaceField(Composite section) {
 		Label diskSpaceLabel = toolkit.createLabel(section, "Total Disk Space (GB): ", SWT.NONE);
 		diskSpaceLabel.setToolTipText("<b>bold</b>normal");
-		toolkit.createLabel(section, "" + NumberUtil.formatNumber((getTotalDiskSpace() / 1024)), SWT.NONE);
+		totalDiskSpace = toolkit.createLabel(section, "" + NumberUtil.formatNumber((getTotalDiskSpace() / 1024)), SWT.NONE);
 		toolkit.createLabel(section, "", SWT.NONE); // dummy
 	}
 
@@ -520,7 +530,7 @@ public class VolumeSummaryView extends ViewPart {
 
 	private void createNumOfBricksField(Composite section) {
 		toolkit.createLabel(section, "Number of Bricks: ", SWT.NONE);
-		toolkit.createLabel(section, "" + volume.getNumOfBricks(), SWT.NONE);
+		numberOfBricks = toolkit.createLabel(section, "" + volume.getNumOfBricks(), SWT.NONE);
 		toolkit.createLabel(section, "", SWT.NONE); // dummy
 	}