diff --git a/zxingorg/src/com/google/zxing/web/OutputUtils.java b/zxingorg/src/com/google/zxing/web/OutputUtils.java index 1d4b6c7d8..ced5948e7 100644 --- a/zxingorg/src/com/google/zxing/web/OutputUtils.java +++ b/zxingorg/src/com/google/zxing/web/OutputUtils.java @@ -16,8 +16,6 @@ package com.google.zxing.web; -import java.util.regex.Pattern; - /** * Utility functions for {@code decoderesult.jspx}. * @@ -27,8 +25,6 @@ public final class OutputUtils { private static final int BYTES_PER_LINE = 16; private static final int HALF_BYTES_PER_LINE = BYTES_PER_LINE / 2; - - private static final Pattern NEWLINE = Pattern.compile("\r?\n"); private OutputUtils() { } @@ -59,8 +55,4 @@ public final class OutputUtils { return (char) (value < 10 ? ('0' + value) : ('a' + (value - 10))); } - public static String escapeNewlineAsBR(CharSequence in) { - return NEWLINE.matcher(in).replaceAll("<br/>"); - } - } diff --git a/zxingorg/web/w/decoderesult.jspx b/zxingorg/web/w/decoderesult.jspx index 28d030a8d..95c69af0a 100644 --- a/zxingorg/web/w/decoderesult.jspx +++ b/zxingorg/web/w/decoderesult.jspx @@ -49,7 +49,7 @@ if (text == null) { text = "(Not applicable)"; } else { - text = OutputUtils.escapeNewlineAsBR(StringEscapeUtils.escapeXml(text)); + text = StringEscapeUtils.escapeXml(text); } byte[] rawBytes = result.getRawBytes(); @@ -64,13 +64,13 @@ if (displayResult == null) { displayResult = "(Not applicable)"; } else { - displayResult = OutputUtils.escapeNewlineAsBR(StringEscapeUtils.escapeXml(displayResult)); + displayResult = StringEscapeUtils.escapeXml(displayResult); } - + @@ -86,7 +86,7 @@ - +
Raw texttext
text
Raw bytes
Parsed ResultdisplayResult
displayResult