From f90dc635928f367f9078f814488c7e385ebc4e2e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 20 May 2011 17:31:07 -0400
Subject: [PATCH] Documentation.
---
src/com/gitblit/wicket/panels/SearchPanel.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/SearchPanel.java b/src/com/gitblit/wicket/panels/SearchPanel.java
index c7e038d..38a54d9 100644
--- a/src/com/gitblit/wicket/panels/SearchPanel.java
+++ b/src/com/gitblit/wicket/panels/SearchPanel.java
@@ -4,7 +4,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.wicket.markup.html.image.ContextImage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
@@ -34,7 +33,7 @@
public SearchPanel(String wicketId, final String repositoryName, final String objectId, final String value, SearchType searchType, Repository r, int limit, int pageOffset) {
super(wicketId);
boolean pageResults = limit <= 0;
- int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.logPageCommitCount, 50);
+ int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.itemsPerPage, 50);
if (itemsPerPage <= 1) {
itemsPerPage = 50;
}
@@ -56,7 +55,7 @@
hasMore = commits.size() >= itemsPerPage;
// header
- add(new LinkPanel("header", "title", commit.getShortMessage(), CommitPage.class, WicketUtils.newObjectParameter(repositoryName, commit.getName())));
+ add(new LinkPanel("header", "title", commit == null ? "":commit.getShortMessage(), CommitPage.class, WicketUtils.newObjectParameter(repositoryName, commit == null ? "":commit.getName())));
ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits);
DataView<RevCommit> searchView = new DataView<RevCommit>("commit", dp) {
@@ -77,9 +76,9 @@
// merge icon
if (entry.getParentCount() > 1) {
- item.add(new ContextImage("commitIcon", "/com/gitblit/wicket/resources/commit_merge_16x16.png"));
+ item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png"));
} else {
- item.add(new ContextImage("commitIcon", "/com/gitblit/wicket/resources/blank.png"));
+ item.add(WicketUtils.newBlankImage("commitIcon"));
}
String shortMessage = entry.getShortMessage();
@@ -87,7 +86,7 @@
// TODO highlight matches
LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName()));
if (!shortMessage.equals(trimmedMessage)) {
- WicketUtils.setHtmlTitle(shortlog, shortMessage);
+ WicketUtils.setHtmlTooltip(shortlog, shortMessage);
}
item.add(shortlog);
--
Gitblit v1.9.1