mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix <br/> escaping that doesn't work

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2658 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen@gmail.com 2013-04-17 19:45:05 +00:00
parent fa7a78842a
commit cdd033e582
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
zxingorg/src/com/google/zxing/web/OutputUtils.java
View file

@ -16,8 +16,6 @@
package com.google.zxing.web; package com.google.zxing.web;
import java.util.regex.Pattern;
/** /**
* Utility functions for {@code decoderesult.jspx}. * 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 BYTES_PER_LINE = 16;
private static final int HALF_BYTES_PER_LINE = BYTES_PER_LINE / 2; private static final int HALF_BYTES_PER_LINE = BYTES_PER_LINE / 2;
private static final Pattern NEWLINE = Pattern.compile("\r?\n");
private OutputUtils() { private OutputUtils() {
} }
@ -59,8 +55,4 @@ public final class OutputUtils {
return (char) (value < 10 ? ('0' + value) : ('a' + (value - 10))); return (char) (value < 10 ? ('0' + value) : ('a' + (value - 10)));
} }
public static String escapeNewlineAsBR(CharSequence in) {
return NEWLINE.matcher(in).replaceAll("&lt;br/&gt;");
}
} }

8
zxingorg/web/w/decoderesult.jspx
View file

@ -49,7 +49,7 @@
if (text == null) { if (text == null) {
text = "(Not applicable)"; text = "(Not applicable)";
} else { } else {
text = OutputUtils.escapeNewlineAsBR(StringEscapeUtils.escapeXml(text)); text = StringEscapeUtils.escapeXml(text);
} }
byte[] rawBytes = result.getRawBytes(); byte[] rawBytes = result.getRawBytes();
@ -64,13 +64,13 @@
if (displayResult == null) { if (displayResult == null) {
displayResult = "(Not applicable)"; displayResult = "(Not applicable)";
} else { } else {
displayResult = OutputUtils.escapeNewlineAsBR(StringEscapeUtils.escapeXml(displayResult)); displayResult = StringEscapeUtils.escapeXml(displayResult);
} }
</jsp:scriptlet> </jsp:scriptlet>
<table style="width:100%"> <table style="width:100%">
<tr> <tr>
<td>Raw text</td> <td>Raw text</td>
<td><jsp:expression>text</jsp:expression></td> <td><pre style="margin:0"><jsp:expression>text</jsp:expression></pre></td>
</tr> </tr>
<tr> <tr>
<td>Raw bytes</td> <td>Raw bytes</td>
@ -86,7 +86,7 @@
</tr> </tr>
<tr> <tr>
<td>Parsed Result</td> <td>Parsed Result</td>
<td><jsp:expression>displayResult</jsp:expression></td> <td><pre style="margin:0"><jsp:expression>displayResult</jsp:expression></pre></td>
</tr> </tr>
</table> </table>
<hr/> <hr/>