diff --git a/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/util/Util.java b/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/util/Util.java index 91636caca..cf16e8a69 100644 --- a/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/util/Util.java +++ b/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/util/Util.java @@ -5,7 +5,6 @@ import static com.ibm.wala.properties.WalaProperties.ANDROID_RT_JAVA_JAR; import java.io.File; import java.io.FileFilter; -import java.io.FilenameFilter; import java.io.IOException; import java.net.URI; import java.util.ArrayList; @@ -81,7 +80,7 @@ public class Util { libs.add(new File(System.getenv("ANDROID_BOOT_OAT")).toURI()); } else if (walaProperties != null && walaProperties.getProperty(ANDROID_RT_DEX_DIR) != null) { - for(File lib : new File(walaProperties.getProperty(ANDROID_RT_DEX_DIR)).listFiles((FilenameFilter) (dir, name) -> name.startsWith("boot") && name.endsWith("oat"))) { + for(File lib : new File(walaProperties.getProperty(ANDROID_RT_DEX_DIR)).listFiles((dir, name) -> name.startsWith("boot") && name.endsWith("oat"))) { libs.add(lib.toURI()); } } else { diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/tools/OfflineInstrumenterBase.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/tools/OfflineInstrumenterBase.java index 3f1cb65c8..beb02fc8a 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/tools/OfflineInstrumenterBase.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/tools/OfflineInstrumenterBase.java @@ -13,7 +13,6 @@ package com.ibm.wala.shrikeBT.tools; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; -import java.io.FileFilter; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; @@ -263,7 +262,7 @@ public abstract class OfflineInstrumenterBase { if (d == null) { throw new IllegalArgumentException("d is null"); } - File[] fs = d.listFiles((FileFilter) f -> f.isDirectory() || f.getName().endsWith(".class")); + File[] fs = d.listFiles(f -> f.isDirectory() || f.getName().endsWith(".class")); if (fs == null) { throw new IllegalArgumentException("bad directory " + d.getAbsolutePath()); } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/io/FileUtil.java b/com.ibm.wala.util/src/com/ibm/wala/util/io/FileUtil.java index 3cee37f2e..55321893f 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/io/FileUtil.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/io/FileUtil.java @@ -11,7 +11,6 @@ package com.ibm.wala.util.io; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileFilter; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; @@ -192,7 +191,7 @@ public class FileUtil { public static void recurseFiles(Consumer action, final Predicate filter, File top) { if (top.isDirectory()) { - for(File f : top.listFiles((FileFilter) file -> filter.test(file) || file.isDirectory())) { + for(File f : top.listFiles(file -> filter.test(file) || file.isDirectory())) { recurseFiles(action, filter, f); } } else {