From 600d43db0c6c19fafa2f5f313170f31cc82acb9c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 26 Sep 2014 09:06:29 -0400
Subject: [PATCH] Respect repository default integration branch for new proposal tickets
---
src/main/java/com/gitblit/client/MessageRenderer.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/client/MessageRenderer.java b/src/main/java/com/gitblit/client/MessageRenderer.java
index 2fe3415..453c4fc 100644
--- a/src/main/java/com/gitblit/client/MessageRenderer.java
+++ b/src/main/java/com/gitblit/client/MessageRenderer.java
@@ -36,20 +36,20 @@
/**
* Message renderer displays the short log message and then any refs in a style
* like the site.
- *
+ *
* @author James Moger
- *
+ *
*/
public class MessageRenderer extends JPanel implements TableCellRenderer, Serializable {
private static final long serialVersionUID = 1L;
private final GitblitClient gitblit;
-
+
private final ImageIcon mergeIcon;
-
+
private final ImageIcon blankIcon;
-
+
private final JLabel messageLabel;
private final JLabel headLabel;
@@ -67,12 +67,12 @@
public MessageRenderer(GitblitClient gitblit) {
super(new FlowLayout(FlowLayout.LEFT, Utils.MARGIN, 1));
this.gitblit = gitblit;
-
+
mergeIcon = new ImageIcon(getClass().getResource("/commit_merge_16x16.png"));
blankIcon = new ImageIcon(getClass().getResource("/blank.png"));
messageLabel = new JLabel();
-
+
headLabel = newRefLabel();
branchLabel = newRefLabel();
remoteLabel = newRefLabel();
@@ -85,7 +85,7 @@
add(tagLabel);
}
- private JLabel newRefLabel() {
+ private JLabel newRefLabel() {
JLabel label = new JLabel();
label.setOpaque(true);
Font font = label.getFont();
@@ -131,6 +131,7 @@
label.setVisible(true);
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
boolean hasFocus, int row, int column) {
if (isSelected)
--
Gitblit v1.9.1