From e493cfdfa99ba780f1cd61c5575e169c8eb46845 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 09 Nov 2011 17:01:59 -0500
Subject: [PATCH] Restored html content to feeds. Include regex substitutions in content.
---
src/com/gitblit/client/MessageRenderer.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/com/gitblit/client/MessageRenderer.java b/src/com/gitblit/client/MessageRenderer.java
index c848cef..9769c19 100644
--- a/src/com/gitblit/client/MessageRenderer.java
+++ b/src/com/gitblit/client/MessageRenderer.java
@@ -28,7 +28,7 @@
import javax.swing.border.LineBorder;
import javax.swing.table.TableCellRenderer;
-import com.gitblit.models.SyndicatedEntryModel;
+import com.gitblit.models.FeedEntryModel;
/**
* Message renderer displays the short log message and then any refs in a style
@@ -53,6 +53,10 @@
private final JLabel branchLabel;
+ public MessageRenderer() {
+ this(null);
+ }
+
public MessageRenderer(GitblitClient gitblit) {
super(new FlowLayout(FlowLayout.LEFT, 10, 1));
this.gitblit = gitblit;
@@ -74,13 +78,21 @@
setBackground(table.getBackground());
messageLabel.setForeground(isSelected ? table.getSelectionForeground() : table
.getForeground());
- SyndicatedEntryModel entry = (SyndicatedEntryModel) value;
-
- // show message in BOLD if its a new entry
- if (entry.published.after(gitblit.getLastFeedRefresh(entry.repository, entry.branch))) {
- messageLabel.setText("<html><body><b>" + entry.title);
- } else {
+ if (value == null) {
+ return this;
+ }
+ FeedEntryModel entry = (FeedEntryModel) value;
+
+ if (gitblit == null) {
+ // no gitblit client, just display message
messageLabel.setText(entry.title);
+ } else {
+ // show message in BOLD if its a new entry
+ if (entry.published.after(gitblit.getLastFeedRefresh(entry.repository, entry.branch))) {
+ messageLabel.setText("<html><body><b>" + entry.title);
+ } else {
+ messageLabel.setText(entry.title);
+ }
}
// reset ref label
--
Gitblit v1.9.1