summaryrefslogtreecommitdiffstats
path: root/src/com/gitblit/client/BranchRenderer.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2011-11-04 23:00:19 -0400
committerJames Moger <james.moger@gitblit.com>2011-11-04 23:00:19 -0400
commit41cffba4298d61383d0dd99857429960a4ca3d44 (patch)
tree1329ed39e07e82d9b309ccd16871379baf9c74eb /src/com/gitblit/client/BranchRenderer.java
parente33b91aa4d43246ad62832e66e2acfad3dfb3608 (diff)
downloadgitblit-41cffba4298d61383d0dd99857429960a4ca3d44.tar.gz
gitblit-41cffba4298d61383d0dd99857429960a4ca3d44.zip
Refinements to search dialog and null checks in cell renderers
Diffstat (limited to 'src/com/gitblit/client/BranchRenderer.java')
-rw-r--r--src/com/gitblit/client/BranchRenderer.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/gitblit/client/BranchRenderer.java b/src/com/gitblit/client/BranchRenderer.java
index 586d0500..9a303c38 100644
--- a/src/com/gitblit/client/BranchRenderer.java
+++ b/src/com/gitblit/client/BranchRenderer.java
@@ -41,10 +41,7 @@ public class BranchRenderer extends DefaultTableCellRenderer implements ListCell
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
boolean hasFocus, int row, int column) {
super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
- if (value == null) {
- return this;
- }
- setText(value.toString());
+ setText(value == null ? "" : value.toString());
if (isSelected) {
setForeground(table.getSelectionForeground());
}
@@ -54,7 +51,7 @@ public class BranchRenderer extends DefaultTableCellRenderer implements ListCell
@Override
public Component getListCellRendererComponent(JList list, Object value, int index,
boolean isSelected, boolean cellHasFocus) {
- setText(value.toString());
+ setText(value == null ? "" : value.toString());
if (isSelected) {
setBackground(list.getSelectionBackground());
setForeground(list.getSelectionForeground());