summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorShireesh Anjal <anjalshireesh@gmail.com>2011-07-24 01:44:34 -0700
committerShireesh Anjal <anjalshireesh@gmail.com>2011-07-24 01:44:34 -0700
commit0075542d9b5a27b3f7eb401dd833e1b24ad666cb (patch)
tree497849e8e9f377dc8f0f8615b6316c5dc7cc5cf2 /src
parent8077add7f47fd238b58892d0c7ae10c0b8f07e5b (diff)
parented377718d72e222bd6f7be4eb254252a8481f564 (diff)
Merge pull request #146 from Selvasundaram/master
Old passowrd validation added
Diffstat (limited to 'src')
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ChangePasswordDialog.java3
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceInitializer.java3
2 files changed, 4 insertions, 2 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 00f2aab0..b1367e00 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
@@ -268,10 +268,9 @@ public class ChangePasswordDialog extends Dialog {
try {
usersClient.changePassword(user, oldPassword, newPassword);
MessageDialog.openInformation(getShell(), "Change password", "Password changed successfully!");
+ this.close();
} catch (Exception e) {
MessageDialog.openError(getShell(), "Change password Failed", e.getMessage());
- setReturnCode(RETURN_CODE_ERROR);
}
- this.close();
}
}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceInitializer.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceInitializer.java
index f889a259..726e62b4 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceInitializer.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceInitializer.java
@@ -44,6 +44,9 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
// Default CPU utilisation threshold
store.setDefault(PreferenceConstants.P_SERVER_CPU_CRITICAL_THRESHOLD, 95);
+ // Default Memory threshold
+ store.setDefault(PreferenceConstants.P_SERVER_MEMORY_USAGE_THRESHOLD, 90);
+
// Default disk free space threshold
store.setDefault(PreferenceConstants.P_DISK_SPACE_USAGE_THRESHOLD, 90);