From 87cc1ed60735a419a3ea23f20614fc0a3f9bab60 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 15 Apr 2011 17:18:51 -0400 Subject: [PATCH] Settings overhaul. Fixes to authentication. Bind interface feature. --- src/com/gitblit/wicket/pages/TicGitTicketPage.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/wicket/pages/TicGitTicketPage.java b/src/com/gitblit/wicket/pages/TicGitTicketPage.java index 30bd6cc..b4c9cf5 100644 --- a/src/com/gitblit/wicket/pages/TicGitTicketPage.java +++ b/src/com/gitblit/wicket/pages/TicGitTicketPage.java @@ -8,7 +8,7 @@ import org.eclipse.jgit.lib.Repository; import com.gitblit.utils.JGitUtils; -import com.gitblit.utils.Utils; +import com.gitblit.utils.StringUtils; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.RepositoryPage; import com.gitblit.wicket.WicketUtils; @@ -32,7 +32,7 @@ Label stateLabel = new Label("ticketState", t.state); WicketUtils.setTicketCssClass(stateLabel, t.state); add(stateLabel); - add(new Label("ticketTags", WicketUtils.flattenStrings(t.tags))); + add(new Label("ticketTags", StringUtils.flattenStrings(t.tags))); ListDataProvider<Comment> commentsDp = new ListDataProvider<Comment>(t.comments); DataView<Comment> commentsView = new DataView<Comment>("comment", commentsDp) { @@ -57,8 +57,8 @@ } private String prepareComment(String comment) { - String html = Utils.escapeForHtml(comment, false); - html = WicketUtils.breakLines(comment).trim(); + String html = StringUtils.escapeForHtml(comment, false); + html = StringUtils.breakLinesForHtml(comment).trim(); return html.replaceAll("\\bcommit\\s*([A-Za-z0-9]*)\\b", "<a href=\"/commit/" + repositoryName + "/$1\">commit $1</a>"); } } -- Gitblit v1.9.1