From 7cd88ddbd93b115aeda76b87b1c99f9afa4aaaef Mon Sep 17 00:00:00 2001
From: Lukasz Jader <ljaderdev@gmail.com>
Date: Sat, 14 Jul 2012 08:01:51 -0400
Subject: [PATCH] Fix some typos in polish translation
---
src/com/gitblit/utils/GitBlitDiffFormatter.java | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/src/com/gitblit/utils/GitBlitDiffFormatter.java b/src/com/gitblit/utils/GitBlitDiffFormatter.java
index 54cb6c2..e9fbf52 100644
--- a/src/com/gitblit/utils/GitBlitDiffFormatter.java
+++ b/src/com/gitblit/utils/GitBlitDiffFormatter.java
@@ -1,16 +1,40 @@
+/*
+ * 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.utils;
+
+import static org.eclipse.jgit.lib.Constants.encode;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import org.eclipse.jgit.diff.RawText;
+import org.eclipse.jgit.util.RawParseUtils;
+/**
+ * Generates an html snippet of a diff in Gitblit's style.
+ *
+ * @author James Moger
+ *
+ */
public class GitBlitDiffFormatter extends GitWebDiffFormatter {
private final OutputStream os;
- private int left = 0, right = 0;
+ private int left, right;
public GitBlitDiffFormatter(OutputStream os) {
super(os);
@@ -31,7 +55,8 @@
* @throws IOException
*/
@Override
- protected void writeHunkHeader(int aStartLine, int aEndLine, int bStartLine, int bEndLine) throws IOException {
+ protected void writeHunkHeader(int aStartLine, int aEndLine, int bStartLine, int bEndLine)
+ throws IOException {
os.write("<tr><th>..</th><th>..</th><td class='hunk_header'>".getBytes());
os.write('@');
os.write('@');
@@ -46,7 +71,8 @@
}
@Override
- protected void writeLine(final char prefix, final RawText text, final int cur) throws IOException {
+ protected void writeLine(final char prefix, final RawText text, final int cur)
+ throws IOException {
os.write("<tr>".getBytes());
switch (prefix) {
case '+':
@@ -63,11 +89,9 @@
break;
}
os.write(prefix);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- text.writeLine(bos, cur);
- String line = bos.toString();
+ String line = text.getString(cur);
line = StringUtils.escapeForHtml(line, false);
- os.write(line.getBytes());
+ os.write(encode(line));
switch (prefix) {
case '+':
case '-':
@@ -87,9 +111,10 @@
*/
@Override
public String getHtml() {
- String html = os.toString();
+ ByteArrayOutputStream bos = (ByteArrayOutputStream) os;
+ String html = RawParseUtils.decode(bos.toByteArray());
String[] lines = html.split("\n");
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder();
boolean inFile = false;
String oldnull = "a/dev/null";
for (String line : lines) {
@@ -97,11 +122,16 @@
// skip index lines
} else if (line.startsWith("new file")) {
// skip new file lines
+ } else if (line.startsWith("\\ No newline")) {
+ // skip no new line
+ } else if (line.startsWith("---") || line.startsWith("+++")) {
+ // skip --- +++ lines
} else if (line.startsWith("diff")) {
if (line.indexOf(oldnull) > -1) {
// a is null, use b
line = line.substring(("diff --git " + oldnull).length()).trim();
- line = line.substring(2); // trim b/
+ // trim b/
+ line = line.substring(2);
} else {
// use a
line = line.substring("diff --git a/".length()).trim();
@@ -112,13 +142,11 @@
inFile = false;
}
sb.append("<div class='header'>").append(line).append("</div>");
- sb.append("<div class=\"diff\">");
+ sb.append("<div class=\"diff\">");
sb.append("<table><tbody>");
inFile = true;
- } else if (line.startsWith("---") || line.startsWith("+++")) {
- // skip --- +++ lines
} else {
- sb.append(line).append('\n');
+ sb.append(line);
}
}
sb.append("</table></div>");
--
Gitblit v1.9.1