From 8c9bce97acb5ca21c8b23d9594c24204d13fc436 Mon Sep 17 00:00:00 2001
From: Mrbytes <eguervos@msn.com>
Date: Fri, 12 Oct 2012 13:25:53 -0400
Subject: [PATCH] GitBlitWebApp_es.properties: -Up-to-date. -Some minor changes in syntax for better compression.
---
src/com/gitblit/models/FederationModel.java | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/com/gitblit/models/FederationModel.java b/src/com/gitblit/models/FederationModel.java
index d67ae56..1d211ce 100644
--- a/src/com/gitblit/models/FederationModel.java
+++ b/src/com/gitblit/models/FederationModel.java
@@ -114,7 +114,7 @@
* @param status
*/
public void updateStatus(RepositoryModel repository, FederationPullStatus status) {
- if (!results.containsKey(repository)) {
+ if (!results.containsKey(repository.name)) {
results.put(repository.name, FederationPullStatus.PENDING);
}
if (status != null) {
@@ -198,22 +198,7 @@
@Override
public int compareTo(RepositoryStatus o) {
if (status.equals(o.status)) {
- // sort root repositories first, alphabetically
- // then sort grouped repositories, alphabetically
- int s1 = name.indexOf('/');
- int s2 = o.name.indexOf('/');
- if (s1 == -1 && s2 == -1) {
- // neither grouped
- return name.compareTo(o.name);
- } else if (s1 > -1 && s2 > -1) {
- // both grouped
- return name.compareTo(o.name);
- } else if (s1 == -1) {
- return -1;
- } else if (s2 == -1) {
- return 1;
- }
- return 0;
+ return StringUtils.compareRepositoryNames(name, o.name);
}
return status.compareTo(o.status);
}
--
Gitblit v1.9.1