diff options
Diffstat (limited to 'src/main/java/com/gitblit/models')
30 files changed, 267 insertions, 265 deletions
diff --git a/src/main/java/com/gitblit/models/Activity.java b/src/main/java/com/gitblit/models/Activity.java index 8af86d61..ff0920c7 100644 --- a/src/main/java/com/gitblit/models/Activity.java +++ b/src/main/java/com/gitblit/models/Activity.java @@ -35,7 +35,7 @@ import com.gitblit.utils.TimeUtils; /**
* Model class to represent the commit activity across many repositories. This
* class is used by the Activity page.
- *
+ *
* @author James Moger
*/
public class Activity implements Serializable, Comparable<Activity> {
@@ -45,7 +45,7 @@ public class Activity implements Serializable, Comparable<Activity> { public final Date startDate;
public final Date endDate;
-
+
private final Set<RepositoryCommit> commits;
private final Map<String, Metric> authorMetrics;
@@ -56,7 +56,7 @@ public class Activity implements Serializable, Comparable<Activity> { /**
* Constructor for one day of activity.
- *
+ *
* @param date
*/
public Activity(Date date) {
@@ -65,7 +65,7 @@ public class Activity implements Serializable, Comparable<Activity> { /**
* Constructor for specified duration of activity from start date.
- *
+ *
* @param date
* the start date of the activity
* @param duration
@@ -79,10 +79,10 @@ public class Activity implements Serializable, Comparable<Activity> { repositoryMetrics = new HashMap<String, Metric>();
authorExclusions = new TreeSet<String>();
}
-
+
/**
* Exclude the specified authors from the metrics.
- *
+ *
* @param authors
*/
public void excludeAuthors(Collection<String> authors) {
@@ -94,7 +94,7 @@ public class Activity implements Serializable, Comparable<Activity> { /**
* Adds a commit to the activity object as long as the commit is not a
* duplicate.
- *
+ *
* @param repository
* @param branch
* @param commit
@@ -109,7 +109,7 @@ public class Activity implements Serializable, Comparable<Activity> { /**
* Adds a commit to the activity object as long as the commit is not a
* duplicate.
- *
+ *
* @param repository
* @param branch
* @param commit
@@ -140,7 +140,7 @@ public class Activity implements Serializable, Comparable<Activity> { public int getCommitCount() {
return commits.size();
}
-
+
public List<RepositoryCommit> getCommits() {
List<RepositoryCommit> list = new ArrayList<RepositoryCommit>(commits);
Collections.sort(list);
diff --git a/src/main/java/com/gitblit/models/AnnotatedLine.java b/src/main/java/com/gitblit/models/AnnotatedLine.java index 439a3222..a8b595ee 100644 --- a/src/main/java/com/gitblit/models/AnnotatedLine.java +++ b/src/main/java/com/gitblit/models/AnnotatedLine.java @@ -24,9 +24,9 @@ import org.eclipse.jgit.revwalk.RevCommit; /**
* AnnotatedLine is a serializable model class that represents a the most recent
* author, date, and commit id of a line in a source file.
- *
+ *
* @author James Moger
- *
+ *
*/
public class AnnotatedLine implements Serializable {
diff --git a/src/main/java/com/gitblit/models/DailyLogEntry.java b/src/main/java/com/gitblit/models/DailyLogEntry.java index 41f13818..a6bc6a44 100644 --- a/src/main/java/com/gitblit/models/DailyLogEntry.java +++ b/src/main/java/com/gitblit/models/DailyLogEntry.java @@ -25,7 +25,7 @@ import org.eclipse.jgit.transport.ReceiveCommand; * Model class to simulate a push for presentation in the push log news feed * for a repository that does not have a Gitblit push log. Commits are grouped * by date and may be additionally split by ref. - * + * * @author James Moger */ public class DailyLogEntry extends RefLogEntry implements Serializable { @@ -45,7 +45,7 @@ public class DailyLogEntry extends RefLogEntry implements Serializable { if (getAuthorCount() == 1) { return getCommits().get(0).getCommitterIdent(); } - + return super.getCommitterIdent(); } @@ -54,20 +54,21 @@ public class DailyLogEntry extends RefLogEntry implements Serializable { if (getAuthorCount() == 1) { return getCommits().get(0).getAuthorIdent(); } - + return super.getAuthorIdent(); } - + /** * Tracks the change type for the specified ref. - * + * * @param ref * @param type * @param oldId * @param newId */ + @Override public void updateRef(String ref, ReceiveCommand.Type type, String oldId, String newId) { - // daily digests are filled from most recent to oldest + // daily digests are filled from most recent to oldest String preservedNewId = getNewId(ref); if (preservedNewId == null) { // no preserved new id, this is newest commit diff --git a/src/main/java/com/gitblit/models/FederationModel.java b/src/main/java/com/gitblit/models/FederationModel.java index 1d211ce9..2c07c504 100644 --- a/src/main/java/com/gitblit/models/FederationModel.java +++ b/src/main/java/com/gitblit/models/FederationModel.java @@ -30,7 +30,7 @@ import com.gitblit.utils.StringUtils; * Gitblit instance to pull the repositories and configuration from another
* Gitblit instance. This is a backup operation and can be considered something
* like svn-sync.
- *
+ *
*/
public class FederationModel implements Serializable, Comparable<FederationModel> {
@@ -45,7 +45,7 @@ public class FederationModel implements Serializable, Comparable<FederationModel public String frequency;
public String folder;
-
+
public boolean bare;
public boolean mirror;
@@ -68,7 +68,7 @@ public class FederationModel implements Serializable, Comparable<FederationModel /**
* The constructor for a remote server configuration.
- *
+ *
* @param serverName
*/
public FederationModel(String serverName) {
@@ -109,7 +109,7 @@ public class FederationModel implements Serializable, Comparable<FederationModel /**
* Updates the pull status of a particular repository in this federation
* registration.
- *
+ *
* @param repository
* @param status
*/
@@ -133,7 +133,7 @@ public class FederationModel implements Serializable, Comparable<FederationModel /**
* Iterates over the current pull results and returns the lowest pull
* status.
- *
+ *
* @return the lowest pull status of the registration
*/
public FederationPullStatus getLowestStatus() {
@@ -152,7 +152,7 @@ public class FederationModel implements Serializable, Comparable<FederationModel /**
* Returns true if this registration represents the result data sent by a
* pulling Gitblit instance.
- *
+ *
* @return true, if this is result data
*/
public boolean isResultData() {
@@ -181,7 +181,7 @@ public class FederationModel implements Serializable, Comparable<FederationModel /**
* Class that encapsulates a point-in-time pull result.
- *
+ *
*/
public static class RepositoryStatus implements Serializable, Comparable<RepositoryStatus> {
diff --git a/src/main/java/com/gitblit/models/FederationProposal.java b/src/main/java/com/gitblit/models/FederationProposal.java index 5cf9182c..de1b8e60 100644 --- a/src/main/java/com/gitblit/models/FederationProposal.java +++ b/src/main/java/com/gitblit/models/FederationProposal.java @@ -37,14 +37,14 @@ public class FederationProposal implements Serializable { public FederationToken tokenType;
public String token;
-
+
public String message;
public Map<String, RepositoryModel> repositories;
/**
* The constructor for a federation proposal.
- *
+ *
* @param url
* the url of the source Gitblit instance
* @param tokenType
diff --git a/src/main/java/com/gitblit/models/FederationSet.java b/src/main/java/com/gitblit/models/FederationSet.java index 357689c9..dede66bf 100644 --- a/src/main/java/com/gitblit/models/FederationSet.java +++ b/src/main/java/com/gitblit/models/FederationSet.java @@ -37,7 +37,7 @@ public class FederationSet implements Serializable { /**
* The constructor for a federation set.
- *
+ *
* @param name
* the name of this federation set
* @param tokenType
diff --git a/src/main/java/com/gitblit/models/FeedEntryModel.java b/src/main/java/com/gitblit/models/FeedEntryModel.java index e1c00c38..c94f6e96 100644 --- a/src/main/java/com/gitblit/models/FeedEntryModel.java +++ b/src/main/java/com/gitblit/models/FeedEntryModel.java @@ -21,7 +21,7 @@ import java.util.List; /**
* FeedEntryModel represents an entry in a syndication (RSS) feed.
- *
+ *
* @author James Moger
*/
public class FeedEntryModel implements Serializable, Comparable<FeedEntryModel> {
diff --git a/src/main/java/com/gitblit/models/FeedModel.java b/src/main/java/com/gitblit/models/FeedModel.java index 08f9e48e..5fc6c1f2 100644 --- a/src/main/java/com/gitblit/models/FeedModel.java +++ b/src/main/java/com/gitblit/models/FeedModel.java @@ -22,7 +22,7 @@ import com.gitblit.utils.StringUtils; /**
* FeedModel represents a syndication (RSS) feed.
- *
+ *
* @author James Moger
*/
public class FeedModel implements Serializable, Comparable<FeedModel> {
diff --git a/src/main/java/com/gitblit/models/ForkModel.java b/src/main/java/com/gitblit/models/ForkModel.java index 849986c1..5c9f0370 100644 --- a/src/main/java/com/gitblit/models/ForkModel.java +++ b/src/main/java/com/gitblit/models/ForkModel.java @@ -24,44 +24,44 @@ import com.gitblit.utils.StringUtils; /** * A ForkModel represents a repository, its direct descendants, and its origin. - * + * * @author James Moger * */ public class ForkModel implements Serializable { private static final long serialVersionUID = 1L; - + public final RepositoryModel repository; - + public final List<ForkModel> forks; - + public ForkModel(RepositoryModel repository) { this.repository = repository; this.forks = new ArrayList<ForkModel>(); } - + public boolean isRoot() { return StringUtils.isEmpty(repository.originRepository); } - + public boolean isNode() { return !ArrayUtils.isEmpty(forks); } - + public boolean isLeaf() { return ArrayUtils.isEmpty(forks); } - + public boolean isPersonalRepository() { return repository.isPersonalRepository(); } - + @Override public int hashCode() { return repository.hashCode(); } - + @Override public boolean equals(Object o) { if (o instanceof ForkModel) { @@ -69,7 +69,7 @@ public class ForkModel implements Serializable { } return false; } - + @Override public String toString() { return repository.toString(); diff --git a/src/main/java/com/gitblit/models/GitClientApplication.java b/src/main/java/com/gitblit/models/GitClientApplication.java index eb47eb1f..e5b2e6c4 100644 --- a/src/main/java/com/gitblit/models/GitClientApplication.java +++ b/src/main/java/com/gitblit/models/GitClientApplication.java @@ -23,7 +23,7 @@ import com.gitblit.utils.StringUtils; /**
* Model class to represent a git client application.
- *
+ *
* @author James Moger
*
*/
@@ -60,18 +60,18 @@ public class GitClientApplication implements Serializable { }
return false;
}
-
+
public boolean supportsTransport(String transportOrUrl) {
if (ArrayUtils.isEmpty(transports)) {
return true;
}
-
+
String scheme = transportOrUrl;
if (transportOrUrl.indexOf(':') > -1) {
// strip scheme
scheme = transportOrUrl.substring(0, transportOrUrl.indexOf(':'));
}
-
+
for (String transport : transports) {
if (transport.equalsIgnoreCase(scheme)) {
return true;
@@ -79,7 +79,7 @@ public class GitClientApplication implements Serializable { }
return false;
}
-
+
@Override
public String toString() {
return StringUtils.isEmpty(title) ? name : title;
diff --git a/src/main/java/com/gitblit/models/GitNote.java b/src/main/java/com/gitblit/models/GitNote.java index c333a881..90b9a815 100644 --- a/src/main/java/com/gitblit/models/GitNote.java +++ b/src/main/java/com/gitblit/models/GitNote.java @@ -21,9 +21,9 @@ import java.io.Serializable; * GitNote is a serializable model class that represents a git note. This class
* retains an instance of the RefModel which contains the commit in which this
* git note was created.
- *
+ *
* @author James Moger
- *
+ *
*/
public class GitNote implements Serializable {
diff --git a/src/main/java/com/gitblit/models/GravatarProfile.java b/src/main/java/com/gitblit/models/GravatarProfile.java index aa128ce0..ec1aeea3 100644 --- a/src/main/java/com/gitblit/models/GravatarProfile.java +++ b/src/main/java/com/gitblit/models/GravatarProfile.java @@ -20,9 +20,9 @@ import java.util.List; /**
* Represents a Gravatar profile.
- *
+ *
* @author James Moger
- *
+ *
*/
public class GravatarProfile implements Serializable {
@@ -35,7 +35,7 @@ public class GravatarProfile implements Serializable { public String preferredUsername;
public String currentLocation;
public String aboutMe;
-
+
public String profileUrl;
public String thumbnailUrl;
public List<ProfileObject> photos;
diff --git a/src/main/java/com/gitblit/models/Metric.java b/src/main/java/com/gitblit/models/Metric.java index 2845c527..2310a9aa 100644 --- a/src/main/java/com/gitblit/models/Metric.java +++ b/src/main/java/com/gitblit/models/Metric.java @@ -20,9 +20,9 @@ import java.io.Serializable; /**
* Metric is a serializable model class that encapsulates metrics for some given
* type.
- *
+ *
* @author James Moger
- *
+ *
*/
public class Metric implements Serializable, Comparable<Metric> {
diff --git a/src/main/java/com/gitblit/models/PathModel.java b/src/main/java/com/gitblit/models/PathModel.java index 9093a445..bf585425 100644 --- a/src/main/java/com/gitblit/models/PathModel.java +++ b/src/main/java/com/gitblit/models/PathModel.java @@ -24,9 +24,9 @@ import org.eclipse.jgit.lib.FileMode; /**
* PathModel is a serializable model class that represents a file or a folder,
* including all its metadata and associated commit id.
- *
+ *
* @author James Moger
- *
+ *
*/
public class PathModel implements Serializable, Comparable<PathModel> {
@@ -56,7 +56,7 @@ public class PathModel implements Serializable, Comparable<PathModel> { public boolean isSubmodule() {
return FileMode.GITLINK.equals(mode);
}
-
+
public boolean isTree() {
return FileMode.TREE.equals(mode);
}
@@ -105,26 +105,26 @@ public class PathModel implements Serializable, Comparable<PathModel> { /**
* PathChangeModel is a serializable class that represents a file changed in
* a commit.
- *
+ *
* @author James Moger
- *
+ *
*/
public static class PathChangeModel extends PathModel {
private static final long serialVersionUID = 1L;
public ChangeType changeType;
-
+
public int insertions;
-
+
public int deletions;
-
+
public PathChangeModel(String name, String path, long size, int mode, String objectId,
String commitId, ChangeType type) {
super(name, path, size, mode, objectId, commitId);
this.changeType = type;
}
-
+
public void update(char op) {
switch (op) {
case '+':
diff --git a/src/main/java/com/gitblit/models/ProjectModel.java b/src/main/java/com/gitblit/models/ProjectModel.java index cd912aea..3a082de3 100644 --- a/src/main/java/com/gitblit/models/ProjectModel.java +++ b/src/main/java/com/gitblit/models/ProjectModel.java @@ -26,9 +26,9 @@ import com.gitblit.utils.StringUtils; /**
* ProjectModel is a serializable model class.
- *
+ *
* @author James Moger
- *
+ *
*/
public class ProjectModel implements Serializable, Comparable<ProjectModel> {
@@ -39,7 +39,7 @@ public class ProjectModel implements Serializable, Comparable<ProjectModel> { public String title;
public String description;
public final Set<String> repositories = new HashSet<String>();
-
+
public String projectMarkdown;
public String repositoriesMarkdown;
public Date lastChange;
@@ -48,7 +48,7 @@ public class ProjectModel implements Serializable, Comparable<ProjectModel> { public ProjectModel(String name) {
this(name, false);
}
-
+
public ProjectModel(String name, boolean isRoot) {
this.name = name;
this.isRoot = isRoot;
@@ -56,7 +56,7 @@ public class ProjectModel implements Serializable, Comparable<ProjectModel> { this.title = "";
this.description = "";
}
-
+
public boolean isUserProject() {
return ModelUtils.isPersonalRepository(name);
}
@@ -80,16 +80,16 @@ public class ProjectModel implements Serializable, Comparable<ProjectModel> { for (String name:names) {
repositories.add(name.toLowerCase());
}
- }
+ }
public void removeRepository(String name) {
repositories.remove(name.toLowerCase());
}
-
+
public String getDisplayName() {
return StringUtils.isEmpty(title) ? name : title;
}
-
+
@Override
public String toString() {
return name;
diff --git a/src/main/java/com/gitblit/models/RefLogEntry.java b/src/main/java/com/gitblit/models/RefLogEntry.java index abfc56b1..07dc6f31 100644 --- a/src/main/java/com/gitblit/models/RefLogEntry.java +++ b/src/main/java/com/gitblit/models/RefLogEntry.java @@ -36,7 +36,7 @@ import com.gitblit.utils.StringUtils; /**
* Model class to represent a push into a repository.
- *
+ *
* @author James Moger
*/
public class RefLogEntry implements Serializable, Comparable<RefLogEntry> {
@@ -44,22 +44,22 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { private static final long serialVersionUID = 1L;
public final String repository;
-
+
public final Date date;
-
+
public final UserModel user;
private final Set<RepositoryCommit> commits;
-
+
protected final Map<String, ReceiveCommand.Type> refUpdates;
-
+
protected final Map<String, String> refIdChanges;
-
+
private int authorCount;
/**
* Constructor for specified duration of push from start date.
- *
+ *
* @param repository
* the repository that received the push
* @param date
@@ -76,10 +76,10 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { this.refIdChanges = new HashMap<String, String>();
this.authorCount = -1;
}
-
+
/**
* Tracks the change type for the specified ref.
- *
+ *
* @param ref
* @param type
*/
@@ -88,10 +88,10 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { refUpdates.put(ref, type);
}
}
-
+
/**
* Tracks the change type for the specified ref.
- *
+ *
* @param ref
* @param type
* @param oldId
@@ -103,10 +103,10 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { refIdChanges.put(ref, oldId + "-" + newId);
}
}
-
+
/**
* Returns the old id of a ref.
- *
+ *
* @param ref
* @return the old id
*/
@@ -120,7 +120,7 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { /**
* Returns the new id of a ref
- *
+ *
* @param ref
* @return the new id
*/
@@ -131,10 +131,10 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { }
return change.split("-")[1];
}
-
+
/**
* Returns the change type of the ref change.
- *
+ *
* @param ref
* @return the change type for the ref
*/
@@ -146,7 +146,7 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { /**
* Adds a commit to the push entry object as long as the commit is not a
* duplicate.
- *
+ *
* @param branch
* @param commit
* @return a RepositoryCommit, if one was added. Null if this is duplicate
@@ -164,7 +164,7 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { /**
* Adds a commit to the push entry object as long as the commit is not a
* duplicate.
- *
+ *
* @param branch
* @param commit
* @return a RepositoryCommit, if one was added. Null if this is duplicate
@@ -181,17 +181,17 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { /**
* Adds a a list of repository commits. This is used to construct discrete
* ref push log entries
- *
+ *
* @param commits
*/
public void addCommits(List<RepositoryCommit> list) {
commits.addAll(list);
authorCount = -1;
}
-
+
/**
* Returns true if this push contains a non-fastforward ref update.
- *
+ *
* @return true if this is a non-fastforward push
*/
public boolean isNonFastForward() {
@@ -202,10 +202,10 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { }
return false;
}
-
+
/**
* Returns true if this ref has been rewound.
- *
+ *
* @param ref
* @return true if this is a non-fastforward ref update
*/
@@ -219,7 +219,7 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { /**
* Returns true if this ref has been deleted.
- *
+ *
* @param ref
* @return true if this is a delete ref update
*/
@@ -230,28 +230,28 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { }
return ReceiveCommand.Type.DELETE.equals(type);
}
-
+
/**
* Returns the list of refs changed by the push.
- *
+ *
* @return a list of refs
*/
public List<String> getChangedRefs() {
return new ArrayList<String>(refUpdates.keySet());
}
-
+
/**
* Returns the list of branches changed by the push.
- *
+ *
* @return a list of branches
*/
public List<String> getChangedBranches() {
return getChangedRefs(Constants.R_HEADS);
}
-
+
/**
* Returns the list of tags changed by the push.
- *
+ *
* @return a list of tags
*/
public List<String> getChangedTags() {
@@ -260,7 +260,7 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { /**
* Gets the changed refs in the push.
- *
+ *
* @param baseRef
* @return the changed refs
*/
@@ -275,7 +275,7 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { Collections.sort(list);
return list;
}
-
+
public int getAuthorCount() {
if (authorCount == -1) {
Set<String> authors = new HashSet<String>();
@@ -287,19 +287,19 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { }
return authorCount;
}
-
+
/**
* The total number of commits in the push.
- *
+ *
* @return the number of commits in the push
*/
public int getCommitCount() {
return commits.size();
}
-
+
/**
* Returns all commits in the push.
- *
+ *
* @return a list of commits
*/
public List<RepositoryCommit> getCommits() {
@@ -307,10 +307,10 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { Collections.sort(list);
return list;
}
-
+
/**
* Returns all commits that belong to a particular ref
- *
+ *
* @param ref
* @return a list of commits
*/
@@ -324,7 +324,7 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { Collections.sort(list);
return list;
}
-
+
public PersonIdent getCommitterIdent() {
return new PersonIdent(user.getDisplayName(), user.emailAddress == null ? user.username : user.emailAddress);
}
@@ -341,7 +341,7 @@ public class RefLogEntry implements Serializable, Comparable<RefLogEntry> { // reverse chronological order
return o.date.compareTo(date);
}
-
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/src/main/java/com/gitblit/models/RefModel.java b/src/main/java/com/gitblit/models/RefModel.java index 8489c817..6b031ed3 100644 --- a/src/main/java/com/gitblit/models/RefModel.java +++ b/src/main/java/com/gitblit/models/RefModel.java @@ -28,9 +28,9 @@ import org.eclipse.jgit.revwalk.RevTag; /**
* RefModel is a serializable model class that represents a tag or branch and
* includes the referenced object.
- *
+ *
* @author James Moger
- *
+ *
*/
public class RefModel implements Serializable, Comparable<RefModel> {
diff --git a/src/main/java/com/gitblit/models/RegistrantAccessPermission.java b/src/main/java/com/gitblit/models/RegistrantAccessPermission.java index 8f4049a8..a7fcde44 100644 --- a/src/main/java/com/gitblit/models/RegistrantAccessPermission.java +++ b/src/main/java/com/gitblit/models/RegistrantAccessPermission.java @@ -24,7 +24,7 @@ import com.gitblit.utils.StringUtils; /** * Represents a Registrant-AccessPermission tuple. - * + * * @author James Moger */ public class RegistrantAccessPermission implements Serializable, Comparable<RegistrantAccessPermission> { @@ -37,7 +37,7 @@ public class RegistrantAccessPermission implements Serializable, Comparable<Regi public PermissionType permissionType; public boolean mutable; public String source; - + public RegistrantAccessPermission() { } @@ -46,7 +46,7 @@ public class RegistrantAccessPermission implements Serializable, Comparable<Regi this.permissionType = PermissionType.EXPLICIT; this.mutable = true; } - + public RegistrantAccessPermission(String registrant, AccessPermission permission, PermissionType permissionType, RegistrantType registrantType, String source, boolean mutable) { this.registrant = registrant; this.permission = permission; @@ -55,7 +55,7 @@ public class RegistrantAccessPermission implements Serializable, Comparable<Regi this.source = source; this.mutable = mutable; } - + public boolean isAdmin() { return PermissionType.ADMINISTRATOR.equals(permissionType); } @@ -63,7 +63,7 @@ public class RegistrantAccessPermission implements Serializable, Comparable<Regi public boolean isOwner() { return PermissionType.OWNER.equals(permissionType); } - + public boolean isExplicit() { return PermissionType.EXPLICIT.equals(permissionType); } @@ -79,7 +79,7 @@ public class RegistrantAccessPermission implements Serializable, Comparable<Regi public boolean isMissing() { return PermissionType.MISSING.equals(permissionType); } - + public int getScore() { switch (registrantType) { case REPOSITORY: @@ -102,7 +102,7 @@ public class RegistrantAccessPermission implements Serializable, Comparable<Regi return 0; } } - + @Override public int compareTo(RegistrantAccessPermission p) { switch (registrantType) { @@ -113,7 +113,7 @@ public class RegistrantAccessPermission implements Serializable, Comparable<Regi int score2 = p.getScore(); if (score1 <= 2 && score2 <= 2) { // group admin, owner, and explicit together - return StringUtils.compareRepositoryNames(registrant, p.registrant); + return StringUtils.compareRepositoryNames(registrant, p.registrant); } if (score1 < score2) { return -1; @@ -126,22 +126,22 @@ public class RegistrantAccessPermission implements Serializable, Comparable<Regi return registrant.toLowerCase().compareTo(p.registrant.toLowerCase()); } } - + @Override public int hashCode() { return registrant.hashCode(); } - + @Override public boolean equals(Object o) { if (o instanceof RegistrantAccessPermission) { RegistrantAccessPermission p = (RegistrantAccessPermission) o; return registrant.equals(p.registrant); } - + return false; } - + @Override public String toString() { return permission.asRole(registrant); diff --git a/src/main/java/com/gitblit/models/RepositoryCommit.java b/src/main/java/com/gitblit/models/RepositoryCommit.java index dd58b42b..765b4898 100644 --- a/src/main/java/com/gitblit/models/RepositoryCommit.java +++ b/src/main/java/com/gitblit/models/RepositoryCommit.java @@ -27,7 +27,7 @@ import org.eclipse.jgit.revwalk.RevCommit; /** * Model class to represent a RevCommit, it's source repository, and the branch. * This class is used by the activity page. - * + * * @author James Moger */ public class RepositoryCommit implements Serializable, Comparable<RepositoryCommit> { @@ -71,7 +71,7 @@ public class RepositoryCommit implements Serializable, Comparable<RepositoryComm public String getShortMessage() { return commit.getShortMessage(); } - + public Date getCommitDate() { return new Date(commit.getCommitTime() * 1000L); } @@ -79,7 +79,7 @@ public class RepositoryCommit implements Serializable, Comparable<RepositoryComm public int getParentCount() { return commit.getParentCount(); } - + public RevCommit [] getParents() { return commit.getParents(); } @@ -91,7 +91,7 @@ public class RepositoryCommit implements Serializable, Comparable<RepositoryComm public PersonIdent getCommitterIdent() { return commit.getCommitterIdent(); } - + @Override public boolean equals(Object o) { if (o instanceof RepositoryCommit) { @@ -116,14 +116,14 @@ public class RepositoryCommit implements Serializable, Comparable<RepositoryComm } return 0; } - + public RepositoryCommit clone(String withRef) { return new RepositoryCommit(repository, withRef, commit); } - + @Override public String toString() { - return MessageFormat.format("{0} {1} {2,date,yyyy-MM-dd HH:mm} {3} {4}", + return MessageFormat.format("{0} {1} {2,date,yyyy-MM-dd HH:mm} {3} {4}", getShortName(), branch, getCommitterIdent().getWhen(), getAuthorIdent().getName(), getShortMessage()); } diff --git a/src/main/java/com/gitblit/models/RepositoryModel.java b/src/main/java/com/gitblit/models/RepositoryModel.java index f0354b9a..42331c4e 100644 --- a/src/main/java/com/gitblit/models/RepositoryModel.java +++ b/src/main/java/com/gitblit/models/RepositoryModel.java @@ -35,9 +35,9 @@ import com.gitblit.utils.StringUtils; /**
* RepositoryModel is a serializable model class that represents a Gitblit
* repository including its configuration settings and access restriction.
- *
+ *
* @author James Moger
- *
+ *
*/
public class RepositoryModel implements Serializable, Comparable<RepositoryModel> {
@@ -84,14 +84,14 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel public boolean verifyCommitter;
public String gcThreshold;
public int gcPeriod;
- public int maxActivityCommits;
+ public int maxActivityCommits;
public List<String> metricAuthorExclusions;
public CommitMessageRenderer commitMessageRenderer;
-
+
public transient boolean isCollectingGarbage;
public Date lastGC;
public String sparkleshareId;
-
+
public RepositoryModel() {
this("", "", "", new Date(0));
}
@@ -103,14 +103,14 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel this.accessRestriction = AccessRestrictionType.NONE;
this.authorizationControl = AuthorizationControl.NAMED;
this.federationSets = new ArrayList<String>();
- this.federationStrategy = FederationStrategy.FEDERATE_THIS;
+ this.federationStrategy = FederationStrategy.FEDERATE_THIS;
this.projectPath = StringUtils.getFirstPathElement(name);
this.owners = new ArrayList<String>();
this.isBare = true;
-
+
addOwner(owner);
}
-
+
public List<String> getLocalBranches() {
if (ArrayUtils.isEmpty(availableRefs)) {
return new ArrayList<String>();
@@ -123,30 +123,30 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel }
return localBranches;
}
-
+
public void addFork(String repository) {
if (forks == null) {
forks = new TreeSet<String>();
}
forks.add(repository);
}
-
+
public void removeFork(String repository) {
if (forks == null) {
return;
}
forks.remove(repository);
}
-
+
public void resetDisplayName() {
displayName = null;
}
-
+
@Override
public int hashCode() {
return name.hashCode();
}
-
+
@Override
public boolean equals(Object o) {
if (o instanceof RepositoryModel) {
@@ -167,38 +167,38 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel public int compareTo(RepositoryModel o) {
return StringUtils.compareRepositoryNames(name, o.name);
}
-
+
public boolean isFork() {
return !StringUtils.isEmpty(originRepository);
}
-
+
public boolean isOwner(String username) {
if (StringUtils.isEmpty(username) || ArrayUtils.isEmpty(owners)) {
return false;
}
return owners.contains(username.toLowerCase());
}
-
+
public boolean isPersonalRepository() {
return !StringUtils.isEmpty(projectPath) && ModelUtils.isPersonalRepository(projectPath);
}
-
+
public boolean isUsersPersonalRepository(String username) {
return !StringUtils.isEmpty(projectPath) && ModelUtils.isUsersPersonalRepository(username, projectPath);
}
-
+
public boolean allowAnonymousView() {
return !accessRestriction.atLeast(AccessRestrictionType.VIEW);
}
-
+
public boolean isShowActivity() {
return maxActivityCommits > -1;
}
-
+
public boolean isSparkleshared() {
return !StringUtils.isEmpty(sparkleshareId);
}
-
+
public RepositoryModel cloneAs(String cloneName) {
RepositoryModel clone = new RepositoryModel();
clone.originRepository = name;
@@ -216,7 +216,7 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel clone.useTickets = useTickets;
clone.skipSizeCalculation = skipSizeCalculation;
clone.skipSummaryMetrics = skipSummaryMetrics;
- clone.sparkleshareId = sparkleshareId;
+ clone.sparkleshareId = sparkleshareId;
return clone;
}
diff --git a/src/main/java/com/gitblit/models/RepositoryUrl.java b/src/main/java/com/gitblit/models/RepositoryUrl.java index d72959a2..a24def57 100644 --- a/src/main/java/com/gitblit/models/RepositoryUrl.java +++ b/src/main/java/com/gitblit/models/RepositoryUrl.java @@ -22,7 +22,7 @@ import com.gitblit.Constants.AccessPermission; /**
* Represents a git repository url and it's associated access permission for the
* current user.
- *
+ *
* @author James Moger
*
*/
@@ -37,7 +37,7 @@ public class RepositoryUrl implements Serializable { this.url = url;
this.permission = permission;
}
-
+
public boolean isExternal() {
return permission == null;
}
diff --git a/src/main/java/com/gitblit/models/SearchResult.java b/src/main/java/com/gitblit/models/SearchResult.java index ee27a063..32edc2d7 100644 --- a/src/main/java/com/gitblit/models/SearchResult.java +++ b/src/main/java/com/gitblit/models/SearchResult.java @@ -8,16 +8,16 @@ import com.gitblit.Constants.SearchObjectType; /**
* Model class that represents a search result.
- *
+ *
* @author James Moger
- *
+ *
*/
public class SearchResult implements Serializable {
private static final long serialVersionUID = 1L;
-
+
public int hitId;
-
+
public int totalHits;
public float score;
@@ -29,24 +29,24 @@ public class SearchResult implements Serializable { public String committer;
public String summary;
-
+
public String fragment;
-
+
public String repository;
-
+
public String branch;
public String commitId;
-
+
public String path;
-
+
public List<String> tags;
-
+
public SearchObjectType type;
public SearchResult() {
}
-
+
public String getId() {
switch (type) {
case blob:
diff --git a/src/main/java/com/gitblit/models/ServerSettings.java b/src/main/java/com/gitblit/models/ServerSettings.java index 27199b41..92d5c311 100644 --- a/src/main/java/com/gitblit/models/ServerSettings.java +++ b/src/main/java/com/gitblit/models/ServerSettings.java @@ -26,7 +26,7 @@ import java.util.TreeMap; * setting metadata such as name, current value, default value, description, and
* directives. It is a model class for serialization and presentation, but not
* for persistence.
- *
+ *
* @author James Moger
*/
public class ServerSettings implements Serializable {
@@ -36,13 +36,13 @@ public class ServerSettings implements Serializable { private static final long serialVersionUID = 1L;
public List<String> pushScripts;
-
+
public boolean supportsCredentialChanges;
-
+
public boolean supportsDisplayNameChanges;
-
+
public boolean supportsEmailAddressChanges;
-
+
public boolean supportsTeamMembershipChanges;
public ServerSettings() {
@@ -62,7 +62,7 @@ public class ServerSettings implements Serializable { public SettingModel get(String key) {
return settings.get(key);
}
-
+
public boolean hasKey(String key) {
return settings.containsKey(key);
}
diff --git a/src/main/java/com/gitblit/models/ServerStatus.java b/src/main/java/com/gitblit/models/ServerStatus.java index 3a1e0306..f8afd00a 100644 --- a/src/main/java/com/gitblit/models/ServerStatus.java +++ b/src/main/java/com/gitblit/models/ServerStatus.java @@ -25,9 +25,9 @@ import com.gitblit.Constants; /**
* ServerStatus encapsulates runtime status information about the server
* including some information about the system environment.
- *
+ *
* @author James Moger
- *
+ *
*/
public class ServerStatus implements Serializable {
diff --git a/src/main/java/com/gitblit/models/SettingModel.java b/src/main/java/com/gitblit/models/SettingModel.java index a04126e1..ef77e156 100644 --- a/src/main/java/com/gitblit/models/SettingModel.java +++ b/src/main/java/com/gitblit/models/SettingModel.java @@ -26,7 +26,7 @@ import com.gitblit.utils.StringUtils; /**
* SettingModel represents a setting and all its metadata: name, current value,
* default value, description, and directives.
- *
+ *
* @author James Moger
*/
public class SettingModel implements Serializable {
@@ -55,7 +55,7 @@ public class SettingModel implements Serializable { /**
* Returns true if the current value is the default value.
- *
+ *
* @return true if current value is the default value
*/
public boolean isDefaultValue() {
@@ -66,7 +66,7 @@ public class SettingModel implements Serializable { /**
* Returns the boolean value for the currentValue. If the currentValue can
* not be interpreted as a boolean, the defaultValue is returned.
- *
+ *
* @param defaultValue
* @return key value or defaultValue
*/
@@ -80,7 +80,7 @@ public class SettingModel implements Serializable { /**
* Returns the integer value for the currentValue. If the currentValue can
* not be interpreted as an integer, the defaultValue is returned.
- *
+ *
* @param defaultValue
* @return key value or defaultValue
*/
@@ -97,7 +97,7 @@ public class SettingModel implements Serializable { /**
* Returns the char value for currentValue. If the currentValue can not be
* interpreted as a char, the defaultValue is returned.
- *
+ *
* @param defaultValue
* @return key value or defaultValue
*/
@@ -111,7 +111,7 @@ public class SettingModel implements Serializable { /**
* Returns the string value for currentValue. If the currentValue is null,
* the defaultValue is returned.
- *
+ *
* @param defaultValue
* @return key value or defaultValue
*/
@@ -124,7 +124,7 @@ public class SettingModel implements Serializable { /**
* Returns a list of space-separated strings from the specified key.
- *
+ *
* @return list of strings
*/
public List<String> getStrings() {
@@ -134,7 +134,7 @@ public class SettingModel implements Serializable { /**
* Returns a list of strings from the currentValue using the specified
* string separator.
- *
+ *
* @param separator
* @return list of strings
*/
@@ -143,10 +143,10 @@ public class SettingModel implements Serializable { strings = StringUtils.getStringsFromValue(currentValue, separator);
return strings;
}
-
+
/**
* Returns a map of strings from the current value.
- *
+ *
* @return map of string, string
*/
public Map<String, String> getMap() {
@@ -154,7 +154,7 @@ public class SettingModel implements Serializable { for (String string : getStrings()) {
String[] kvp = string.split("=", 2);
String key = kvp[0];
- String value = kvp[1];
+ String value = kvp[1];
map.put(key, value);
}
return map;
diff --git a/src/main/java/com/gitblit/models/SubmoduleModel.java b/src/main/java/com/gitblit/models/SubmoduleModel.java index 47f84b95..15b69d7c 100644 --- a/src/main/java/com/gitblit/models/SubmoduleModel.java +++ b/src/main/java/com/gitblit/models/SubmoduleModel.java @@ -20,9 +20,9 @@ import java.io.Serializable; /**
* SubmoduleModel is a serializable model class that represents a git submodule
* definition.
- *
+ *
* @author James Moger
- *
+ *
*/
public class SubmoduleModel implements Serializable {
@@ -40,7 +40,8 @@ public class SubmoduleModel implements Serializable { this.path = path;
this.url = url;
}
-
+
+ @Override
public String toString() {
return path + "=" + url;
}
diff --git a/src/main/java/com/gitblit/models/TeamModel.java b/src/main/java/com/gitblit/models/TeamModel.java index dfbd45d4..54f194b1 100644 --- a/src/main/java/com/gitblit/models/TeamModel.java +++ b/src/main/java/com/gitblit/models/TeamModel.java @@ -35,9 +35,9 @@ import com.gitblit.utils.StringUtils; /**
* TeamModel is a serializable model class that represents a group of users and
* a list of accessible repositories.
- *
+ *
* @author James Moger
- *
+ *
*/
public class TeamModel implements Serializable, Comparable<TeamModel> {
@@ -77,7 +77,7 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { public void addRepository(String name) {
addRepositoryPermission(name);
}
-
+
@Deprecated
@Unused
public void addRepositories(Collection<String> names) {
@@ -90,10 +90,10 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { removeRepositoryPermission(name);
}
-
+
/**
* Returns a list of repository permissions for this team.
- *
+ *
* @return the team's list of permissions
*/
public List<RegistrantAccessPermission> getRepositoryPermissions() {
@@ -117,11 +117,11 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { Collections.sort(list);
return list;
}
-
+
/**
* Returns true if the team has any type of specified access permission for
* this repository.
- *
+ *
* @param name
* @return true if team has a specified access permission for the repository
*/
@@ -143,11 +143,11 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { }
return false;
}
-
+
/**
* Returns true if the team has an explicitly specified access permission for
* this repository.
- *
+ *
* @param name
* @return if the team has an explicitly specified access permission
*/
@@ -155,7 +155,7 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { String repository = AccessPermission.repositoryFromRole(name).toLowerCase();
return permissions.containsKey(repository);
}
-
+
/**
* Adds a repository permission to the team.
* <p>
@@ -178,13 +178,13 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { addRepositoryPermission(role);
}
}
-
+
public AccessPermission removeRepositoryPermission(String name) {
String repository = AccessPermission.repositoryFromRole(name).toLowerCase();
repositories.remove(repository);
return permissions.remove(repository);
}
-
+
public void setRepositoryPermission(String repository, AccessPermission permission) {
if (permission == null) {
// remove the permission
@@ -196,16 +196,16 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { repositories.add(repository.toLowerCase());
}
}
-
+
public RegistrantAccessPermission getRepositoryPermission(RepositoryModel repository) {
RegistrantAccessPermission ap = new RegistrantAccessPermission();
ap.registrant = name;
ap.registrantType = RegistrantType.TEAM;
ap.permission = AccessPermission.NONE;
ap.mutable = false;
-
+
// determine maximum permission for the repository
- final AccessPermission maxPermission =
+ final AccessPermission maxPermission =
(repository.isFrozen || !repository.isBare) ?
AccessPermission.CLONE : AccessPermission.REWIND;
@@ -219,7 +219,7 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { }
return ap;
}
-
+
if (canAdmin) {
ap.permissionType = PermissionType.ADMINISTRATOR;
if (AccessPermission.REWIND.atMost(maxPermission)) {
@@ -229,7 +229,7 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { }
return ap;
}
-
+
if (permissions.containsKey(repository.name.toLowerCase())) {
// exact repository permission specified
AccessPermission p = permissions.get(repository.name.toLowerCase());
@@ -262,7 +262,7 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { }
}
}
-
+
// still no explicit or regex, check for implicit permissions
if (AccessPermission.NONE == ap.permission) {
switch (repository.accessRestriction) {
@@ -289,7 +289,7 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { return ap;
}
-
+
protected boolean canAccess(RepositoryModel repository, AccessRestrictionType ifRestriction, AccessPermission requirePermission) {
if (repository.accessRestriction.atLeast(ifRestriction)) {
RegistrantAccessPermission ap = getRepositoryPermission(repository);
@@ -297,7 +297,7 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { }
return true;
}
-
+
public boolean canView(RepositoryModel repository) {
return canAccess(repository, AccessRestrictionType.VIEW, AccessPermission.VIEW);
}
diff --git a/src/main/java/com/gitblit/models/UserModel.java b/src/main/java/com/gitblit/models/UserModel.java index d785ae9e..b4fdb66f 100644 --- a/src/main/java/com/gitblit/models/UserModel.java +++ b/src/main/java/com/gitblit/models/UserModel.java @@ -42,16 +42,16 @@ import com.gitblit.utils.StringUtils; * 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;
public static final UserModel ANONYMOUS = new UserModel();
-
+
// field names are reflectively mapped in EditUser page
public String username;
public String password;
@@ -78,7 +78,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> public AccountType accountType;
public UserPreferences userPreferences;
-
+
public UserModel(String username) {
this.username = username;
this.isAuthenticated = true;
@@ -92,7 +92,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> this.accountType = AccountType.LOCAL;
this.userPreferences = new UserPreferences(this.username);
}
-
+
public boolean isLocalAccount() {
return accountType.isLocal();
}
@@ -100,7 +100,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> /**
* This method does not take into consideration Ownership where the
* administrator has not explicitly granted access to the owner.
- *
+ *
* @param repositoryName
* @return
*/
@@ -129,7 +129,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
return false;
}
-
+
@Deprecated
@Unused
public boolean hasRepository(String name) {
@@ -147,11 +147,11 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> public void removeRepository(String name) {
removeRepositoryPermission(name);
}
-
+
/**
* Returns a list of repository permissions for this user exclusive of
* permissions inherited from team memberships.
- *
+ *
* @return the user's list of permissions
*/
public List<RegistrantAccessPermission> getRepositoryPermissions() {
@@ -178,7 +178,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> list.add(new RegistrantAccessPermission(registrant, ap, pType, RegistrantType.REPOSITORY, source, mutable));
}
Collections.sort(list);
-
+
// include immutable team permissions, being careful to preserve order
Set<RegistrantAccessPermission> set = new LinkedHashSet<RegistrantAccessPermission>(list);
for (TeamModel team : teams) {
@@ -193,11 +193,11 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
return new ArrayList<RegistrantAccessPermission>(set);
}
-
+
/**
* Returns true if the user has any type of specified access permission for
* this repository.
- *
+ *
* @param name
* @return true if user has a specified access permission for the repository
*/
@@ -219,11 +219,11 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
return false;
}
-
+
/**
* Returns true if the user has an explicitly specified access permission for
* this repository.
- *
+ *
* @param name
* @return if the user has an explicitly specified access permission
*/
@@ -231,11 +231,11 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> String repository = AccessPermission.repositoryFromRole(name).toLowerCase();
return permissions.containsKey(repository);
}
-
+
/**
* Returns true if the user's team memberships specify an access permission for
* this repository.
- *
+ *
* @param name
* @return if the user's team memberships specifi an access permission
*/
@@ -249,7 +249,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
return false;
}
-
+
/**
* Adds a repository permission to the team.
* <p>
@@ -266,13 +266,13 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> repositories.add(repository);
permissions.put(repository, permission);
}
-
+
public AccessPermission removeRepositoryPermission(String name) {
String repository = AccessPermission.repositoryFromRole(name).toLowerCase();
repositories.remove(repository);
return permissions.remove(repository);
}
-
+
public void setRepositoryPermission(String repository, AccessPermission permission) {
if (permission == null) {
// remove the permission
@@ -289,9 +289,9 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> ap.registrantType = RegistrantType.USER;
ap.permission = AccessPermission.NONE;
ap.mutable = false;
-
+
// determine maximum permission for the repository
- final AccessPermission maxPermission =
+ final AccessPermission maxPermission =
(repository.isFrozen || !repository.isBare) ?
AccessPermission.CLONE : AccessPermission.REWIND;
@@ -325,7 +325,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
return ap;
}
-
+
// repository owner - either specified owner or personal repository
if (repository.isOwner(username) || repository.isUsersPersonalRepository(username)) {
ap.permissionType = PermissionType.OWNER;
@@ -336,7 +336,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
return ap;
}
-
+
if (AuthorizationControl.AUTHENTICATED.equals(repository.authorizationControl) && isAuthenticated) {
// AUTHENTICATED is a shortcut for authorizing all logged-in users RW+ access
if (AccessPermission.REWIND.atMost(maxPermission)) {
@@ -346,7 +346,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
return ap;
}
-
+
// explicit user permission OR user regex match is used
// if that fails, then the best team permission is used
if (permissions.containsKey(repository.name.toLowerCase())) {
@@ -381,7 +381,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
}
}
-
+
// try to find a team match
for (TeamModel team : teams) {
RegistrantAccessPermission p = team.getRepositoryPermission(repository);
@@ -392,7 +392,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> ap.permissionType = PermissionType.TEAM;
}
}
-
+
// still no explicit, regex, or team match, check for implicit permissions
if (AccessPermission.NONE == ap.permission) {
switch (repository.accessRestriction) {
@@ -416,10 +416,10 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> break;
}
}
-
+
return ap;
}
-
+
protected boolean canAccess(RepositoryModel repository, AccessRestrictionType ifRestriction, AccessPermission requirePermission) {
if (repository.accessRestriction.atLeast(ifRestriction)) {
RegistrantAccessPermission ap = getRepositoryPermission(repository);
@@ -427,11 +427,11 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
return true;
}
-
+
public boolean canView(RepositoryModel repository) {
return canAccess(repository, AccessRestrictionType.VIEW, AccessPermission.VIEW);
}
-
+
public boolean canView(RepositoryModel repository, String ref) {
// Default UserModel doesn't implement ref-level security.
// Other Realms (i.e. Gerrit) may override this method.
@@ -486,19 +486,19 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
return canClone(repository);
}
-
+
public boolean canDelete(RepositoryModel model) {
return canAdmin() || model.isUsersPersonalRepository(username);
}
-
+
public boolean canEdit(RepositoryModel model) {
return canAdmin() || model.isUsersPersonalRepository(username) || model.isOwner(username);
}
-
+
/**
* This returns true if the user has fork privileges or the user has fork
* privileges because of a team membership.
- *
+ *
* @return true if the user can fork
*/
public boolean canFork() {
@@ -518,7 +518,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> /**
* This returns true if the user has admin privileges or the user has admin
* privileges because of a team membership.
- *
+ *
* @return true if the user can admin
*/
public boolean canAdmin() {
@@ -538,7 +538,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> /**
* This returns true if the user has create privileges or the user has create
* privileges because of a team membership.
- *
+ *
* @return true if the user can admin
*/
public boolean canCreate() {
@@ -554,10 +554,10 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
return false;
}
-
+
/**
* Returns true if the user is allowed to create the specified repository.
- *
+ *
* @param repository
* @return true if the user can create the repository
*/
@@ -601,27 +601,27 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> public String getName() {
return username;
}
-
+
public String getDisplayName() {
if (StringUtils.isEmpty(displayName)) {
return username;
}
return displayName;
}
-
+
public String getPersonalPath() {
return ModelUtils.getPersonalPath(username);
}
-
+
public UserPreferences getPreferences() {
return userPreferences;
}
-
+
@Override
public int hashCode() {
return username.hashCode();
}
-
+
@Override
public boolean equals(Object o) {
if (o instanceof UserModel) {
@@ -639,10 +639,10 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> public int compareTo(UserModel o) {
return username.compareTo(o.username);
}
-
+
/**
* Returns true if the name/email pair match this user account.
- *
+ *
* @param name
* @param email
* @return true, if the name and email address match this account
@@ -667,13 +667,13 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
return nameVerified && emailVerified;
}
-
+
@Deprecated
public boolean hasBranchPermission(String repositoryName, String branch) {
// Default UserModel doesn't implement branch-level security. Other Realms (i.e. Gerrit) may override this method.
return hasRepositoryPermission(repositoryName) || hasTeamRepositoryPermission(repositoryName);
}
-
+
public boolean isMyPersonalRepository(String repository) {
String projectPath = StringUtils.getFirstPathElement(repository);
return !StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase(getPersonalPath());
diff --git a/src/main/java/com/gitblit/models/UserPreferences.java b/src/main/java/com/gitblit/models/UserPreferences.java index e6baa289..baab0719 100644 --- a/src/main/java/com/gitblit/models/UserPreferences.java +++ b/src/main/java/com/gitblit/models/UserPreferences.java @@ -27,7 +27,7 @@ import com.gitblit.utils.StringUtils; /** * User preferences. - * + * * @author James Moger * */ @@ -38,20 +38,20 @@ public class UserPreferences implements Serializable { public final String username; public String locale; - + private final Map<String, UserRepositoryPreferences> repositoryPreferences = new TreeMap<String, UserRepositoryPreferences>(); public UserPreferences(String username) { this.username = username; } - + public Locale getLocale() { if (StringUtils.isEmpty(locale)) { return null; } return new Locale(locale); } - + public UserRepositoryPreferences getRepositoryPreferences(String repositoryName) { String key = repositoryName.toLowerCase(); if (!repositoryPreferences.containsKey(key)) { @@ -63,11 +63,11 @@ public class UserPreferences implements Serializable { } return repositoryPreferences.get(key); } - + public void setRepositoryPreferences(UserRepositoryPreferences pref) { repositoryPreferences.put(pref.repositoryName.toLowerCase(), pref); } - + public boolean isStarredRepository(String repository) { if (repositoryPreferences == null) { return false; @@ -79,7 +79,7 @@ public class UserPreferences implements Serializable { } return false; } - + public List<String> getStarredRepositories() { List<String> list = new ArrayList<String>(); for (UserRepositoryPreferences prefs : repositoryPreferences.values()) { diff --git a/src/main/java/com/gitblit/models/UserRepositoryPreferences.java b/src/main/java/com/gitblit/models/UserRepositoryPreferences.java index bc3a1845..80b71f3e 100644 --- a/src/main/java/com/gitblit/models/UserRepositoryPreferences.java +++ b/src/main/java/com/gitblit/models/UserRepositoryPreferences.java @@ -19,7 +19,7 @@ import java.io.Serializable; /** * User repository preferences. - * + * * @author James Moger * */ @@ -28,11 +28,11 @@ public class UserRepositoryPreferences implements Serializable { private static final long serialVersionUID = 1L; public String username; - + public String repositoryName; - + public boolean starred; - + @Override public String toString() { return username + ":" + repositoryName; |