[power-architect] r3878 committed - The change password dialog will only prompt for your password if you a...

[codesite-noreply]

Revision: 3878
Author: mc3an...@uwaterloo.ca
Date: Fri Aug 13 07:42:07 2010
Log: The change password dialog will only prompt for your password if you  
are changing your own password.
http://code.google.com/p/power-architect/source/detail?r=3878
Modified:
  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java

=======================================
---  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java	 
Thu Aug 12 08:18:05 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java	 
Fri Aug 13 07:42:07 2010
@@ -67,6 +67,10 @@
     private static final ImageIcon GROUP_ICON = new  
ImageIcon(UserEditorPanel.class.getResource("icons/group.png"));

     private final ArchitectSwingProject securityWorkspace;
+
+    /**
+     * The User being modifed by this panel
+     */
     private final User user;

     private final JPanel panel;
@@ -88,6 +92,9 @@
     private final JLabel availableGroupsLabel;
     private final JScrollPane availableGroupsScrollPane;

+    /**
+     * The name of the current user.
+     */
     private final String username;

     private final PrivilegesEditorPanel privilegesEditorPanel;
@@ -162,11 +169,13 @@
             CellConstraints cc = new CellConstraints();
             DefaultFormBuilder dialogBuilder = new DefaultFormBuilder(new  
FormLayout(
                     "pref:grow", "pref, pref, pref, pref, pref, pref,  
pref"));
-            dialogBuilder.add(new JLabel("Enter your old password"),  
cc.xy(1, 1));
-            dialogBuilder.add(oldPasswordField, cc.xy(1, 2));
-            dialogBuilder.add(new JLabel("Enter your new password"),  
cc.xy(1, 3));
+            if (user.getName().equals(username)) {
+                dialogBuilder.add(new JLabel("Enter your old password"),  
cc.xy(1, 1));
+                dialogBuilder.add(oldPasswordField, cc.xy(1, 2));
+            }
+            dialogBuilder.add(new JLabel("Enter new password"), cc.xy(1,  
3));
             dialogBuilder.add(newPasswordField, cc.xy(1, 4));
-            dialogBuilder.add(new JLabel("Confirm your password"),  
cc.xy(1, 5));
+            dialogBuilder.add(new JLabel("Confirm new password"), cc.xy(1,  
5));
             dialogBuilder.add(newPasswordFiled2, cc.xy(1, 6));

             ButtonBarBuilder2 bbb =  
ButtonBarBuilder2.createLeftToRightBuilder();