From 856c8a2ad521064d69b2b50003c1df382d375013 Mon Sep 17 00:00:00 2001
From: Marcin Floryan <marcin.floryan@gmail.com>
Date: Sat, 03 Nov 2012 15:15:22 -0400
Subject: [PATCH] Download progress - CR character behaves as expected on Windows but not on other platforms.
---
src/com/gitblit/models/RefModel.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/models/RefModel.java b/src/com/gitblit/models/RefModel.java
index 0b65c09..8489c81 100644
--- a/src/com/gitblit/models/RefModel.java
+++ b/src/com/gitblit/models/RefModel.java
@@ -25,6 +25,13 @@
import org.eclipse.jgit.revwalk.RevObject;
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> {
private static final long serialVersionUID = 1L;
@@ -42,7 +49,10 @@
Date date = new Date(0);
if (referencedObject != null) {
if (referencedObject instanceof RevTag) {
- date = ((RevTag) referencedObject).getTaggerIdent().getWhen();
+ RevTag tag = (RevTag) referencedObject;
+ if (tag.getTaggerIdent() != null) {
+ date = tag.getTaggerIdent().getWhen();
+ }
} else if (referencedObject instanceof RevCommit) {
date = ((RevCommit) referencedObject).getCommitterIdent().getWhen();
}
@@ -51,6 +61,9 @@
}
public String getName() {
+ if (reference == null) {
+ return displayName;
+ }
return reference.getName();
}
@@ -127,7 +140,7 @@
public int compareTo(RefModel o) {
return getDate().compareTo(o.getDate());
}
-
+
@Override
public String toString() {
return displayName;
--
Gitblit v1.9.1