From fd6ac68c0b1136182b5d713ec88ea94e26c4a76d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 29 Sep 2011 23:47:13 -0400
Subject: [PATCH] Adjusted Metric chart widths. Diff hunk header css tweak.
---
src/com/gitblit/Constants.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java
index a58242b..f4541c9 100644
--- a/src/com/gitblit/Constants.java
+++ b/src/com/gitblit/Constants.java
@@ -29,7 +29,7 @@
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
- public static final String VERSION = "0.6.0-SNAPSHOT";
+ public static final String VERSION = "0.6.1-SNAPSHOT";
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
@@ -37,7 +37,7 @@
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
- public static final String JGIT_VERSION = "JGit 1.0.0 (201106090707-r)";
+ public static final String JGIT_VERSION = "JGit 1.1.0 (201109151100-r)";
public static final String ADMIN_ROLE = "#admin";
@@ -115,7 +115,7 @@
* Enumeration representing the types of federation requests.
*/
public static enum FederationRequest {
- PROPOSAL, PULL_REPOSITORIES, PULL_USERS, PULL_SETTINGS, STATUS;
+ POKE, PROPOSAL, PULL_REPOSITORIES, PULL_USERS, PULL_SETTINGS, STATUS;
public static FederationRequest fromName(String name) {
for (FederationRequest type : values()) {
@@ -135,7 +135,7 @@
* Enumeration representing the statii of federation requests.
*/
public static enum FederationPullStatus {
- PENDING, FAILED, SKIPPED, PULLED, EXCLUDED;
+ PENDING, FAILED, SKIPPED, PULLED, MIRRORED, NOCHANGE, EXCLUDED;
public static FederationPullStatus fromName(String name) {
for (FederationPullStatus type : values()) {
@@ -151,7 +151,7 @@
return name();
}
}
-
+
/**
* Enumeration representing the federation types.
*/
@@ -167,10 +167,30 @@
return FEDERATE_THIS;
}
+ public boolean exceeds(FederationStrategy type) {
+ return this.ordinal() > type.ordinal();
+ }
+
+ public boolean atLeast(FederationStrategy type) {
+ return this.ordinal() >= type.ordinal();
+ }
+
@Override
public String toString() {
return name();
}
}
+ /**
+ * Enumeration representing the possible results of federation proposal
+ * requests.
+ */
+ public static enum FederationProposalResult {
+ ERROR, FEDERATION_DISABLED, MISSING_DATA, NO_PROPOSALS, NO_POKE, ACCEPTED;
+
+ @Override
+ public String toString() {
+ return name();
+ }
+ }
}
--
Gitblit v1.9.1