Author: etnu
Date: Tue May 20 00:51:05 2008
New Revision: 658144
URL: http://svn.apache.org/viewvc?rev=658144&view=rev
Log:
Added encoding param for URLEncoder. Since we almost always want UTF-8 for
output, this boilerplate is silly. We should add a utility for this.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java?rev=658144&r1=658143&r2=658144&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
Tue May 20 00:51:05 2008
@@ -21,6 +21,7 @@
import com.google.caja.lexer.HtmlTokenType;
import com.google.caja.lexer.Token;
+import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLEncoder;
@@ -108,19 +109,23 @@
return;
}
builder.append("<script src=\"").append(concatBase);
- for (int i = 0; i < concat.size(); i++) {
- URI srcUrl = concat.get(i);
- if (!srcUrl.isAbsolute()) {
- srcUrl = relativeUrlBase.resolve(srcUrl);
- }
- builder.append(i + 1).append("=")
- .append(URLEncoder.encode(srcUrl.toString()));
- if (i < concat.size() - 1) {
- builder.append("&");
+ try {
+ for (int i = 0; i < concat.size(); i++) {
+ URI srcUrl = concat.get(i);
+ if (!srcUrl.isAbsolute()) {
+ srcUrl = relativeUrlBase.resolve(srcUrl);
+ }
+ builder.append(i + 1).append("=")
+ .append(URLEncoder.encode(srcUrl.toString(), "UTF-8"));
+ if (i < concat.size() - 1) {
+ builder.append("&");
+ }
}
+ builder.append("\" type=\"text/javascript\"></script>");
+ concat.clear();
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
}
- builder.append("\" type=\"text/javascript\"></script>");
- concat.clear();
}
private String stripQuotes(String s) {
