From cbe6840efecf87e53a687cdce6fbdf84c6ab8a46 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 19 Sep 2013 08:40:59 -0400
Subject: [PATCH] Documentation
---
src/main/java/com/gitblit/utils/DiffUtils.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/utils/DiffUtils.java b/src/main/java/com/gitblit/utils/DiffUtils.java
index 04b5b0b..3844d10 100644
--- a/src/main/java/com/gitblit/utils/DiffUtils.java
+++ b/src/main/java/com/gitblit/utils/DiffUtils.java
@@ -16,6 +16,7 @@
package com.gitblit.utils;
import java.io.ByteArrayOutputStream;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -52,7 +53,7 @@
* Enumeration for the diff output types.
*/
public static enum DiffOutputType {
- PLAIN, GITWEB, GITBLIT;
+ PLAIN, HTML;
public static DiffOutputType forName(String name) {
for (DiffOutputType type : values()) {
@@ -129,10 +130,7 @@
RawTextComparator cmp = RawTextComparator.DEFAULT;
DiffFormatter df;
switch (outputType) {
- case GITWEB:
- df = new GitWebDiffFormatter(os);
- break;
- case GITBLIT:
+ case HTML:
df = new GitBlitDiffFormatter(os);
break;
case PLAIN:
@@ -171,9 +169,9 @@
} else {
df.format(diffEntries);
}
- if (df instanceof GitWebDiffFormatter) {
+ if (df instanceof GitBlitDiffFormatter) {
// workaround for complex private methods in DiffFormatter
- diff = ((GitWebDiffFormatter) df).getHtml();
+ diff = ((GitBlitDiffFormatter) df).getHtml();
} else {
diff = os.toString();
}
@@ -274,7 +272,7 @@
lines.add(line);
}
} catch (Throwable t) {
- LOGGER.error("failed to generate blame!", t);
+ LOGGER.error(MessageFormat.format("failed to generate blame for {0} {1}!", blobPath, objectId), t);
}
return lines;
}
--
Gitblit v1.9.1