From c75304637f5535e634e57d4ed933c0fdb594d890 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 28 Oct 2011 08:08:00 -0400
Subject: [PATCH] Added a list branches rpc
---
src/com/gitblit/models/UserModel.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index 2964708..fcf2b26 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -17,10 +17,18 @@
import java.io.Serializable;
import java.security.Principal;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
-public class UserModel implements Principal, Serializable {
+/**
+ * UserModel is a serializable model class that represents a user and the user's
+ * restricted repository memberships. Instances of UserModels are also used as
+ * servlet user principals.
+ *
+ * @author James Moger
+ *
+ */
+public class UserModel implements Principal, Serializable, Comparable<UserModel> {
private static final long serialVersionUID = 1L;
@@ -28,7 +36,8 @@
public String username;
public String password;
public boolean canAdmin;
- public final List<String> repositories = new ArrayList<String>();
+ public boolean excludeFromFederation;
+ public final Set<String> repositories = new HashSet<String>();
public UserModel(String username) {
this.username = username;
@@ -43,7 +52,7 @@
}
@Override
- public String getName() {
+ public String getName() {
return username;
}
@@ -51,4 +60,9 @@
public String toString() {
return username;
}
+
+ @Override
+ public int compareTo(UserModel o) {
+ return username.compareTo(o.username);
+ }
}
--
Gitblit v1.9.1