From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/wicket/pages/BlobPage.java | 52 ++++++++--------------------------------------------
1 files changed, 8 insertions(+), 44 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java
index f1d802d..e2b8546 100644
--- a/src/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/com/gitblit/wicket/pages/BlobPage.java
@@ -131,7 +131,7 @@
} else {
// plain text
String source = JGitUtils.getStringContent(r, commit.getTree(), blobPath, encodings);
- String table = generateSourceTable(source, false);
+ String table = generateSourceView(source, false);
add(new Label("blobText", table).setEscapeModelStrings(false));
add(new Image("blobImage").setVisible(false));
}
@@ -149,7 +149,7 @@
sb.append("<!-- start nums column -->");
sb.append("<td id=\"nums\">");
sb.append("<pre>");
- String numPattern = "<a id=\"L{0}\" href=\"#L{0}\">{0}</a>\n";
+ 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)));
}
@@ -165,55 +165,19 @@
} else {
sb.append("<pre class=\"plainprint\">");
}
- sb.append(StringUtils.escapeForHtml(source, true));
- sb.append("</pre>");
- sb.append("</div>");
- sb.append("</td>");
- sb.append("<!-- end lines column -->");
+ lines = StringUtils.escapeForHtml(source, true).split("\n");
- sb.append("</tr></tbody></table>");
- sb.append("<!-- end blob table -->");
-
- return sb.toString();
- }
-
- protected String generateSourceTable(String source, boolean prettyPrint) {
- String [] lines = source.split("\n");
-
- // be careful adding line breaks to this method
- // GoogleCode Prettify is sensitive
- 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><table width=\"100%\"><tbody>");
- String numPattern = "<tr><td id=\"L{0}\"><a href=\"#L{0}\">{0}</a></td></tr>";
- for (int i = 0; i < lines.length; i++) {
- sb.append(MessageFormat.format(numPattern, "" + (i + 1)));
- }
- sb.append("<!-- end nums column -->");
- sb.append("</tbody></table></pre>");
- sb.append("</td>");
-
- sb.append("<!-- start lines column -->");
- sb.append("<td id=\"lines\">");
- if (prettyPrint) {
- sb.append("<pre style=\"border: 0px;\" class=\"prettyprint\">");
- } else {
- sb.append("<pre class=\"plainprint\">");
- }
sb.append("<table width=\"100%\"><tbody>");
- String linePattern = "<tr class=\"{0}\"><td>{1}</tr>";
+ String linePattern = "<tr class=\"{0}\"><td><a href=\"#L{2}\">{1}</a>\r</tr>";
for (int i = 0; i < lines.length; i++) {
- String l = StringUtils.escapeForHtml(lines[i], true);
+ String line = lines[i].replace('\r', ' ');
String cssClass = (i % 2 == 0) ? "even" : "odd";
- sb.append(MessageFormat.format(linePattern, cssClass, l));
+ 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 -->");
--
Gitblit v1.9.1