From 9af47c10c6a268877c1d232c8d71ee6df4f8a7ab Mon Sep 17 00:00:00 2001 From: Jeroen Baten <jeroen@jeroenbaten.nl> Date: Fri, 04 Jan 2013 05:18:37 -0500 Subject: [PATCH] Dutch translation before spellcheck --- src/com/gitblit/wicket/pages/BlobPage.java | 228 ++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 163 insertions(+), 65 deletions(-) diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java index b9cdc03..e2b8546 100644 --- a/src/com/gitblit/wicket/pages/BlobPage.java +++ b/src/com/gitblit/wicket/pages/BlobPage.java @@ -1,96 +1,194 @@ +/* + * Copyright 2011 gitblit.com. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.gitblit.wicket.pages; +import java.text.MessageFormat; import java.util.HashMap; import java.util.Map; import org.apache.wicket.Component; import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.image.Image; +import org.apache.wicket.markup.html.link.BookmarkablePageLink; +import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; -import com.gitblit.StoredSettings; +import com.gitblit.GitBlit; +import com.gitblit.Keys; import com.gitblit.utils.JGitUtils; -import com.gitblit.wicket.LinkPanel; -import com.gitblit.wicket.RepositoryPage; +import com.gitblit.utils.StringUtils; +import com.gitblit.wicket.ExternalImage; import com.gitblit.wicket.WicketUtils; +import com.gitblit.wicket.panels.CommitHeaderPanel; import com.gitblit.wicket.panels.PathBreadcrumbsPanel; - public class BlobPage extends RepositoryPage { public BlobPage(PageParameters params) { super(params); - final String blobPath = params.getString("f", null); - Repository r = getRepository(); - RevCommit commit = JGitUtils.getCommit(r, commitId); + final String blobPath = WicketUtils.getPath(params); + String [] encodings = GitBlit.getEncodings(); + + if (StringUtils.isEmpty(blobPath)) { + // blob by objectid - // blob page links - add(new Label("historyLink", "history")); - add(new Label("rawLink", "raw")); - add(new Label("headLink", "HEAD")); - - add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter())); - - add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, commitId)); - String extension = null; - if (blobPath.lastIndexOf('.') > -1) { - extension = blobPath.substring(blobPath.lastIndexOf('.') + 1); - } - - // Map the extensions to types - Map<String, Integer> map = new HashMap<String, Integer>(); - for (String ext : StoredSettings.getStrings("prettyPrintExtensions")) { - map.put(ext.toLowerCase(), 1); - } - for (String ext : StoredSettings.getStrings("imageExtensions")) { - map.put(ext.toLowerCase(), 2); - } - for (String ext : StoredSettings.getStrings("binaryExtensions")) { - map.put(ext.toLowerCase(), 3); - } - - if (extension != null) { - int type = 0; - if (map.containsKey(extension)) { - type = map.get(extension); - } - Component c = null; - switch (type) { - case 1: - // PrettyPrint blob text - c = new Label("blobText", JGitUtils.getRawContentAsString(r, commit, blobPath)); - WicketUtils.setCssClass(c, "prettyprint"); - break; - case 2: - // TODO image blobs - c = new Label("blobText", "Image File"); - break; - case 3: - // TODO binary blobs - c = new Label("blobText", "Binary File"); - break; - default: - // plain text - c = new Label("blobText", JGitUtils.getRawContentAsString(r, commit, blobPath)); - WicketUtils.setCssClass(c, "plainprint"); - } + 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, encodings)); + WicketUtils.setCssClass(c, "plainprint"); add(c); } else { - // plain text - Label blobLabel = new Label("blobText", JGitUtils.getRawContentAsString(r, commit, blobPath)); - WicketUtils.setCssClass(blobLabel, "plainprint"); - add(blobLabel); - } + // standard blob view + String extension = null; + if (blobPath.lastIndexOf('.') > -1) { + extension = blobPath.substring(blobPath.lastIndexOf('.') + 1).toLowerCase(); + } - // footer - addFooter(); + // see if we should redirect to the markdown page + for (String ext : GitBlit.getStrings(Keys.web.markdownExtensions)) { + if (ext.equals(extension)) { + setResponsePage(MarkdownPage.class, params); + return; + } + } + + // manually get commit because it can be null + RevCommit commit = JGitUtils.getCommit(r, objectId); + + // blob page links + 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, + WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); + add(new BookmarkablePageLink<Void>("headLink", BlobPage.class, + WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath))); + + add(new CommitHeaderPanel("commitHeader", repositoryName, commit)); + + add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId)); + + // Map the extensions to types + Map<String, Integer> map = new HashMap<String, Integer>(); + for (String ext : GitBlit.getStrings(Keys.web.prettyPrintExtensions)) { + map.put(ext.toLowerCase(), 1); + } + for (String ext : GitBlit.getStrings(Keys.web.imageExtensions)) { + map.put(ext.toLowerCase(), 2); + } + for (String ext : GitBlit.getStrings(Keys.web.binaryExtensions)) { + map.put(ext.toLowerCase(), 3); + } + + if (extension != null) { + int type = 0; + if (map.containsKey(extension)) { + type = map.get(extension); + } + switch (type) { + case 2: + // image blobs + add(new Label("blobText").setVisible(false)); + add(new ExternalImage("blobImage", urlFor(RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath)).toString())); + break; + case 3: + // binary blobs + add(new Label("blobText", "Binary File")); + add(new Image("blobImage").setVisible(false)); + break; + default: + // plain text + String source = JGitUtils.getStringContent(r, commit.getTree(), blobPath, encodings); + String table = generateSourceView(source, type == 1); + add(new Label("blobText", table).setEscapeModelStrings(false)); + add(new Image("blobImage").setVisible(false)); + } + } else { + // plain text + String source = JGitUtils.getStringContent(r, commit.getTree(), blobPath, encodings); + String table = generateSourceView(source, false); + add(new Label("blobText", table).setEscapeModelStrings(false)); + add(new Image("blobImage").setVisible(false)); + } + } } + protected String generateSourceView(String source, boolean prettyPrint) { + String [] lines = source.split("\n"); + + StringBuilder sb = new StringBuilder(); + sb.append("<!-- start blob table -->"); + sb.append("<table width=\"100%\"><tbody><tr>"); + + // nums column + sb.append("<!-- start nums column -->"); + sb.append("<td id=\"nums\">"); + sb.append("<pre>"); + String numPattern = "<span id=\"L{0}\" class=\"num\">{0}</span>\n"; + for (int i = 0; i < lines.length; i++) { + sb.append(MessageFormat.format(numPattern, "" + (i + 1))); + } + sb.append("</pre>"); + sb.append("<!-- end nums column -->"); + sb.append("</td>"); + + sb.append("<!-- start lines column -->"); + sb.append("<td id=\"lines\">"); + sb.append("<div class=\"sourceview\">"); + if (prettyPrint) { + sb.append("<pre class=\"prettyprint\">"); + } else { + sb.append("<pre class=\"plainprint\">"); + } + lines = StringUtils.escapeForHtml(source, true).split("\n"); + + sb.append("<table width=\"100%\"><tbody>"); + + String linePattern = "<tr class=\"{0}\"><td><a href=\"#L{2}\">{1}</a>\r</tr>"; + for (int i = 0; i < lines.length; i++) { + String line = lines[i].replace('\r', ' '); + String cssClass = (i % 2 == 0) ? "even" : "odd"; + sb.append(MessageFormat.format(linePattern, cssClass, line, "" + (i + 1))); + } + sb.append("</tbody></table></pre>"); + sb.append("</pre>"); + sb.append("</div>"); + sb.append("</td>"); + sb.append("<!-- end lines column -->"); + + sb.append("</tr></tbody></table>"); + sb.append("<!-- end blob table -->"); + + return sb.toString(); + } + @Override protected String getPageName() { - return "view"; + return getString("gb.view"); } } -- Gitblit v1.9.1