From 9119cf9d89257717b486c59b73bacc7c375501fc Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 04 Nov 2011 17:24:45 -0400 Subject: [PATCH] Search added to gbapi. Search dialog for Manager. Misc Manager fixes. --- src/com/gitblit/client/BranchRenderer.java | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/com/gitblit/client/BranchRenderer.java b/src/com/gitblit/client/BranchRenderer.java index 532a432..586d050 100644 --- a/src/com/gitblit/client/BranchRenderer.java +++ b/src/com/gitblit/client/BranchRenderer.java @@ -18,7 +18,9 @@ import java.awt.Color; import java.awt.Component; +import javax.swing.JList; import javax.swing.JTable; +import javax.swing.ListCellRenderer; import javax.swing.table.DefaultTableCellRenderer; /** @@ -28,7 +30,7 @@ * @author James Moger * */ -public class BranchRenderer extends DefaultTableCellRenderer { +public class BranchRenderer extends DefaultTableCellRenderer implements ListCellRenderer { private static final long serialVersionUID = 1L; @@ -39,7 +41,32 @@ public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - String name = value.toString(); + if (value == null) { + return this; + } + setText(value.toString()); + if (isSelected) { + setForeground(table.getSelectionForeground()); + } + return this; + } + + @Override + public Component getListCellRendererComponent(JList list, Object value, int index, + boolean isSelected, boolean cellHasFocus) { + setText(value.toString()); + if (isSelected) { + setBackground(list.getSelectionBackground()); + setForeground(list.getSelectionForeground()); + } else { + setBackground(list.getBackground()); + } + return this; + } + + @Override + public void setText(String text) { + String name = text; Color fg = getForeground(); if (name.startsWith(R_HEADS)) { name = name.substring(R_HEADS.length()); @@ -48,8 +75,7 @@ name = name.substring(R_REMOTES.length()); fg = Color.decode("#6C6CBF"); } - setText(name); - setForeground(isSelected ? table.getSelectionForeground() : fg); - return this; + setForeground(fg); + super.setText(name); } } \ No newline at end of file -- Gitblit v1.9.1