James Moger
2011-10-23 fe326255202dcfac8b0991ca9d28e3cf4bcc4fe6
src/com/gitblit/client/GitblitManager.java
@@ -234,6 +234,7 @@
            passwordField.getPassword());
      if (!StringUtils.isEmpty(originalName) && !originalName.equals(reg.name)) {
         // delete old registration
         registrations.remove(originalName);
         try {
            StoredConfig config = getConfig();
            config.unsetSection("servers", originalName);
@@ -293,8 +294,11 @@
      if (list.size() > maxRecentCount) {
         list = list.subList(0, maxRecentCount);
      }
      for (final GitblitRegistration reg : list) {
      for (int i = 0; i < list.size(); i++) {
         final GitblitRegistration reg = list.get(i);
         JMenuItem item = new JMenuItem(reg.name, icon);
         item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_1 + i, KeyEvent.CTRL_DOWN_MASK,
               false));
         item.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent e) {
               login(reg);
@@ -312,9 +316,14 @@
            Date lastLogin = dateFormat.parse(config.getString("servers", server, "lastLogin"));
            String url = config.getString("servers", server, "url");
            String account = config.getString("servers", server, "account");
            // FIXME this is pretty lame
            char[] password = new String(Base64.decode(config.getString("servers", server,
                  "password"))).toCharArray();
            char[] password;
            String pw = config.getString("servers", server, "password");
            if (StringUtils.isEmpty(pw)) {
               password = new char[0];
            } else {
               // FIXME this is pretty lame
               password = new String(Base64.decode(pw)).toCharArray();
            }
            GitblitRegistration reg = new GitblitRegistration(server, url, account, password);
            reg.lastLogin = lastLogin;
            registrations.put(reg.name, reg);
@@ -329,7 +338,7 @@
         StoredConfig config = getConfig();
         config.setString("servers", reg.name, "url", reg.url);
         config.setString("servers", reg.name, "account", reg.account);
         // FIXME this is pretty lame
         // FIXME this is pretty lame
         config.setString("servers", reg.name, "password",
               Base64.encodeBytes(new String(reg.password).getBytes("UTF-8")));
         config.setString("servers", reg.name, "lastLogin", dateFormat.format(reg.lastLogin));
@@ -345,6 +354,7 @@
         StoredConfig config = getConfig();
         for (GitblitRegistration reg : list) {
            config.unsetSection("servers", reg.name);
            registrations.remove(reg.name);
         }
         config.save();
         success = true;