From 7cd88ddbd93b115aeda76b87b1c99f9afa4aaaef Mon Sep 17 00:00:00 2001 From: Lukasz Jader <ljaderdev@gmail.com> Date: Sat, 14 Jul 2012 08:01:51 -0400 Subject: [PATCH] Fix some typos in polish translation --- src/com/gitblit/models/RepositoryModel.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java index 3863737..0e0c2df 100644 --- a/src/com/gitblit/models/RepositoryModel.java +++ b/src/com/gitblit/models/RepositoryModel.java @@ -16,9 +16,15 @@ package com.gitblit.models; import java.io.Serializable; +import java.util.ArrayList; import java.util.Date; +import java.util.List; +import java.util.Map; import com.gitblit.Constants.AccessRestrictionType; +import com.gitblit.Constants.FederationStrategy; +import com.gitblit.utils.ArrayUtils; +import com.gitblit.utils.StringUtils; /** * RepositoryModel is a serializable model class that represents a Gitblit @@ -27,7 +33,7 @@ * @author James Moger * */ -public class RepositoryModel implements Serializable { +public class RepositoryModel implements Serializable, Comparable<RepositoryModel> { private static final long serialVersionUID = 1L; @@ -43,7 +49,24 @@ 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 boolean isBare; + public String origin; + public String HEAD; + public List<String> availableRefs; + public List<String> indexedBranches; + public String size; + public List<String> preReceiveScripts; + public List<String> postReceiveScripts; + public List<String> mailingLists; + public Map<String, String> customFields; + private String displayName; + public RepositoryModel() { this("", "", "", new Date(0)); } @@ -54,10 +77,33 @@ this.owner = owner; this.lastChange = lastchange; this.accessRestriction = AccessRestrictionType.NONE; + this.federationSets = new ArrayList<String>(); + this.federationStrategy = FederationStrategy.FEDERATE_THIS; + } + + public List<String> getLocalBranches() { + if (ArrayUtils.isEmpty(availableRefs)) { + return new ArrayList<String>(); + } + List<String> localBranches = new ArrayList<String>(); + for (String ref : availableRefs) { + if (ref.startsWith("refs/heads")) { + localBranches.add(ref); + } + } + return localBranches; } @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