Changeset 1202 for branches/3.0-Beta1/components/tools/admin

Timestamp:

01/24/07 11:09:53 (19 months ago)

Author:

callan

Message:

[1167:1197/trunk]

Location:

branches/3.0-Beta1/components/tools/admin/src/adminTool

Files:

• groupPanel/GroupsTab.java (modified) (4 diffs)
• groupPanel/GroupsTabController.java (modified) (5 diffs)
• groupPanel/SetDefaultAction.java (copied) (copied from trunk/components/tools/admin/src/adminTool/groupPanel/SetDefaultAction.java)
• main/AdminWindow.java (modified) (4 diffs)
• model/Model.java (modified) (1 diff)
• ui/ImageFactory.java (modified) (1 diff)
• usersPanel/PasswordAction.java (modified) (2 diffs)
• usersPanel/UsersTab.java (modified) (10 diffs)
• usersPanel/UsersTabController.java (modified) (3 diffs)

branches/3.0-Beta1/components/tools/admin/src/adminTool/groupPanel/GroupsTab.java

@@ -79 +79 @@
     private JButton saveBtn;
 
+    private JButton setDefaultBtn;
+
     private JButton addUserBtn;
 
@@ -175 +177 @@
         removeUserBtn.addActionListener(new UserAction(UserAction.REMOVE,
                 controller));
+        setDefaultBtn.addActionListener(new SetDefaultAction(controller));
         groupList.selectFirstGroup();
     }
@@ -223 +226 @@
     void createActionButtons() {
         saveBtn = new JButton("Save");
+        setDefaultBtn = new JButton("Set Default Group");
+        
         ImageIcon addUserIcon = ImageFactory.get().image(
+                ImageFactory.RIGHT_ARROW);
+        ImageIcon removeUserIcon = ImageFactory.get().image(
                 ImageFactory.LEFT_ARROW);
-        ImageIcon removeUserIcon = ImageFactory.get().image(
-                ImageFactory.RIGHT_ARROW);
         ImageIcon addGroupIcon = ImageFactory.get()
                 .image(ImageFactory.ADD_USER);
@@ -284 +289 @@
         JPanel buttonPanel = new JPanel();
         buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS));
-        buttonPanel.add(Box.createHorizontalStrut(250));
+        buttonPanel.add(Box.createHorizontalStrut(100));
+        buttonPanel.add(setDefaultBtn);
+        buttonPanel.add(Box.createHorizontalStrut(50));
         buttonPanel.add(saveBtn);
         panel.add(buttonPanel);
-        panel.add(Box.createVerticalStrut(100));
+        panel.add(Box.createVerticalStrut(50));
 
         JPanel userGroupListButtonPanel = new JPanel();

branches/3.0-Beta1/components/tools/admin/src/adminTool/groupPanel/GroupsTabController.java

@@ -29 +29 @@
  * 
  * @author Jean-Marie Burel &nbsp;&nbsp;&nbsp;&nbsp; <a
- *         href="mailto:j.burel@dundee.ac.uk">j.burel@dundee.ac.uk</a>
+ *    href="mailto:j.burel@dundee.ac.uk">j.burel@dundee.ac.uk</a>
  * @author Donald MacDonald &nbsp;&nbsp;&nbsp;&nbsp; <a
- *         href="mailto:donald@lifesci.dundee.ac.uk">donald@lifesci.dundee.ac.uk</a>
+ *    href="mailto:donald@lifesci.dundee.ac.uk">donald@lifesci.dundee.ac.uk</a>
  * @version 3.0 <small> (<b>Internal version:</b> $Revision$Date: $)
  *          </small>
@@ -49 +49 @@
     }
 
+    void setDefaultGroup() {
+        String selectedUser = view.getSelectedMember();
+        try {
+            if (selectedUser == null) {
+                view.showErrorMessage("You must select a user before you set "
+                        + "default group.");
+                return;
+            }
+            // Check user exists.
+            if (!model.findUserByName(selectedUser)) {
+                throw new IAdminException(
+                        new Exception(
+                                "Cannot find user in "
+                                        + "Database. Admintool may be out " +
+                                                        "of sync with Database."));
+            }
+
+            // check that the groupslist returns a non-null string.
+            String groupSelected = view.getSelectedGroup();
+            if (groupSelected == null) {
+                view.showErrorMessage("You must select a group before you set "
+                        + "default group.");
+                return;
+            }
+            // Check that group exists.
+            if (!model.findGroupByName(groupSelected)) {
+                throw new IAdminException(
+                        new Exception(
+                                "Cannot find group in "
+                                        + "Database. Admintool may be out of " +
+                                                        "sync with Database."));
+            }
+        } catch (Exception e) {
+            handleException(e,
+                    "Admintool seems to be out of sync with database."
+                            + "Try restarting Admintool.");
+        }
+
+        // Change the default group for the user to the one selected.
+        try {
+            model.setDefaultGroup(model.getCurrentGroupID());
+            view.setGroupDetails(model.getCurrentGroup());
+        } catch (Exception e) {
+            handleException(e, "Set Current Group as Users Default Group");
+        }
+    }
+    
     /*
      * (non-Javadoc)
@@ -172 +219 @@
             if (groupSelected == null) {
                 view
-                        .showErrorMessage("Please select the group you wish add to user.");
+                        .showErrorMessage("Please select the group you " +
+                                        "wish add to user.");
                 return;
             }
@@ -205 +253 @@
             if (groupSelected == null) {
                 view
-                        .showErrorMessage("Please select a group to remove from user.");
+                        .showErrorMessage("Please select a group to remove " +
+                                        "from user.");
                 return;
             }
@@ -211 +260 @@
             if (!model.findGroupByName(groupSelected)) {
                 return;
+            }
+            if(model.isDefaultGroup(model.getCurrentGroupID()))
+            {
+                view.showErrorMessage("Cannot remove user from group when it " +
+                                "is user\'s default group.");
+                return;
             }
             model.removeGroupFromUser(model.getCurrentGroupID());

branches/3.0-Beta1/components/tools/admin/src/adminTool/main/AdminWindow.java

@@ -35 +35 @@
  * 
  */
-public class AdminWindow extends JFrame implements ActionListener {
+public class AdminWindow 
+        extends JFrame 
+        implements ActionListener 
+{
     /**
      * 
@@ -58 +61 @@
 
     public AdminWindow() {
-        setTitle("Admin Tool");
+        setTitle("Omero Admin");
         setLocation(300, 100);
-        setSize(800, 500);
+        setSize(840, 600);
         createMenu();
         mainPanel = new MainPanel(this);
@@ -85 +88 @@
         help = new JMenuItem("About AdminTool");
         addComment = new JMenuItem("Send Comment To Developers");
-        helpMenu.add(help);
-        helpMenu.add(new JSeparator());
         helpMenu.add(addComment);
         addComment.addActionListener(this);
@@ -103 +104 @@
         if (e.getActionCommand().equals("login")) {
             mainPanel.startLogin();
-            pack();
+     //       pack();
         }
         if (e.getActionCommand().equals("exit")) {

branches/3.0-Beta1/components/tools/admin/src/adminTool/model/Model.java

@@ -130 +130 @@
             ExceptionHandler.get().catchException(e);
         }
+    }
+
+    public void changeLoggedInUserPassword(String password) throws IAdminException,
+        UnknownException, PermissionsException 
+    {
+        try {
+                iAdmin.changeUserPassword(loggedInUser, password);
+        } catch (Exception e) {
+                ExceptionHandler.get().catchException(e);
+        }
     }
 

branches/3.0-Beta1/components/tools/admin/src/adminTool/ui/ImageFactory.java

@@ -58 +58 @@
         path[REMOVE_USER] = "/resources/graphx/RemoveUser_kusers_nuvola48_mod3.png";
         path[LEFT_ARROW] = "/resources/graphx/1leftarrow_nuvola32.png";
-        path[RIGHT_ARROW] = "/resources/graphx/1leftarrow_nuvola32.png";
+        path[RIGHT_ARROW] = "/resources/graphx/1rightarrow_nuvola32.png";
         path[DEFAULT_GROUP] = "/resources/graphx/kgpg_identity_nuvola32.png";
     }

branches/3.0-Beta1/components/tools/admin/src/adminTool/usersPanel/PasswordAction.java

@@ -26 +26 @@
  * @since OME3.0
  */
-public class PasswordAction implements ActionListener {
+public class PasswordAction 
+        implements ActionListener 
+{
+        public static int CHANGE_SELECTED_USER = 0;
+        public static int CHANGE_CURRENT_USER = 1;
+        
     private UsersTabController controller;
+    private int                                 actionType;
 
-    PasswordAction(UsersTabController controller) {
+    PasswordAction(int actionType, UsersTabController controller) {
+        this.actionType = actionType;
         this.controller = controller;
     }
@@ -38 +45 @@
      * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      */
-    public void actionPerformed(ActionEvent e) {
-        controller.changePassword();
+    public void actionPerformed(ActionEvent e) 
+    {
+        if(actionType == CHANGE_SELECTED_USER)
+                controller.changePassword();
+        if(actionType == CHANGE_CURRENT_USER)
+                controller.changeLoggedInUserPassword();
+        
 
     }

branches/3.0-Beta1/components/tools/admin/src/adminTool/usersPanel/UsersTab.java

@@ -10 +10 @@
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.util.ArrayList;
 
@@ -96 +97 @@
 
     private JButton resetPasswordBtn;
+    
+    private JButton changeYourPasswordBtn;
 
     private JButton setDefaultBtn;
@@ -215 +218 @@
                 controller));
         saveBtn.addActionListener(new SaveAction(controller));
-        resetPasswordBtn.addActionListener(new PasswordAction(controller));
+        resetPasswordBtn.addActionListener(new PasswordAction(PasswordAction.CHANGE_SELECTED_USER, controller));
+        changeYourPasswordBtn.addActionListener(new PasswordAction(PasswordAction.CHANGE_CURRENT_USER, controller));
         setDefaultBtn.addActionListener(new SetDefaultAction(controller));
         setSystemBtn.addActionListener(new SetSystemAction(controller));
@@ -273 +277 @@
                 ImageFactory.DEFAULT_GROUP);
         saveBtn = new JButton("Save");
-        resetPasswordBtn = new JButton("Reset Password");
+        resetPasswordBtn = new JButton("Reset User Password");
+        changeYourPasswordBtn = new JButton("Reset Your Password");
         setSystemBtn = new JButton("Set System User");
         addUserBtn = new JButton(addUserIcon);
@@ -292 +297 @@
             setDefaultBtn.setEnabled(false);
             setSystemBtn.setEnabled(false);
+            resetPasswordBtn.setEnabled(false);
         } else {
             saveBtn.setEnabled(true);
@@ -300 +306 @@
             setDefaultBtn.setEnabled(true);
             setSystemBtn.setEnabled(true);
+            resetPasswordBtn.setEnabled(true);
         }
     }
@@ -334 +341 @@
         JPanel buttonPanel = new JPanel();
         buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS));
-        buttonPanel.add(Box.createHorizontalStrut(100));
+        buttonPanel.add(Box.createHorizontalStrut(30));
         buttonPanel.add(resetPasswordBtn);
         buttonPanel.add(Box.createHorizontalStrut(30));
@@ -341 +348 @@
         buttonPanel.add(saveBtn);
         userDataEntryPanel.add(buttonPanel);
-
+        JPanel secondButtonPanel = new JPanel();
+        secondButtonPanel.setLayout(new BoxLayout(secondButtonPanel, BoxLayout.X_AXIS));
+        secondButtonPanel.add(changeYourPasswordBtn);
+        userDataEntryPanel.add(secondButtonPanel);
+
+        
         // buttons controlling which group user belongs to.
         JPanel userGroupButtonPanel = new JPanel();
@@ -356 +368 @@
         userGroupListPanel.add(userGroupListLabel);
         userGroupListPanel.add(userGroupMembershipList);
+        userGroupMembershipList.setPreferredSize(new Dimension(340,160));
+        userGroupMembershipList.setMaximumSize(new Dimension(340,160));
 
         // panel holding user group list and buttons.
@@ -411 +425 @@
         container.setLayout(new BoxLayout(container, BoxLayout.X_AXIS));
         container.add(listContainer);
-        container.add(Box.createHorizontalStrut(50));
+        container.add(Box.createHorizontalStrut(30));
         container.add(userInfoPanel);
         // container.add(Box.createHorizontalStrut(10));

branches/3.0-Beta1/components/tools/admin/src/adminTool/usersPanel/UsersTabController.java

@@ -50 +50 @@
     void changePassword() {
         String user = view.getSelectedUser();
+
         if (user == null) {
             view.showErrorMessage("You must select a user before you can"
@@ -72 +73 @@
     }
 
+    void changeLoggedInUserPassword() {
+
+        PasswordDialog passwordDialog = new PasswordDialog();
+        Point loc = view.getLocationOnScreen();
+        int x = loc.x + view.getWidth() / 2 - passwordDialog.getWidth() / 2;
+        int y = loc.y + view.getHeight() / 2 - passwordDialog.getHeight() / 2;
+        passwordDialog.setLocation(x, y);
+        passwordDialog.setVisible(true);
+        if (passwordDialog.OKSelected()) {
+            try {
+                model.changeLoggedInUserPassword(passwordDialog.getPassword());
+            } catch (Exception e) {
+                handleException(e, "Change User password");
+            }
+        }
+    }
     void setSystemUser() {
         String selectedUser = view.getSelectedUser();
@@ -152 +169 @@
         if (model.findUserByName("NewUser")) {
             view
-                    .showErrorMessage("You have already created a user called \'NewUser\'."
-                            + "This is the user you should rename/modify.");
+            .showErrorMessage("You have already created a user called \'NewUser\'."
+            + "This is the user you should rename/modify.");
             return;
         }