From a48c33a76f3497d33e0c3d0d3cf1a59aef23679f Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 11 Jan 2012 16:35:11 -0500 Subject: [PATCH] Fixed missing gbapi ant tag dependency in build process --- src/com/gitblit/models/RepositoryModel.java | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java index 3863737..ad0adaa 100644 --- a/src/com/gitblit/models/RepositoryModel.java +++ b/src/com/gitblit/models/RepositoryModel.java @@ -16,9 +16,13 @@ package com.gitblit.models; import java.io.Serializable; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import com.gitblit.Constants.AccessRestrictionType; +import com.gitblit.Constants.FederationStrategy; +import com.gitblit.utils.StringUtils; /** * RepositoryModel is a serializable model class that represents a Gitblit @@ -27,7 +31,7 @@ * @author James Moger * */ -public class RepositoryModel implements Serializable { +public class RepositoryModel implements Serializable, Comparable<RepositoryModel> { private static final long serialVersionUID = 1L; @@ -43,7 +47,20 @@ public AccessRestrictionType accessRestriction; public boolean isFrozen; public boolean showReadme; + public FederationStrategy federationStrategy; + public List<String> federationSets; + public boolean isFederated; + public boolean skipSizeCalculation; + public boolean skipSummaryMetrics; + public String frequency; + public String origin; + public String size; + public List<String> preReceiveScripts; + public List<String> postReceiveScripts; + public List<String> mailingLists; + private String displayName; + public RepositoryModel() { this("", "", "", new Date(0)); } @@ -54,10 +71,20 @@ this.owner = owner; this.lastChange = lastchange; this.accessRestriction = AccessRestrictionType.NONE; + this.federationSets = new ArrayList<String>(); + this.federationStrategy = FederationStrategy.FEDERATE_THIS; } @Override public String toString() { - return name; + if (displayName == null) { + displayName = StringUtils.stripDotGit(name); + } + return displayName; + } + + @Override + public int compareTo(RepositoryModel o) { + return StringUtils.compareRepositoryNames(name, o.name); } } \ No newline at end of file -- Gitblit v1.9.1