make getStream accessible

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@4104 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
dolby-oss 2011-04-05 10:46:53 +00:00
parent beacb83132
commit b7f3f8b7a8
2 changed files with 11 additions and 10 deletions

View File

@ -17,7 +17,6 @@ import java.io.InputStream;
import java.io.PrintStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.util.Collections;
import java.util.Map;
import java.util.Map.Entry;
@ -214,7 +213,7 @@ public class DomLessSourceExtractor extends JSSourceExtractor {
public Set<MappedSourceModule> extractSources(URL entrypointUrl, IHtmlParser htmlParser, IUrlResolver urlResolver)
throws IOException {
InputStream inputStreamReader = getStream(entrypointUrl);
InputStream inputStreamReader = WebUtil.getStream(entrypointUrl);
IGeneratorCallback htmlCallback = createHtmlCallback(entrypointUrl, urlResolver);
htmlParser.parse(inputStreamReader, htmlCallback, entrypointUrl.getFile());
@ -249,14 +248,6 @@ public class DomLessSourceExtractor extends JSSourceExtractor {
}
private InputStream getStream(URL url) throws IOException {
URLConnection conn = url.openConnection();
conn.setDefaultUseCaches(false);
conn.setUseCaches(false);
return conn.getInputStream();
}
public static void main(String[] args) throws IOException {
// DomLessSourceExtractor domLessScopeGenerator = new DomLessSourceExtractor();
JSSourceExtractor domLessScopeGenerator = new DefaultSourceExtractor();

View File

@ -11,8 +11,10 @@
package com.ibm.wala.cast.js.html;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.util.Set;
import com.ibm.wala.cast.js.html.jericho.JerichoHtmlParser;
@ -56,6 +58,14 @@ public class WebUtil {
public static void main(String[] args) throws MalformedURLException {
System.err.println(extractScriptFromHTML(new URL(args[0])));
}
public static InputStream getStream(URL url) throws IOException {
URLConnection conn = url.openConnection();
conn.setDefaultUseCaches(false);
conn.setUseCaches(false);
return conn.getInputStream();
}
}