From 609a16e10fb705e146e7fd4b0fe48c744d40a2e0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Nov 2011 17:11:47 -0400
Subject: [PATCH] Revised branch rendering. Added ref rendering to message column.
---
src/com/gitblit/client/SyndicatedEntryTableModel.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/client/SyndicatedEntryTableModel.java b/src/com/gitblit/client/SyndicatedEntryTableModel.java
index 93177a8..8fcdb47 100644
--- a/src/com/gitblit/client/SyndicatedEntryTableModel.java
+++ b/src/com/gitblit/client/SyndicatedEntryTableModel.java
@@ -34,12 +34,10 @@
private static final long serialVersionUID = 1L;
- private final GitblitClient gitblit;
-
List<SyndicatedEntryModel> entries;
enum Columns {
- Date, Repository, Author, Message, Branch;
+ Date, Repository, Branch, Author, Message;
@Override
public String toString() {
@@ -47,8 +45,7 @@
}
}
- public SyndicatedEntryTableModel(GitblitClient gitblit) {
- this.gitblit = gitblit;
+ public SyndicatedEntryTableModel() {
this.entries = new ArrayList<SyndicatedEntryModel>();
}
@@ -95,6 +92,8 @@
public Class<?> getColumnClass(int columnIndex) {
if (Columns.Date.ordinal() == columnIndex) {
return Date.class;
+ } else if (Columns.Message.ordinal() == columnIndex) {
+ return SyndicatedEntryModel.class;
}
return String.class;
}
@@ -113,11 +112,7 @@
case Author:
return entry.author;
case Message:
- Date lastRefresh = gitblit.getLastFeedRefresh(entry.repository, entry.branch);
- if (entry.published.after(lastRefresh)) {
- return "<html><body><b>" + entry.title;
- }
- return entry.title;
+ return entry;
}
return null;
}
--
Gitblit v1.9.1