DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use IOUtils instead of FileUtils to allow reading of files from jars.

This commit is contained in:
Michael Herzberg 2015-06-24 02:27:56 +02:00
parent 2e592889c8
commit 842ce920e7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/RangePosition.java
View File

@ -10,13 +10,12 @@
*******************************************************************************/ *******************************************************************************/
package com.ibm.wala.cast.js.translator; package com.ibm.wala.cast.js.translator;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.Reader; import java.io.Reader;
import java.net.URL; import java.net.URL;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils;
import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position; import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
import com.ibm.wala.cast.tree.impl.AbstractSourcePosition; import com.ibm.wala.cast.tree.impl.AbstractSourcePosition;
@ -60,7 +59,7 @@ public class RangePosition extends AbstractSourcePosition implements Position {
if (lastLine == -1) { if (lastLine == -1) {
String content; String content;
try { try {
content = FileUtils.readFileToString(new File(url.getFile())).substring(startOffset, endOffset); content = IOUtils.toString(getReader()).substring(startOffset, endOffset);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
return -1; return -1;
@ -98,7 +97,7 @@ public class RangePosition extends AbstractSourcePosition implements Position {
} }
String content; String content;
try { try {
content = FileUtils.readFileToString(new File(url.getFile())); content = IOUtils.toString(getReader());
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
return -1; return -1;