From e52d872e3ee13d8b517a114fbb557993430f0fb5 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Sat, 18 Mar 2017 00:41:04 -0500 Subject: [PATCH] Fix 19 Eclipse warnings about unnecessary casts --- .../wala/cast/java/translator/jdt/JDTIdentityMapper.java | 2 +- .../cast/java/translator/jdt/JDTJava2CAstTranslator.java | 2 +- .../ibm/wala/cast/java/loader/JavaSourceLoaderImpl.java | 8 ++++---- .../ibm/wala/cast/js/ipa/callgraph/JSCallGraphUtil.java | 2 +- com.ibm.wala.core.testdata/src/slice/Slice6.java | 2 +- .../src/com/ibm/wala/examples/drivers/PDFCallGraph.java | 2 +- .../ibm/wala/ipa/summaries/SummarizedMethodWithNames.java | 2 +- .../src/com/ibm/wala/dalvik/classLoader/DexCFG.java | 4 ++-- .../src/com/ibm/wala/dalvik/classLoader/DexIMethod.java | 4 ++-- .../ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java | 2 +- .../src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java | 6 +++--- .../source/org/scandroid/util/CGAnalysisContext.java | 3 +-- .../source/org/scandroid/util/EntryPoints.java | 2 +- .../src/com/ibm/wala/shrikeCT/ClassReader.java | 2 +- 14 files changed, 21 insertions(+), 22 deletions(-) diff --git a/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTIdentityMapper.java b/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTIdentityMapper.java index 17c867283..36913192a 100644 --- a/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTIdentityMapper.java +++ b/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTIdentityMapper.java @@ -88,7 +88,7 @@ public class JDTIdentityMapper { * This method canonicalizes the TypeReferences */ public TypeReference getTypeRef(ITypeBinding type) { - type = JDT2CAstUtils.getErasedType((ITypeBinding) type, fAst); // GENERICS: erasure... + type = JDT2CAstUtils.getErasedType(type, fAst); // GENERICS: erasure... if (!fTypeMap.containsKey(type.getKey())) { TypeName typeName = TypeName.string2TypeName(typeToTypeID(type)); diff --git a/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java b/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java index 6028b132c..1370a2186 100644 --- a/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java +++ b/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java @@ -548,7 +548,7 @@ public abstract class JDTJava2CAstTranslator { // TODO 1.6: enums of course... AbstractTypeDeclaration decl = n.getDeclaration(); assert decl instanceof TypeDeclaration : "Local enum declaration not yet supported"; - CAstEntity classEntity = visitTypeDecl((TypeDeclaration) decl, context); + CAstEntity classEntity = visitTypeDecl(decl, context); // these statements doin't actually do anything, just define a type final CAstNode lcdNode = makeNode(context, fFactory, n, CAstNode.EMPTY); diff --git a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/JavaSourceLoaderImpl.java b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/JavaSourceLoaderImpl.java index 95eb9036b..f8640b6ae 100644 --- a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/JavaSourceLoaderImpl.java +++ b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/JavaSourceLoaderImpl.java @@ -288,15 +288,15 @@ public abstract class JavaSourceLoaderImpl extends ClassLoaderImpl { if (isStatic()) { types = new TypeReference[argCount]; for (int i = 0; i < argCount; i++) { - types[i] = TypeReference.findOrCreate(JavaSourceLoaderImpl.this.getReference(), ((CAstType) type.getArgumentTypes() - .get(i)).getName()); + types[i] = TypeReference.findOrCreate(JavaSourceLoaderImpl.this.getReference(), type.getArgumentTypes() + .get(i).getName()); } } else { types = new TypeReference[argCount + 1]; types[0] = cls.getReference(); for (int i = 0; i < argCount; i++) { - types[i + 1] = TypeReference.findOrCreate(JavaSourceLoaderImpl.this.getReference(), ((CAstType) type.getArgumentTypes() - .get(i)).getName()); + types[i + 1] = TypeReference.findOrCreate(JavaSourceLoaderImpl.this.getReference(), type.getArgumentTypes() + .get(i).getName()); } } diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraphUtil.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraphUtil.java index bf303c658..a950fb26d 100755 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraphUtil.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraphUtil.java @@ -240,7 +240,7 @@ public class JSCallGraphUtil extends com.ibm.wala.cast.ipa.callgraph.CAstCallGra return (String)v; } else if (v instanceof Double) { String result = v.toString(); - if (((double) Math.round((Double)v)) == ((Double)v).doubleValue()) { + if ((Math.round((Double)v)) == ((Double)v).doubleValue()) { result = Long.toString(Math.round((Double)v)); } return result; diff --git a/com.ibm.wala.core.testdata/src/slice/Slice6.java b/com.ibm.wala.core.testdata/src/slice/Slice6.java index da021d6a5..94f73ee38 100644 --- a/com.ibm.wala.core.testdata/src/slice/Slice6.java +++ b/com.ibm.wala.core.testdata/src/slice/Slice6.java @@ -20,7 +20,7 @@ public class Slice6 { messages = new Vector(); messages.add(5); - int message = (Integer) messages.elementAt(0); + int message = messages.elementAt(0); sendMessage(message); } diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java index 49401477d..e8a41f89d 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java @@ -56,7 +56,7 @@ public class PDFCallGraph { Collection result = HashSetFactory.make(); for (int i = 0; i < directories.length; i++) { for (Iterator it = FileUtil.listFiles(directories[i], ".*\\.jar", true).iterator(); it.hasNext();) { - File f = (File) it.next(); + File f = it.next(); result.add(f.getAbsolutePath()); } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethodWithNames.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethodWithNames.java index a637d4b3a..95bcf64f8 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethodWithNames.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethodWithNames.java @@ -88,7 +88,7 @@ public class SummarizedMethodWithNames extends SummarizedMethod { throws NullPointerException { super(ref, summary.getMethodSummary(), declaringClass); this.summary = summary.getMethodSummary(); - this.localNames = ((VolatileMethodSummary)summary).getLocalNames(); + this.localNames = summary.getLocalNames(); if (DEBUG && this.localNames.isEmpty()) { System.err.println("Local names are empty for " + ref); } diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexCFG.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexCFG.java index eecd7ae96..84774deea 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexCFG.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexCFG.java @@ -101,7 +101,7 @@ public class DexCFG extends AbstractCFG implemen } public Instruction[] getInstructions() { - return (Instruction[])dexMethod.getDexInstructions(); + return dexMethod.getDexInstructions(); } @@ -417,7 +417,7 @@ public class DexCFG extends AbstractCFG implemen if (pei == null) { throw new IllegalArgumentException("pei is null"); } - switch (((Instruction) pei).getOpcode()) { + switch (pei.getOpcode()) { //TODO: Make sure all the important cases and exceptions are covered. case AGET: case AGET_WIDE: diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIMethod.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIMethod.java index 3b6010d10..9bbca6ea3 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIMethod.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIMethod.java @@ -674,7 +674,7 @@ public class DexIMethod implements IBytecodeMethod { for (int i = 0; i < instructions().size(); i++) { - handlers[i] = (ExceptionHandler[])temp_array.get(i).toArray(new ExceptionHandler[temp_array.get(i).size()]); + handlers[i] = temp_array.get(i).toArray(new ExceptionHandler[temp_array.get(i).size()]); /* System.out.println("i: " + i); @@ -3148,7 +3148,7 @@ public class DexIMethod implements IBytecodeMethod { } public Instruction[] getDexInstructions() { - return (Instruction[]) instructions().toArray(new Instruction[instructions().size()]); + return instructions().toArray(new Instruction[instructions().size()]); } diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java index 1b411b4f0..38d5dc49b 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java @@ -138,7 +138,7 @@ public class WDexClassLoaderImpl extends ClassLoaderImpl { private Set getDexFiles(Module M) { HashSet result = HashSetFactory.make(); for (Iterator it = M.getEntries(); it.hasNext();) { - ModuleEntry entry = (ModuleEntry) it.next(); + ModuleEntry entry = it.next(); if (entry instanceof DexModuleEntry) { result.add(entry); } diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java index 12ef0b0ad..f6539a3d8 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java @@ -486,7 +486,7 @@ public class DexSSABuilder extends AbstractIntRegisterMachine { int i = 0; while (iae.hasNext()) { - ArrayElement ae = (ArrayElement)iae.next(); + ArrayElement ae = iae.next(); int ElementWidth = ae.elementWidth; int index = symbolTable.getConstant(i); @@ -508,9 +508,9 @@ public class DexSSABuilder extends AbstractIntRegisterMachine { if (t.equals(TypeReference.Char)) value = symbolTable.getConstant(Character.toString(byte_buffer.getChar())); else if (t.equals(TypeReference.Byte)) - value = symbolTable.getConstant((int)byte_buffer.get()); + value = symbolTable.getConstant(byte_buffer.get()); else if (t.equals(TypeReference.Short)) - value = symbolTable.getConstant((int)byte_buffer.getShort()); + value = symbolTable.getConstant(byte_buffer.getShort()); else if (t.equals(TypeReference.Int)) value = symbolTable.getConstant(byte_buffer.getInt()); else if (t.equals(TypeReference.Long)) diff --git a/com.ibm.wala.scandroid/source/org/scandroid/util/CGAnalysisContext.java b/com.ibm.wala.scandroid/source/org/scandroid/util/CGAnalysisContext.java index 1ea274399..ffcd062be 100644 --- a/com.ibm.wala.scandroid/source/org/scandroid/util/CGAnalysisContext.java +++ b/com.ibm.wala.scandroid/source/org/scandroid/util/CGAnalysisContext.java @@ -87,7 +87,6 @@ import com.ibm.wala.ipa.callgraph.propagation.PointerKey; import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder; import com.ibm.wala.ipa.cfg.BasicBlockInContext; import com.ibm.wala.ipa.cha.ClassHierarchy; -import com.ibm.wala.ssa.IRFactory; import com.ibm.wala.ssa.ISSABasicBlock; import com.ibm.wala.ssa.SSACFG; import com.ibm.wala.ssa.SSACFG.BasicBlock; @@ -145,7 +144,7 @@ public class CGAnalysisContext { } analysisOptions.setReflectionOptions(options.getReflectionOptions()); - AnalysisCache cache = new AnalysisCacheImpl((IRFactory) new DexIRFactory()); + AnalysisCache cache = new AnalysisCacheImpl(new DexIRFactory()); SSAPropagationCallGraphBuilder cgb; diff --git a/com.ibm.wala.scandroid/source/org/scandroid/util/EntryPoints.java b/com.ibm.wala.scandroid/source/org/scandroid/util/EntryPoints.java index 43a3cf3d8..0c6c639ec 100644 --- a/com.ibm.wala.scandroid/source/org/scandroid/util/EntryPoints.java +++ b/com.ibm.wala.scandroid/source/org/scandroid/util/EntryPoints.java @@ -288,7 +288,7 @@ public class EntryPoints { private static String getTagValue(String sTag, Element eElement) { NodeList nlList = eElement.getElementsByTagName(sTag).item(0).getChildNodes(); - Node nValue = (Node) nlList.item(0); + Node nValue = nlList.item(0); return nValue.getNodeValue(); } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassReader.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassReader.java index a0c9d3c68..b7b413354 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassReader.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassReader.java @@ -330,7 +330,7 @@ public final class ClassReader implements ClassConstants { * @return the unsigned 8-bit value at offset i in the class data */ public int getUnsignedByte(int i) { - return ((int) bytes[i]) & 0xff; + return bytes[i] & 0xff; } /**