From bd196e554bb6f5cb97cd02bc7a90c6924ff9b858 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 10 Jul 2012 17:41:24 -0400 Subject: [PATCH] Updated Apache Commons Daemon to 1.0.10 --- src/com/gitblit/wicket/pages/BlobPage.java | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java index 3c5c8e0..fb5a962 100644 --- a/src/com/gitblit/wicket/pages/BlobPage.java +++ b/src/com/gitblit/wicket/pages/BlobPage.java @@ -41,18 +41,21 @@ Repository r = getRepository(); final String blobPath = WicketUtils.getPath(params); - + String [] encodings = GitBlit.getEncodings(); + if (StringUtils.isEmpty(blobPath)) { // blob by objectid - add(new Label("blameLink", getString("gb.blame")).setEnabled(false)); + add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class, + WicketUtils.newPathParameter(repositoryName, objectId, blobPath)) + .setEnabled(false)); add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class).setEnabled(false)); add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); add(new BookmarkablePageLink<Void>("headLink", BlobPage.class).setEnabled(false)); add(new CommitHeaderPanel("commitHeader", objectId)); add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId)); - Component c = new Label("blobText", JGitUtils.getStringContent(r, objectId)); + Component c = new Label("blobText", JGitUtils.getStringContent(r, objectId, encodings)); WicketUtils.setCssClass(c, "plainprint"); add(c); } else { @@ -74,7 +77,8 @@ RevCommit commit = JGitUtils.getCommit(r, objectId); // blob page links - add(new Label("blameLink", getString("gb.blame"))); + add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class, + WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, @@ -108,7 +112,7 @@ case 1: // PrettyPrint blob text c = new Label("blobText", JGitUtils.getStringContent(r, commit.getTree(), - blobPath)); + blobPath, encodings)); WicketUtils.setCssClass(c, "prettyprint linenums"); break; case 2: @@ -122,14 +126,14 @@ default: // plain text c = new Label("blobText", JGitUtils.getStringContent(r, commit.getTree(), - blobPath)); + blobPath, encodings)); WicketUtils.setCssClass(c, "plainprint"); } add(c); } else { // plain text Label blobLabel = new Label("blobText", JGitUtils.getStringContent(r, - commit.getTree(), blobPath)); + commit.getTree(), blobPath, encodings)); WicketUtils.setCssClass(blobLabel, "plainprint"); add(blobLabel); } -- Gitblit v1.9.1