From ac7f1753d3f742e0af8dd5e142b4eac9d9d2fbba Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 28 Oct 2011 21:41:31 -0400 Subject: [PATCH] Preserve feed selections when not saving passwords --- src/com/gitblit/client/GitblitRegistration.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/client/GitblitRegistration.java b/src/com/gitblit/client/GitblitRegistration.java index bdd8b23..cbd4324 100644 --- a/src/com/gitblit/client/GitblitRegistration.java +++ b/src/com/gitblit/client/GitblitRegistration.java @@ -17,6 +17,7 @@ import java.io.Serializable; import java.util.Date; +import java.util.List; import com.gitblit.utils.StringUtils; @@ -28,20 +29,21 @@ */ public class GitblitRegistration implements Serializable, Comparable<GitblitRegistration> { - public static final GitblitRegistration LOCALHOST = new GitblitRegistration("localhost", - "https://localhost:8443", "admin", "admin".toCharArray()); private static final long serialVersionUID = 1L; String name; String url; String account; char[] password; + boolean savePassword; Date lastLogin; + List<String> feeds; public GitblitRegistration(String name, String url, String account, char[] password) { this.url = url; this.account = account; this.password = password; + this.savePassword = password != null && password.length > 0; if (StringUtils.isEmpty(name)) { this.name = url.substring(url.indexOf("//") + 2); } else { @@ -51,6 +53,6 @@ @Override public int compareTo(GitblitRegistration o) { - return name.compareTo(o.name); + return name.toLowerCase().compareTo(o.name.toLowerCase()); } } -- Gitblit v1.9.1