From 46bdf9829d62a296c66c8a15969308838ea8cbe9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 02 Jan 2013 16:19:06 -0500
Subject: [PATCH] Fixed NPE with web.allowForking && !git.cacheRepositoryList (issue-182)
---
src/com/gitblit/client/SearchDialog.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/client/SearchDialog.java b/src/com/gitblit/client/SearchDialog.java
index 88864a9..829bc52 100644
--- a/src/com/gitblit/client/SearchDialog.java
+++ b/src/com/gitblit/client/SearchDialog.java
@@ -92,8 +92,7 @@
this.gitblit = gitblit;
this.isSearch = isSearch;
setTitle(Translation.get(isSearch ? "gb.search" : "gb.log"));
- setIconImage(new ImageIcon(getClass().getResource(
- isSearch ? "/gitblt-favicon.png" : "/commit_changes_16x16.png")).getImage());
+ setIconImage(new ImageIcon(getClass().getResource("/gitblt-favicon.png")).getImage());
initialize();
setSize(900, 550);
}
@@ -161,7 +160,6 @@
table = Utils.newTable(tableModel, Utils.DATE_FORMAT);
String name = table.getColumnName(FeedEntryTableModel.Columns.Author.ordinal());
- table.setRowHeight(nameRenderer.getFont().getSize() + 8);
table.getColumn(name).setCellRenderer(nameRenderer);
name = table.getColumnName(FeedEntryTableModel.Columns.Repository.ordinal());
table.getColumn(name).setCellRenderer(nameRenderer);
--
Gitblit v1.9.1