mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-20 05:27:32 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove lang3 dependency as Guava can take over its one usage

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2991 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2013-12-11 20:41:18 +00:00
parent 4550d1d762
commit 4aa5348526
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
zxingorg/pom.xml
View file

@ -37,11 +37,6 @@
<artifactId>javaee-web-api</artifactId> <artifactId>javaee-web-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
</dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>

9
zxingorg/src/web/w/decoderesult.jspx
View file

@ -16,12 +16,11 @@
--> -->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1"> <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
<jsp:directive.page import=" <jsp:directive.page import="
java.util.List,
com.google.zxing.Result, com.google.zxing.Result,
com.google.zxing.client.result.ResultParser, com.google.zxing.client.result.ResultParser,
com.google.zxing.client.result.ParsedResult, com.google.zxing.client.result.ParsedResult,
com.google.zxing.web.OutputUtils, com.google.zxing.web.OutputUtils,
org.apache.commons.lang3.StringEscapeUtils"/> com.google.common.xml.XmlEscapers"/>
<jsp:directive.page contentType="text/html" session="false"/> <jsp:directive.page contentType="text/html" session="false"/>
<jsp:scriptlet> <jsp:scriptlet>
response.setHeader("Cache-Control", "no-cache"); response.setHeader("Cache-Control", "no-cache");
@ -42,14 +41,14 @@
<div id="main"> <div id="main">
<div id="header"><h1><img src="zxing-icon.png" height="32" width="32" alt=""/> Decode Succeeded</h1></div> <div id="header"><h1><img src="zxing-icon.png" height="32" width="32" alt=""/> Decode Succeeded</h1></div>
<jsp:scriptlet> <jsp:scriptlet>
for (Result result : (List&lt;Result&gt;) request.getAttribute("results")) { for (Result result : (Iterable&lt;Result&gt;) request.getAttribute("results")) {
ParsedResult parsedResult = ResultParser.parseResult(result); ParsedResult parsedResult = ResultParser.parseResult(result);
String text = result.getText(); String text = result.getText();
if (text == null) { if (text == null) {
text = "(Not applicable)"; text = "(Not applicable)";
} else { } else {
text = StringEscapeUtils.escapeXml(text); text = XmlEscapers.xmlContentEscaper().escape(text);
} }
byte[] rawBytes = result.getRawBytes(); byte[] rawBytes = result.getRawBytes();
@ -64,7 +63,7 @@
if (displayResult == null) { if (displayResult == null) {
displayResult = "(Not applicable)"; displayResult = "(Not applicable)";
} else { } else {
displayResult = StringEscapeUtils.escapeXml(displayResult); displayResult = XmlEscapers.xmlContentEscaper().escape(displayResult);
} }
</jsp:scriptlet> </jsp:scriptlet>
<table style="width:100%"> <table style="width:100%">