From 6766f1e2610da8b37d2225a25e597d2525df640f Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Fri, 17 Mar 2017 22:38:15 -0500 Subject: [PATCH 1/9] Fix 42 Eclipse warnings about unused imports --- .../ibm/wala/cast/java/client/JavaSourceAnalysisEngine.java | 1 - .../ibm/wala/cast/java/client/impl/ZeroCFABuilderFactory.java | 1 - .../ibm/wala/cast/java/ipa/callgraph/AstJavaCFABuilder.java | 1 - .../ipa/callgraph/AstJavaSSAPropagationCallGraphBuilder.java | 1 - .../com/ibm/wala/cast/js/test/TestJavaScriptSlicer.java | 1 - .../ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java | 2 -- .../js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java | 1 - .../js/callgraph/fieldbased/OptimisticCallgraphBuilder.java | 1 - .../js/callgraph/fieldbased/PessimisticCallGraphBuilder.java | 1 - .../com/ibm/wala/cast/js/client/JavaScriptAnalysisEngine.java | 1 - .../ibm/wala/cast/js/client/impl/ZeroCFABuilderFactory.java | 1 - .../com/ibm/wala/cast/js/ipa/callgraph/JSCFABuilder.java | 1 - .../js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java | 1 - .../callgraph/JavaScriptFunctionApplyContextInterpreter.java | 1 - .../source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java | 1 - .../callgraph/AstContextInsensitiveSSAContextInterpreter.java | 1 - .../cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java | 2 -- .../com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java | 1 - .../tests/cfg/exc/intra/NullPointerExceptionIntraTest.java | 4 ---- .../wala/examples/analysis/SimpleThreadEscapeAnalysis.java | 1 - .../analysis/reflection/AbstractReflectionInterpreter.java | 1 - .../wala/analysis/reflection/FactoryBypassInterpreter.java | 1 - .../analysis/reflection/ReflectionContextInterpreter.java | 1 - .../src/com/ibm/wala/client/AbstractAnalysisEngine.java | 1 - .../com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java | 1 - .../callgraph/propagation/PropagationCallGraphBuilder.java | 1 - .../callgraph/propagation/SSAPropagationCallGraphBuilder.java | 2 -- .../propagation/cfa/ContextInsensitiveSSAInterpreter.java | 1 - .../ipa/callgraph/propagation/cfa/DefaultSSAInterpreter.java | 1 - .../ipa/callgraph/propagation/rta/AbstractRTABuilder.java | 1 - .../wala/ipa/callgraph/propagation/rta/BasicRTABuilder.java | 1 - .../propagation/rta/ContextInsensitiveRTAInterpreter.java | 1 - .../ipa/callgraph/propagation/rta/DefaultRTAInterpreter.java | 1 - .../ipa/callgraph/androidModel/stubs/SystemServiceModel.java | 1 - .../wala/cast/java/client/JDTJavaSourceAnalysisEngine.java | 1 - .../wala/cast/js/client/EclipseJavaScriptAnalysisEngine.java | 1 - .../com/ibm/wala/ide/client/EclipseProjectAnalysisEngine.java | 1 - 37 files changed, 43 deletions(-) diff --git a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/JavaSourceAnalysisEngine.java b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/JavaSourceAnalysisEngine.java index c050081c1..226c53b76 100644 --- a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/JavaSourceAnalysisEngine.java +++ b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/JavaSourceAnalysisEngine.java @@ -22,7 +22,6 @@ import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope; import com.ibm.wala.classLoader.ClassLoaderFactory; import com.ibm.wala.classLoader.Module; import com.ibm.wala.client.AbstractAnalysisEngine; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.AnalysisScope; diff --git a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/impl/ZeroCFABuilderFactory.java b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/impl/ZeroCFABuilderFactory.java index ab9fa03d1..a0213c0b7 100644 --- a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/impl/ZeroCFABuilderFactory.java +++ b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/impl/ZeroCFABuilderFactory.java @@ -11,7 +11,6 @@ package com.ibm.wala.cast.java.client.impl; import com.ibm.wala.cast.java.ipa.callgraph.AstJavaZeroXCFABuilder; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.AnalysisScope; import com.ibm.wala.ipa.callgraph.CallGraphBuilder; diff --git a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaCFABuilder.java b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaCFABuilder.java index 53a952947..09019546c 100644 --- a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaCFABuilder.java +++ b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaCFABuilder.java @@ -10,7 +10,6 @@ *****************************************************************************/ package com.ibm.wala.cast.java.ipa.callgraph; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.IAnalysisCacheView; import com.ibm.wala.ipa.callgraph.propagation.cfa.DefaultPointerKeyFactory; diff --git a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaSSAPropagationCallGraphBuilder.java b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaSSAPropagationCallGraphBuilder.java index 3f2b82893..725db5264 100644 --- a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaSSAPropagationCallGraphBuilder.java +++ b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaSSAPropagationCallGraphBuilder.java @@ -22,7 +22,6 @@ import com.ibm.wala.cast.java.ssa.EnclosingObjectReference; import com.ibm.wala.classLoader.IClass; import com.ibm.wala.fixpoint.IntSetVariable; import com.ibm.wala.fixpoint.UnaryOperator; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.IAnalysisCacheView; diff --git a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestJavaScriptSlicer.java b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestJavaScriptSlicer.java index c2b30d2a2..e2658490b 100644 --- a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestJavaScriptSlicer.java +++ b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestJavaScriptSlicer.java @@ -23,7 +23,6 @@ import com.ibm.wala.classLoader.CallSiteReference; import com.ibm.wala.core.tests.slicer.SlicerTest; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.CallGraph; -import com.ibm.wala.ipa.callgraph.propagation.InstanceKey; import com.ibm.wala.ipa.slicer.NormalStatement; import com.ibm.wala.ipa.slicer.SDG; import com.ibm.wala.ipa.slicer.Slicer; diff --git a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java index b10133a85..d9d7431f0 100644 --- a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java +++ b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java @@ -18,9 +18,7 @@ import org.junit.Test; import com.ibm.wala.cast.ipa.callgraph.CAstCallGraphUtil; import com.ibm.wala.cast.js.html.IHtmlParser; -import com.ibm.wala.cast.js.html.IHtmlParserFactory; import com.ibm.wala.cast.js.html.JSSourceExtractor; -import com.ibm.wala.cast.js.html.WebUtil; import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder; import com.ibm.wala.ipa.callgraph.CallGraph; import com.ibm.wala.util.CancelException; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java index dc4c0fb1d..9bcc40c79 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java @@ -34,7 +34,6 @@ import com.ibm.wala.cast.types.AstMethodReference; import com.ibm.wala.classLoader.CallSiteReference; import com.ibm.wala.classLoader.IClass; import com.ibm.wala.classLoader.IMethod; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.Context; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/OptimisticCallgraphBuilder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/OptimisticCallgraphBuilder.java index 75a77af52..f7781d4db 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/OptimisticCallgraphBuilder.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/OptimisticCallgraphBuilder.java @@ -20,7 +20,6 @@ import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.VertexFactor import com.ibm.wala.cast.js.ipa.callgraph.JSAnalysisOptions; import com.ibm.wala.cast.js.ssa.JavaScriptInvoke; import com.ibm.wala.cast.js.types.JavaScriptMethods; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.IAnalysisCacheView; import com.ibm.wala.ipa.cha.IClassHierarchy; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/PessimisticCallGraphBuilder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/PessimisticCallGraphBuilder.java index ef81ea1ab..1e0c915a3 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/PessimisticCallGraphBuilder.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/PessimisticCallGraphBuilder.java @@ -21,7 +21,6 @@ import com.ibm.wala.cast.loader.AstMethod; import com.ibm.wala.cast.types.AstMethodReference; import com.ibm.wala.classLoader.IClass; import com.ibm.wala.classLoader.IMethod; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.IAnalysisCacheView; import com.ibm.wala.ipa.cha.IClassHierarchy; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/JavaScriptAnalysisEngine.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/JavaScriptAnalysisEngine.java index 17a203e16..3095a5731 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/JavaScriptAnalysisEngine.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/JavaScriptAnalysisEngine.java @@ -33,7 +33,6 @@ import com.ibm.wala.cast.js.types.JavaScriptTypes; import com.ibm.wala.classLoader.Module; import com.ibm.wala.classLoader.SourceModule; import com.ibm.wala.client.AbstractAnalysisEngine; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.AnalysisScope; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/impl/ZeroCFABuilderFactory.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/impl/ZeroCFABuilderFactory.java index 679676854..780db558f 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/impl/ZeroCFABuilderFactory.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/impl/ZeroCFABuilderFactory.java @@ -13,7 +13,6 @@ package com.ibm.wala.cast.js.client.impl; import com.ibm.wala.cast.ipa.callgraph.StandardFunctionTargetSelector; import com.ibm.wala.cast.js.ipa.callgraph.JSAnalysisOptions; import com.ibm.wala.cast.js.ipa.callgraph.JSZeroOrOneXCFABuilder; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisScope; import com.ibm.wala.ipa.callgraph.CallGraphBuilder; import com.ibm.wala.ipa.callgraph.IAnalysisCacheView; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCFABuilder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCFABuilder.java index 4863aedcd..4fb6d364d 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCFABuilder.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCFABuilder.java @@ -17,7 +17,6 @@ import com.ibm.wala.cast.ipa.callgraph.ReflectedFieldPointerKey; import com.ibm.wala.cast.js.types.JavaScriptTypes; import com.ibm.wala.classLoader.IClass; import com.ibm.wala.classLoader.IField; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.IAnalysisCacheView; import com.ibm.wala.ipa.callgraph.propagation.ConcreteTypeKey; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java index 9bb4335c2..b9600fb76 100755 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java @@ -44,7 +44,6 @@ import com.ibm.wala.classLoader.IMethod; import com.ibm.wala.classLoader.Language; import com.ibm.wala.fixpoint.AbstractOperator; import com.ibm.wala.fixpoint.UnaryOperator; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.CallGraph; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextInterpreter.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextInterpreter.java index 6d808c444..537924be1 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextInterpreter.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextInterpreter.java @@ -17,7 +17,6 @@ import com.ibm.wala.cast.js.loader.JSCallSiteReference; import com.ibm.wala.cast.js.ssa.JSInstructionFactory; import com.ibm.wala.classLoader.CallSiteReference; import com.ibm.wala.classLoader.IClass; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.ContextItem; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java index 997ef3fcd..39066398e 100755 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java @@ -71,7 +71,6 @@ import com.ibm.wala.classLoader.Language; import com.ibm.wala.classLoader.LanguageImpl; import com.ibm.wala.classLoader.ModuleEntry; import com.ibm.wala.classLoader.NewSiteReference; -import com.ibm.wala.classLoader.SourceModule; import com.ibm.wala.ipa.cha.IClassHierarchy; import com.ibm.wala.shrikeBT.IBinaryOpInstruction.IOperator; import com.ibm.wala.shrikeBT.IComparisonInstruction.Operator; diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstContextInsensitiveSSAContextInterpreter.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstContextInsensitiveSSAContextInterpreter.java index d5a3e8679..d70027d85 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstContextInsensitiveSSAContextInterpreter.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstContextInsensitiveSSAContextInterpreter.java @@ -17,7 +17,6 @@ import com.ibm.wala.classLoader.CallSiteReference; import com.ibm.wala.classLoader.CodeScanner; import com.ibm.wala.classLoader.IMethod; import com.ibm.wala.classLoader.NewSiteReference; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.Context; diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java index 9b8b96cbc..e62fd1b18 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java @@ -38,7 +38,6 @@ import com.ibm.wala.classLoader.IClass; import com.ibm.wala.fixpoint.AbstractOperator; import com.ibm.wala.fixpoint.IntSetVariable; import com.ibm.wala.fixpoint.UnaryOperator; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.CallGraph; @@ -64,7 +63,6 @@ import com.ibm.wala.ipa.callgraph.propagation.cfa.DelegatingSSAContextInterprete import com.ibm.wala.ipa.cha.IClassHierarchy; import com.ibm.wala.ipa.modref.ArrayLengthKey; import com.ibm.wala.ssa.DefUse; -import com.ibm.wala.ssa.IR; import com.ibm.wala.ssa.IRView; import com.ibm.wala.ssa.SSAPutInstruction; import com.ibm.wala.ssa.SymbolTable; diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java index 115442554..ec451fc84 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java @@ -35,7 +35,6 @@ import com.ibm.wala.ipa.callgraph.propagation.InstanceKey; import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis; import com.ibm.wala.ipa.callgraph.propagation.PointerKey; import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter; -import com.ibm.wala.ssa.IR; import com.ibm.wala.ssa.IRFactory; import com.ibm.wala.ssa.IRView; import com.ibm.wala.util.debug.Assertions; diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cfg/exc/intra/NullPointerExceptionIntraTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cfg/exc/intra/NullPointerExceptionIntraTest.java index ce8f72493..a192f34cb 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cfg/exc/intra/NullPointerExceptionIntraTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cfg/exc/intra/NullPointerExceptionIntraTest.java @@ -10,11 +10,8 @@ *******************************************************************************/ package com.ibm.wala.core.tests.cfg.exc.intra; -import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import java.util.List; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -38,7 +35,6 @@ import com.ibm.wala.ipa.cha.ClassHierarchyException; import com.ibm.wala.ipa.cha.ClassHierarchyFactory; import com.ibm.wala.ssa.IR; import com.ibm.wala.ssa.ISSABasicBlock; -import com.ibm.wala.ssa.SSACFG; import com.ibm.wala.ssa.SSAInstruction; import com.ibm.wala.ssa.SSAReturnInstruction; import com.ibm.wala.ssa.analysis.IExplodedBasicBlock; diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java index 9e798b0a3..d42f0967f 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java @@ -24,7 +24,6 @@ import com.ibm.wala.classLoader.IField; import com.ibm.wala.classLoader.IMethod; import com.ibm.wala.classLoader.JarFileModule; import com.ibm.wala.client.AbstractAnalysisEngine; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.CallGraph; diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/AbstractReflectionInterpreter.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/AbstractReflectionInterpreter.java index b61b52fdd..d2b18469f 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/AbstractReflectionInterpreter.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/AbstractReflectionInterpreter.java @@ -27,7 +27,6 @@ import com.ibm.wala.classLoader.IClass; import com.ibm.wala.classLoader.IMethod; import com.ibm.wala.classLoader.NewSiteReference; import com.ibm.wala.classLoader.SyntheticMethod; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.IAnalysisCacheView; import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter; diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryBypassInterpreter.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryBypassInterpreter.java index 87b31bfb5..75d03b990 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryBypassInterpreter.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryBypassInterpreter.java @@ -32,7 +32,6 @@ import com.ibm.wala.classLoader.IClass; import com.ibm.wala.classLoader.IMethod; import com.ibm.wala.classLoader.NewSiteReference; import com.ibm.wala.classLoader.SyntheticMethod; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.Context; diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectionContextInterpreter.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectionContextInterpreter.java index 0502fd0ee..572c3b803 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectionContextInterpreter.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectionContextInterpreter.java @@ -16,7 +16,6 @@ import com.ibm.wala.cfg.ControlFlowGraph; import com.ibm.wala.classLoader.CallSiteReference; import com.ibm.wala.classLoader.IClass; import com.ibm.wala.classLoader.NewSiteReference; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.IAnalysisCacheView; diff --git a/com.ibm.wala.core/src/com/ibm/wala/client/AbstractAnalysisEngine.java b/com.ibm.wala.core/src/com/ibm/wala/client/AbstractAnalysisEngine.java index b28738416..a27cfbada 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/client/AbstractAnalysisEngine.java +++ b/com.ibm.wala.core/src/com/ibm/wala/client/AbstractAnalysisEngine.java @@ -21,7 +21,6 @@ import com.ibm.wala.classLoader.ClassLoaderFactory; import com.ibm.wala.classLoader.ClassLoaderFactoryImpl; import com.ibm.wala.classLoader.JarFileModule; import com.ibm.wala.classLoader.Module; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.AnalysisScope; diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java index 05f8ca6de..e60a0f109 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java @@ -29,7 +29,6 @@ import com.ibm.wala.ipa.cha.IClassHierarchy; import com.ibm.wala.shrikeBT.BytecodeConstants; import com.ibm.wala.ssa.DefUse; import com.ibm.wala.ssa.IR; -import com.ibm.wala.ssa.IRView; import com.ibm.wala.ssa.ISSABasicBlock; import com.ibm.wala.ssa.SSAInstruction; import com.ibm.wala.util.CancelException; diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java index 162c17b02..4f294cc7e 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java @@ -23,7 +23,6 @@ import com.ibm.wala.classLoader.Language; import com.ibm.wala.classLoader.NewSiteReference; import com.ibm.wala.classLoader.SyntheticClass; import com.ibm.wala.fixpoint.UnaryOperator; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.CallGraph; diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java index 8eb4ffab3..55c9af052 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java @@ -30,7 +30,6 @@ import com.ibm.wala.classLoader.IMethod; import com.ibm.wala.classLoader.NewSiteReference; import com.ibm.wala.classLoader.ProgramCounter; import com.ibm.wala.fixpoint.AbstractOperator; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.ContextKey; @@ -45,7 +44,6 @@ import com.ibm.wala.ipa.cha.IClassHierarchy; import com.ibm.wala.shrikeBT.ConditionalBranchInstruction; import com.ibm.wala.shrikeBT.IInvokeInstruction; import com.ibm.wala.ssa.DefUse; -import com.ibm.wala.ssa.IR; import com.ibm.wala.ssa.IRView; import com.ibm.wala.ssa.ISSABasicBlock; import com.ibm.wala.ssa.SSAAbstractInvokeInstruction; diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContextInsensitiveSSAInterpreter.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContextInsensitiveSSAInterpreter.java index 7065a1b6f..19849a688 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContextInsensitiveSSAInterpreter.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContextInsensitiveSSAInterpreter.java @@ -12,7 +12,6 @@ package com.ibm.wala.ipa.callgraph.propagation.cfa; import com.ibm.wala.cfg.ControlFlowGraph; import com.ibm.wala.classLoader.IClass; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.IAnalysisCacheView; diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DefaultSSAInterpreter.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DefaultSSAInterpreter.java index 99280b237..eaff295f4 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DefaultSSAInterpreter.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DefaultSSAInterpreter.java @@ -17,7 +17,6 @@ import com.ibm.wala.cfg.ControlFlowGraph; import com.ibm.wala.classLoader.CallSiteReference; import com.ibm.wala.classLoader.IClass; import com.ibm.wala.classLoader.NewSiteReference; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.IAnalysisCacheView; diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/AbstractRTABuilder.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/AbstractRTABuilder.java index 2d78b3dc7..346e392d1 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/AbstractRTABuilder.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/AbstractRTABuilder.java @@ -20,7 +20,6 @@ import com.ibm.wala.classLoader.IClass; import com.ibm.wala.classLoader.IMethod; import com.ibm.wala.classLoader.NewSiteReference; import com.ibm.wala.fixpoint.UnaryOperator; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.ContextSelector; diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/BasicRTABuilder.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/BasicRTABuilder.java index 8e41d33ad..9b465ec6f 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/BasicRTABuilder.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/BasicRTABuilder.java @@ -19,7 +19,6 @@ import com.ibm.wala.classLoader.IMethod; import com.ibm.wala.classLoader.NewSiteReference; import com.ibm.wala.fixpoint.IntSetVariable; import com.ibm.wala.fixpoint.UnaryOperator; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.ContextSelector; diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/ContextInsensitiveRTAInterpreter.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/ContextInsensitiveRTAInterpreter.java index 195aefbee..ee649a380 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/ContextInsensitiveRTAInterpreter.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/ContextInsensitiveRTAInterpreter.java @@ -16,7 +16,6 @@ import java.util.Iterator; import com.ibm.wala.classLoader.CodeScanner; import com.ibm.wala.classLoader.IClass; import com.ibm.wala.classLoader.NewSiteReference; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.IAnalysisCacheView; import com.ibm.wala.ipa.callgraph.cha.ContextInsensitiveCHAContextInterpreter; diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DefaultRTAInterpreter.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DefaultRTAInterpreter.java index 379e9d1d9..dd2e3b53e 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DefaultRTAInterpreter.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DefaultRTAInterpreter.java @@ -16,7 +16,6 @@ import java.util.Iterator; import com.ibm.wala.classLoader.CallSiteReference; import com.ibm.wala.classLoader.IClass; import com.ibm.wala.classLoader.NewSiteReference; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.IAnalysisCacheView; diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/SystemServiceModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/SystemServiceModel.java index d254eb810..7a7fa22e7 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/SystemServiceModel.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/SystemServiceModel.java @@ -65,7 +65,6 @@ import com.ibm.wala.types.TypeName; import com.ibm.wala.types.TypeReference; import com.ibm.wala.util.CancelException; import com.ibm.wala.util.ssa.ParameterAccessor; -import com.ibm.wala.util.ssa.ParameterAccessor.Parameter; import com.ibm.wala.util.ssa.SSAValue; import com.ibm.wala.util.ssa.SSAValueManager; import com.ibm.wala.util.ssa.TypeSafeInstructionFactory; diff --git a/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/client/JDTJavaSourceAnalysisEngine.java b/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/client/JDTJavaSourceAnalysisEngine.java index a4ea33c5e..4a1605a05 100644 --- a/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/client/JDTJavaSourceAnalysisEngine.java +++ b/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/client/JDTJavaSourceAnalysisEngine.java @@ -53,7 +53,6 @@ import com.ibm.wala.ide.util.EclipseProjectPath; import com.ibm.wala.ide.util.EclipseProjectPath.AnalysisScopeType; import com.ibm.wala.ide.util.JavaEclipseProjectPath; import com.ibm.wala.ide.util.JdtUtil; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.AnalysisScope; diff --git a/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/client/EclipseJavaScriptAnalysisEngine.java b/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/client/EclipseJavaScriptAnalysisEngine.java index addbb06be..edf016b5c 100644 --- a/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/client/EclipseJavaScriptAnalysisEngine.java +++ b/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/client/EclipseJavaScriptAnalysisEngine.java @@ -42,7 +42,6 @@ import com.ibm.wala.classLoader.ClassLoaderFactory; import com.ibm.wala.classLoader.IMethod; import com.ibm.wala.ide.client.EclipseProjectSourceAnalysisEngine; import com.ibm.wala.ide.util.JavaScriptEclipseProjectPath; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.AnalysisScope; diff --git a/com.ibm.wala.ide/src/com/ibm/wala/ide/client/EclipseProjectAnalysisEngine.java b/com.ibm.wala.ide/src/com/ibm/wala/ide/client/EclipseProjectAnalysisEngine.java index f35c19be3..e3d8419bd 100644 --- a/com.ibm.wala.ide/src/com/ibm/wala/ide/client/EclipseProjectAnalysisEngine.java +++ b/com.ibm.wala.ide/src/com/ibm/wala/ide/client/EclipseProjectAnalysisEngine.java @@ -21,7 +21,6 @@ import org.eclipse.core.runtime.IPath; import com.ibm.wala.client.AbstractAnalysisEngine; import com.ibm.wala.ide.util.EclipseProjectPath; -import com.ibm.wala.ipa.callgraph.AnalysisCache; import com.ibm.wala.ipa.callgraph.AnalysisOptions; import com.ibm.wala.ipa.callgraph.AnalysisScope; import com.ibm.wala.ipa.callgraph.CallGraphBuilder; From aa878f0b68a3a7a7b7df3faee8c60db910872a59 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Fri, 17 Mar 2017 22:13:02 -0500 Subject: [PATCH 2/9] Fix 11 Eclipse warnings about redundant interfaces --- .../com/ibm/wala/cast/js/translator/CAstRhinoTranslator.java | 3 +-- .../com/ibm/wala/cast/js/ipa/callgraph/JSCallGraphUtil.java | 2 +- .../java/com/ibm/wala/cast/ir/translator/AstTranslator.java | 3 +-- .../java/com/ibm/wala/cast/tree/impl/RangePosition.java | 2 +- .../dalvik/analysis/typeInference/DalvikTypeInference.java | 3 +-- .../androidModel/parameters/DefaultInstantiationBehavior.java | 2 +- .../androidModel/parameters/LoadedInstantiationBehavior.java | 2 +- .../ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java | 2 +- .../com/ibm/wala/dataflow/graph/BitVectorIntersection.java | 3 +-- .../src/com/ibm/wala/dataflow/graph/BitVectorUnion.java | 3 +-- .../src/com/ibm/wala/dataflow/graph/BooleanUnion.java | 3 +-- .../src/com/ibm/wala/fixedpoint/impl/NullaryOperator.java | 3 +-- .../src/com/ibm/wala/fixpoint/UnaryOperator.java | 2 +- .../src/com/ibm/wala/util/config/FileOfClasses.java | 3 +-- .../util/graph/traverse/NumberedDFSDiscoverTimeIterator.java | 2 +- .../util/graph/traverse/NumberedDFSFinishTimeIterator.java | 2 +- .../wala/util/graph/traverse/SlowDFSDiscoverTimeIterator.java | 2 +- com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVector.java | 4 +--- .../src/com/ibm/wala/util/intset/MutableSparseIntSet.java | 4 +--- .../src/com/ibm/wala/util/intset/SparseIntSet.java | 3 +-- 20 files changed, 20 insertions(+), 33 deletions(-) diff --git a/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoTranslator.java b/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoTranslator.java index 410ae8eb5..53216dfa9 100644 --- a/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoTranslator.java +++ b/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoTranslator.java @@ -11,11 +11,10 @@ package com.ibm.wala.cast.js.translator; import com.ibm.wala.cast.ir.translator.RewritingTranslatorToCAst; -import com.ibm.wala.cast.ir.translator.TranslatorToCAst; import com.ibm.wala.cast.tree.impl.CAstImpl; import com.ibm.wala.classLoader.ModuleEntry; -public class CAstRhinoTranslator extends RewritingTranslatorToCAst implements TranslatorToCAst { +public class CAstRhinoTranslator extends RewritingTranslatorToCAst { public CAstRhinoTranslator(ModuleEntry m, boolean replicateForDoLoops) { super(m, new RhinoToAstTranslator(new CAstImpl(), m, m.getName(), replicateForDoLoops)); } 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 946befa9a..44077f225 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 @@ -255,7 +255,7 @@ public class JSCallGraphUtil extends com.ibm.wala.cast.ipa.callgraph.CAstCallGra } } - public static class Bootstrap implements SourceModule, Module, ModuleEntry { + public static class Bootstrap implements SourceModule { private String name; private InputStream stream; private final URL url; diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java index a6c66d4ba..7281e2f04 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java @@ -84,7 +84,6 @@ import com.ibm.wala.util.collections.HashSetFactory; import com.ibm.wala.util.collections.MapUtil; import com.ibm.wala.util.collections.Pair; import com.ibm.wala.util.debug.Assertions; -import com.ibm.wala.util.graph.INodeWithNumber; import com.ibm.wala.util.graph.impl.SparseNumberedGraph; import com.ibm.wala.util.graph.traverse.DFS; import com.ibm.wala.util.intset.IntSet; @@ -545,7 +544,7 @@ public abstract class AstTranslator extends CAstVisitor { + protected final static class PreBasicBlock implements IBasicBlock { private static final int NORMAL = 0; private static final int HANDLER = 1; diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/RangePosition.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/RangePosition.java index 4db10330f..638b5d22a 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/RangePosition.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/RangePosition.java @@ -17,7 +17,7 @@ import java.net.URL; import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position; -public class RangePosition extends AbstractSourcePosition implements Position { +public class RangePosition extends AbstractSourcePosition { private final URL url; private final int startLine; private final int endLine; diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/analysis/typeInference/DalvikTypeInference.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/analysis/typeInference/DalvikTypeInference.java index e1feacf23..879cc80bd 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/analysis/typeInference/DalvikTypeInference.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/analysis/typeInference/DalvikTypeInference.java @@ -6,7 +6,6 @@ import com.ibm.wala.analysis.typeInference.TypeVariable; import com.ibm.wala.fixpoint.AbstractOperator; import com.ibm.wala.fixpoint.IVariable; import com.ibm.wala.ssa.IR; -import com.ibm.wala.ssa.IVisitorWithAddresses; import com.ibm.wala.ssa.SSAPhiInstruction; import com.ibm.wala.ssa.SymbolTable; @@ -50,7 +49,7 @@ public class DalvikTypeInference extends TypeInference { } } - protected class TypeOperatorFactory extends TypeInference.TypeOperatorFactory implements IVisitorWithAddresses, OperatorFactory { + protected class TypeOperatorFactory extends TypeInference.TypeOperatorFactory { @Override public void visitPhi(SSAPhiInstruction instruction) { diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/DefaultInstantiationBehavior.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/DefaultInstantiationBehavior.java index d649a6b26..198948aa8 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/DefaultInstantiationBehavior.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/DefaultInstantiationBehavior.java @@ -60,7 +60,7 @@ import com.ibm.wala.util.strings.Atom; * @author Tobias Blaschke * @since 2013-10-25 */ -public class DefaultInstantiationBehavior extends IInstantiationBehavior implements Serializable { +public class DefaultInstantiationBehavior extends IInstantiationBehavior { /* package-private */ static final class BehviourValue implements Serializable { public final InstanceBehavior behaviour; diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/LoadedInstantiationBehavior.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/LoadedInstantiationBehavior.java index a14e235de..a1039cbc1 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/LoadedInstantiationBehavior.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/LoadedInstantiationBehavior.java @@ -60,7 +60,7 @@ import com.ibm.wala.util.strings.Atom; * @author Tobias Blaschke * @since 2013-10-25 */ -public class LoadedInstantiationBehavior extends IInstantiationBehavior implements Serializable { +public class LoadedInstantiationBehavior extends IInstantiationBehavior { private static final class BehviourValue implements Serializable { public final InstanceBehavior behaviour; diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java index c80cc766f..fd9b3c1b8 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java @@ -189,7 +189,7 @@ public class AndroidEntryPoint extends DexEntryPoint { * Before building the model a list of AdroidEntryPoints is to be sorted by that criterion. * You can use AndroidEntryPoint.ExecutionOrderComperator for that task. */ - public static class ExecutionOrder implements Comparable, IExecutionOrder { + public static class ExecutionOrder implements IExecutionOrder { // This is an Enum-Style class /** Visit the EntryPoint once at the beginning of the model use that for initialization stuff */ public final static ExecutionOrder AT_FIRST = new ExecutionOrder(0); diff --git a/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorIntersection.java b/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorIntersection.java index 9f2153fcf..64253df57 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorIntersection.java +++ b/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorIntersection.java @@ -12,14 +12,13 @@ package com.ibm.wala.dataflow.graph; import com.ibm.wala.fixpoint.BitVectorVariable; -import com.ibm.wala.fixpoint.FixedPointConstants; import com.ibm.wala.util.intset.IntSet; import com.ibm.wala.util.intset.IntSetAction; /** * Operator U(n) = U(n) n U(j) */ -public final class BitVectorIntersection extends AbstractMeetOperator implements FixedPointConstants { +public final class BitVectorIntersection extends AbstractMeetOperator { private static final BitVectorIntersection INSTANCE = new BitVectorIntersection(); diff --git a/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnion.java b/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnion.java index 8baa98986..cf891e02f 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnion.java +++ b/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnion.java @@ -11,12 +11,11 @@ package com.ibm.wala.dataflow.graph; import com.ibm.wala.fixpoint.BitVectorVariable; -import com.ibm.wala.fixpoint.FixedPointConstants; /** * Operator U(n) = U(n) U U(j) */ -public class BitVectorUnion extends AbstractMeetOperator implements FixedPointConstants { +public class BitVectorUnion extends AbstractMeetOperator { private final static BitVectorUnion SINGLETON = new BitVectorUnion(); diff --git a/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BooleanUnion.java b/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BooleanUnion.java index 022926824..4a593375a 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BooleanUnion.java +++ b/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BooleanUnion.java @@ -11,12 +11,11 @@ package com.ibm.wala.dataflow.graph; import com.ibm.wala.fixpoint.BooleanVariable; -import com.ibm.wala.fixpoint.FixedPointConstants; /** * Operator U(n) = U(n) U U(j) */ -public class BooleanUnion extends AbstractMeetOperator implements FixedPointConstants { +public class BooleanUnion extends AbstractMeetOperator { private final static BooleanUnion SINGLETON = new BooleanUnion(); diff --git a/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/NullaryOperator.java b/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/NullaryOperator.java index 5dc78b970..96f68d30f 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/NullaryOperator.java +++ b/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/NullaryOperator.java @@ -12,14 +12,13 @@ package com.ibm.wala.fixedpoint.impl; import com.ibm.wala.fixpoint.AbstractOperator; -import com.ibm.wala.fixpoint.FixedPointConstants; import com.ibm.wala.fixpoint.IVariable; /** * An operator of the form lhs = op */ @SuppressWarnings("rawtypes") -public abstract class NullaryOperator extends AbstractOperator implements FixedPointConstants { +public abstract class NullaryOperator extends AbstractOperator { @Override public byte evaluate(T lhs, T[] rhs) throws UnsupportedOperationException { diff --git a/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryOperator.java b/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryOperator.java index a8f161393..f849ffc59 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryOperator.java +++ b/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryOperator.java @@ -17,7 +17,7 @@ import com.ibm.wala.util.debug.UnimplementedError; * An operator of the form lhs = op (rhs) */ @SuppressWarnings("rawtypes") -public abstract class UnaryOperator extends AbstractOperator implements FixedPointConstants { +public abstract class UnaryOperator extends AbstractOperator { /** * Evaluate this equation, setting a new value for the left-hand side. diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/config/FileOfClasses.java b/com.ibm.wala.util/src/com/ibm/wala/util/config/FileOfClasses.java index 748b9c02f..b291bff84 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/config/FileOfClasses.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/config/FileOfClasses.java @@ -14,14 +14,13 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.Serializable; import java.util.regex.Matcher; import java.util.regex.Pattern; /** * An object which represents a set of classes read from a text file. */ -public class FileOfClasses extends SetOfClasses implements Serializable { +public class FileOfClasses extends SetOfClasses { /* Serial version */ private static final long serialVersionUID = -3256390509887654322L; diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSDiscoverTimeIterator.java b/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSDiscoverTimeIterator.java index f50a767ce..184ce84a1 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSDiscoverTimeIterator.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSDiscoverTimeIterator.java @@ -20,7 +20,7 @@ import com.ibm.wala.util.graph.NumberedGraph; * increasing discover time. This class follows the outNodes of the graph nodes to define the graph, but this behavior can be * changed by overriding the getConnected method. */ -public class NumberedDFSDiscoverTimeIterator extends GraphDFSDiscoverTimeIterator implements Iterator { +public class NumberedDFSDiscoverTimeIterator extends GraphDFSDiscoverTimeIterator { private static final long serialVersionUID = -3919708273323217304L; diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSFinishTimeIterator.java b/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSFinishTimeIterator.java index e1ca56098..4df7846e6 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSFinishTimeIterator.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSFinishTimeIterator.java @@ -20,7 +20,7 @@ import com.ibm.wala.util.graph.NumberedGraph; * increasing discover time. This class follows the outNodes of the graph nodes to define the graph, but this behavior can be * changed by overriding the getConnected method. */ -public class NumberedDFSFinishTimeIterator extends DFSFinishTimeIterator implements Iterator { +public class NumberedDFSFinishTimeIterator extends DFSFinishTimeIterator { public static final long serialVersionUID = 8737376661L; /** diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/SlowDFSDiscoverTimeIterator.java b/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/SlowDFSDiscoverTimeIterator.java index 5a7b988eb..0b525fdd1 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/SlowDFSDiscoverTimeIterator.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/SlowDFSDiscoverTimeIterator.java @@ -22,7 +22,7 @@ import com.ibm.wala.util.graph.Graph; * discover time. This class follows the outNodes of the graph nodes to define the graph, but this behavior can be changed by * overriding the getConnected method. */ -public class SlowDFSDiscoverTimeIterator extends GraphDFSDiscoverTimeIterator implements Iterator { +public class SlowDFSDiscoverTimeIterator extends GraphDFSDiscoverTimeIterator { public static final long serialVersionUID = 9439217987188L; /** diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVector.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVector.java index 3d6440a8a..7cafcb75a 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVector.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVector.java @@ -10,11 +10,9 @@ *******************************************************************************/ package com.ibm.wala.util.intset; -import java.io.Serializable; - /** */ -public class BitVector extends BitVectorBase implements Serializable { +public class BitVector extends BitVectorBase { private static final long serialVersionUID = 9087259335807761617L; diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseIntSet.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseIntSet.java index 8d3ed83c1..22232cada 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseIntSet.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseIntSet.java @@ -10,8 +10,6 @@ *******************************************************************************/ package com.ibm.wala.util.intset; -import java.io.Serializable; - import com.ibm.wala.util.debug.Assertions; /** @@ -23,7 +21,7 @@ import com.ibm.wala.util.debug.Assertions; * TODO: even for small sets, we probably want to work on this to reduce the * allocation activity. */ -public class MutableSparseIntSet extends SparseIntSet implements MutableIntSet, Serializable { +public class MutableSparseIntSet extends SparseIntSet implements MutableIntSet { /** * If forced to grow the backing array .. then by how much diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseIntSet.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseIntSet.java index bb94337f0..a87212a5e 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseIntSet.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseIntSet.java @@ -10,7 +10,6 @@ *******************************************************************************/ package com.ibm.wala.util.intset; -import java.io.Serializable; import java.util.Iterator; import java.util.NoSuchElementException; import java.util.StringTokenizer; @@ -22,7 +21,7 @@ import com.ibm.wala.util.debug.UnimplementedError; /** * A sparse ordered, duplicate-free, fully-encapsulated set of integers; not necessary mutable */ -public class SparseIntSet implements IntSet, Serializable { +public class SparseIntSet implements IntSet { private final static int SINGLETON_CACHE_SIZE = 5000; From 4cd6e590a9bcb7b6dd008f4f015a174e80e0646e Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Fri, 17 Mar 2017 22:31:28 -0500 Subject: [PATCH 3/9] Fix 5 Eclipse warnings about local-but-unused constructors --- .../dalvik/util/AndroidManifestXMLReader.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java index ee554c54a..e1e23dd62 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java @@ -483,9 +483,6 @@ public class AndroidManifestXMLReader { * Attributes. */ private static class FinalItem extends ParserItem { - public FinalItem() { - super(); - } @Override public void leave() { final Set subs = self.getAllowedSubTags(); @@ -507,18 +504,12 @@ public class AndroidManifestXMLReader { * It's like FinalItem but may contain sub-tags. */ private static class NoOpItem extends ParserItem { - public NoOpItem() { - super(); - } } /** * The root-element of an AndroidManifest contains the package. */ private static class ManifestItem extends ParserItem { - public ManifestItem() { - super(); - } @Override public void enter(Attributes saxAttrs) { super.enter(saxAttrs); @@ -532,9 +523,6 @@ public class AndroidManifestXMLReader { * @todo Handle the URI */ private static class IntentItem extends ParserItem { - public IntentItem() { - super(); - } @Override public void leave() { Set allowedTags = EnumSet.copyOf(self.getAllowedSubTags()); @@ -604,9 +592,6 @@ public class AndroidManifestXMLReader { } private static class ComponentItem extends ParserItem { - public ComponentItem() { - super(); - } @Override public void leave() { final Set allowedTags = self.getAllowedSubTags(); From 16cb59694799206351d18fcef519f9b3923f25da Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Fri, 17 Mar 2017 22:32:21 -0500 Subject: [PATCH 4/9] Fix 10 Eclipse warnings about declared-but-never-thrown exceptions --- .../ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java | 2 +- .../wala/dalvik/ipa/callgraph/androidModel/MiniModel.java | 2 +- .../callgraph/androidModel/stubs/UnknownTargetModel.java | 2 +- .../com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java | 2 +- .../source/org/scandroid/util/AndroidAnalysisContext.java | 6 ++---- .../source/org/scandroid/util/DexDotUtil.java | 6 +++--- 6 files changed, 9 insertions(+), 11 deletions(-) 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 f1b1eba4c..1b411b4f0 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 @@ -135,7 +135,7 @@ public class WDexClassLoaderImpl extends ClassLoaderImpl { s.removeAll(toRemove); } - private Set getDexFiles(Module M) throws IOException { + private Set getDexFiles(Module M) { HashSet result = HashSetFactory.make(); for (Iterator it = M.getEntries(); it.hasNext();) { ModuleEntry entry = (ModuleEntry) it.next(); diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MiniModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MiniModel.java index c0b7dbb49..651c3a5cb 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MiniModel.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MiniModel.java @@ -92,7 +92,7 @@ public class MiniModel extends AndroidModel { } public MiniModel(final IClassHierarchy cha, final AnalysisOptions options, final IAnalysisCacheView cache, - final AndroidComponent forCompo) throws CancelException { + final AndroidComponent forCompo) { super(cha, options, cache); this.forCompo = forCompo; diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/UnknownTargetModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/UnknownTargetModel.java index 88c763a13..b0818b5f1 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/UnknownTargetModel.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/UnknownTargetModel.java @@ -109,7 +109,7 @@ public class UnknownTargetModel extends AndroidModel { * @param target Component Type, may be null: No restrictions are imposed on AndroidModel then */ public UnknownTargetModel(final IClassHierarchy cha, final AnalysisOptions options, final IAnalysisCacheView cache, - AndroidComponent target) throws CancelException { + AndroidComponent target) { super(cha, options, cache); if (target == null) { // TODO: Enable diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java index e1e23dd62..234130802 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java @@ -97,7 +97,7 @@ public class AndroidManifestXMLReader { */ private static final Logger logger = LoggerFactory.getLogger(AndroidSettingFactory.class); - public AndroidManifestXMLReader(File xmlFile) throws IOException { + public AndroidManifestXMLReader(File xmlFile) { if (xmlFile == null) { throw new IllegalArgumentException("xmlFile may not be null"); } diff --git a/com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java b/com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java index 1d50ab9c9..84c1e2270 100644 --- a/com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java +++ b/com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java @@ -50,7 +50,6 @@ package org.scandroid.util; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; @@ -147,7 +146,7 @@ public class AndroidAnalysisContext { // ContextSelector, entry points, reflection options, IR Factory, call graph // type, include library public void buildGraphs(List localEntries, - InputStream summariesStream) throws CancelException { + InputStream summariesStream) { @@ -303,8 +302,7 @@ public class AndroidAnalysisContext { } private static XMLMethodSummaryReader loadMethodSummaries( - AnalysisScope scope, InputStream xmlIStream) - throws FileNotFoundException { + AnalysisScope scope, InputStream xmlIStream) { try (InputStream s = xmlIStream != null ? xmlIStream : AndroidAnalysisContext.class.getClassLoader() .getResourceAsStream( diff --git a/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java b/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java index d11ba341c..220c15e2f 100644 --- a/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java +++ b/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java @@ -242,11 +242,11 @@ public class DexDotUtil extends DotUtil { /** * Compute the nodes to visualize */ - private static Collection computeDotNodes(Graph g) throws WalaException { + private static Collection computeDotNodes(Graph g) { return Iterator2Collection.toSet(g.iterator()); } - private static String getRankDir() throws WalaException { + private static String getRankDir() { return null; } @@ -254,7 +254,7 @@ public class DexDotUtil extends DotUtil { * @param n node to decorate * @param d decorating master */ - private static String decorateNode(T n, NodeDecorator d) throws WalaException { + private static String decorateNode(T n, NodeDecorator d) { StringBuffer result = new StringBuffer(); result.append(" [ ]\n"); return result.toString(); From fe9f7a793a1dfb1b0717ae32a08966617622c62c Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Fri, 17 Mar 2017 23:17:21 -0500 Subject: [PATCH 5/9] Suppress 157 Eclipse warnings about unused exception parameters In the cases addressed here, the caught exception is truly not needed by the handling code. --- .../src/Exception2.java | 6 +++--- .../ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java | 4 ++-- .../wala/cast/js/test/JSCallGraphBuilderUtil.java | 4 ++-- .../wala/cast/js/html/DefaultSourceExtractor.java | 2 +- .../ibm/wala/cast/js/html/jericho/JerichoTag.java | 2 +- .../cast/js/ipa/callgraph/JSCallGraphUtil.java | 4 ++-- .../JSSSAPropagationCallGraphBuilder.java | 2 +- .../js/ipa/callgraph/LoadFileTargetSelector.java | 6 +++--- .../callgraph/correlations/CorrelationFinder.java | 2 +- .../summaries/JavaScriptConstructorFunctions.java | 4 ++-- .../ibm/wala/cast/js/loader/JavaScriptLoader.java | 2 +- .../ibm/wala/cast/ipa/callgraph/AstCallGraph.java | 2 +- .../AstSSAPropagationCallGraphBuilder.java | 2 +- .../wala/cast/ipa/callgraph/CAstCallGraphUtil.java | 4 ++-- .../com/ibm/wala/cast/loader/AstFunctionClass.java | 2 +- .../ibm/wala/cast/loader/CAstAbstractLoader.java | 4 ++-- .../wala/cast/loader/SingleClassLoaderFactory.java | 2 +- .../java/com/ibm/wala/cast/tree/impl/CAstImpl.java | 2 +- .../java/com/ibm/wala/cast/util/CAstPrinter.java | 2 +- .../src/annotations/TypeAnnotatedClass1.java | 2 +- .../src/dynamicCG/MainClass.java | 2 +- .../src/exceptionpruning/TestPruning.java | 10 +++++----- com.ibm.wala.core.testdata/src/slice/TestCD3.java | 2 +- .../com/ibm/wala/core/tests/cha/DupFieldsTest.java | 2 +- .../analysis/SimpleThreadEscapeAnalysis.java | 2 +- .../dataflow/ContextInsensitiveReachingDefs.java | 2 +- .../dataflow/ContextSensitiveReachingDefs.java | 2 +- .../analysis/dataflow/IntraprocReachingDefs.java | 2 +- .../analysis/dataflow/StaticInitializer.java | 2 +- .../IntraproceduralNullPointerAnalysis.java | 2 +- .../reflection/ReflectiveInvocationSelector.java | 2 +- .../wala/analysis/typeInference/TypeInference.java | 2 +- .../classLoader/AbstractNestedJarFileModule.java | 2 +- .../ibm/wala/classLoader/AbstractURLModule.java | 4 ++-- .../classLoader/BinaryDirectoryTreeModule.java | 2 +- .../wala/classLoader/ClassLoaderFactoryImpl.java | 2 +- .../com/ibm/wala/classLoader/ClassLoaderImpl.java | 6 +++--- .../com/ibm/wala/classLoader/JarStreamModule.java | 2 +- .../com/ibm/wala/classLoader/ShrikeBTMethod.java | 6 +++--- .../com/ibm/wala/classLoader/ShrikeCTMethod.java | 6 +++--- .../src/com/ibm/wala/classLoader/ShrikeClass.java | 12 ++++++------ .../com/ibm/wala/classLoader/ShrikeIRFactory.java | 2 +- .../demandpa/alg/DemandRefinementPointsTo.java | 14 +++++++------- .../com/ibm/wala/ipa/callgraph/AnalysisScope.java | 2 +- .../propagation/PropagationCallGraphBuilder.java | 2 +- .../propagation/rta/AbstractRTABuilder.java | 2 +- .../com/ibm/wala/properties/WalaProperties.java | 2 +- com.ibm.wala.core/src/com/ibm/wala/ssa/DefUse.java | 2 +- .../src/com/ibm/wala/ssa/SymbolTable.java | 2 +- .../ibm/wala/types/annotations/TypeAnnotation.java | 6 +++--- .../src/com/ibm/wala/util/ProgressMaster.java | 4 ++-- .../ibm/wala/util/config/AnalysisScopeReader.java | 2 +- .../src/com/ibm/wala/util/io/FileProvider.java | 4 ++-- .../com/ibm/wala/util/ssa/ParameterAccessor.java | 6 +++--- .../wala/util/ssa/TypeSafeInstructionFactory.java | 2 +- .../src/com/ibm/wala/util/strings/UTF8Convert.java | 4 ++-- .../src/com/ibm/wala/viz/viewer/IrViewer.java | 4 ++-- .../src/com/ibm/wala/viz/viewer/SourceViewer.java | 2 +- .../wala/dalvik/drivers/APKCallGraphDriver.java | 2 +- .../source/com/ibm/wala/dalvik/test/util/Util.java | 2 +- .../com/ibm/wala/dalvik/classLoader/DexIClass.java | 2 +- .../ibm/wala/dalvik/classLoader/DexIRFactory.java | 2 +- .../androidModel/parameters/ReuseParameters.java | 2 +- .../ibm/wala/ide/util/JavaEclipseProjectPath.java | 2 +- .../source/com/ibm/wala/ide/util/JdtUtil.java | 8 ++++---- .../ibm/wala/ide/util/EclipseWebProjectPath.java | 2 +- .../ide/util/JavaScriptEclipseProjectPath.java | 2 +- .../ibm/wala/ide/util/JavaScriptHeadlessUtil.java | 2 +- .../source/com/ibm/wala/ide/util/JsdtUtil.java | 4 ++-- .../client/EclipseProjectSourceAnalysisEngine.java | 4 ++-- .../src/com/ibm/wala/ide/plugin/CorePlugin.java | 4 ++-- .../com/ibm/wala/ide/util/EclipseFileProvider.java | 4 ++-- .../com/ibm/wala/ide/util/EclipseProjectPath.java | 6 +++--- .../prefixtransfer/PrefixTransferGraph.java | 2 +- .../prefixtransfer/UriPrefixTransferGraph.java | 2 +- .../source/org/scandroid/util/DexDotUtil.java | 2 +- .../src/com/ibm/wala/shrike/bench/Mangler.java | 2 +- .../src/com/ibm/wala/shrike/cg/Runtime.java | 6 +++--- .../src/com/ibm/wala/shrikeBT/Compiler.java | 2 +- .../shrikeBT/shrikeCT/OfflineInstrumenter.java | 2 +- .../shrikeBT/shrikeCT/tools/AddSerialVersion.java | 8 ++++---- .../com/ibm/wala/shrikeCT/AnnotationsReader.java | 2 +- .../src/com/ibm/wala/shrikeCT/ClassReader.java | 4 ++-- .../ibm/wala/shrikeCT/TypeAnnotationsReader.java | 2 +- .../src/com/ibm/wala/sourcepos/CRTable.java | 2 +- .../com/ibm/wala/sourcepos/MethodPositions.java | 4 ++-- .../ibm/wala/util/collections/ParanoidHashMap.java | 2 +- .../wala/util/graph/traverse/FloydWarshall.java | 4 ++-- .../com/ibm/wala/util/intset/BitVectorBase.java | 2 +- .../ibm/wala/util/intset/FixedSizeBitVector.java | 4 ++-- .../src/com/ibm/wala/util/intset/IntSetUtil.java | 2 +- .../src/com/ibm/wala/util/intset/LongSetUtil.java | 2 +- .../src/com/ibm/wala/util/processes/Launcher.java | 12 ++++++------ .../src/com/ibm/wala/viz/DotUtil.java | 2 +- 94 files changed, 157 insertions(+), 157 deletions(-) diff --git a/com.ibm.wala.cast.java.test.data/src/Exception2.java b/com.ibm.wala.cast.java.test.data/src/Exception2.java index dd0e4b319..14e504468 100644 --- a/com.ibm.wala.cast.java.test.data/src/Exception2.java +++ b/com.ibm.wala.cast.java.test.data/src/Exception2.java @@ -28,7 +28,7 @@ public final class Exception2 { while ( (data = fis.read()) != -1 ) { fos.write(data); } - } catch (FileNotFoundException e) { + } catch (@SuppressWarnings("unused") FileNotFoundException e) { System.err.println( "File not found" ); // whatever } catch (IOException e) { @@ -38,14 +38,14 @@ public final class Exception2 { if (fis != null) { try { fis.close(); - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { System.exit(-1); } } if (fos != null) { try { fos.close(); - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { System.exit(-1); } } diff --git a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java index c07de7174..0136b81aa 100644 --- a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java +++ b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java @@ -86,7 +86,7 @@ public class HTMLCGBuilder { URL url = null; try { url = toUrl(src); - } catch (MalformedURLException e1) { + } catch (@SuppressWarnings("unused") MalformedURLException e1) { Assert.fail("Could not find page to analyse: " + src); } com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil.setTranslatorFactory(new CAstRhinoTranslatorFactory()); @@ -129,7 +129,7 @@ public class HTMLCGBuilder { File f = (new FileProvider()).getFileFromClassLoader(src, HTMLCGBuilder.class.getClassLoader()); URL url = f.toURI().toURL(); return url; - } catch (FileNotFoundException fnfe) { + } catch (@SuppressWarnings("unused") FileNotFoundException fnfe) { return new URL(src); } } diff --git a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java index 5de0961e2..d711e6f6a 100644 --- a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java +++ b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java @@ -108,7 +108,7 @@ public class JSCallGraphBuilderUtil extends com.ibm.wala.cast.js.ipa.callgraph.J FileProvider provider = new FileProvider(); try { f = provider.getFile(dir + File.separator + name, loader); - } catch (FileNotFoundException e) { + } catch (@SuppressWarnings("unused") FileNotFoundException e) { // I guess we need to do this on Windows sometimes? --MS // if this fails, we won't catch the exception f = provider.getFile(dir + "/" + name, JSCallGraphBuilderUtil.class.getClassLoader()); @@ -239,7 +239,7 @@ public class JSCallGraphBuilderUtil extends com.ibm.wala.cast.js.ipa.callgraph.J builder.setContextSelector(new PropertyNameContextSelector(builder.getAnalysisCache(), 2, builder.getContextSelector())); return builder; - } catch (ClassHierarchyException e) { + } catch (@SuppressWarnings("unused") ClassHierarchyException e) { Assert.assertTrue("internal error building class hierarchy", false); return null; } diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java index ca13b3c1d..bcd60a6c2 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java @@ -62,7 +62,7 @@ public class DefaultSourceExtractor extends DomLessSourceExtractor{ if (v != null && v.startsWith("javascript:")) { try { writeEntrypoint(" " + v.substring(11), e.getValue().snd, new URL(tag.getElementPosition().getURL().toString() + "#" + a), true); - } catch (MalformedURLException ex) { + } catch (@SuppressWarnings("unused") MalformedURLException ex) { writeEntrypoint(v.substring(11), e.getValue().snd, entrypointUrl, false); } } diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java index e9dd61d93..248e514f5 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java @@ -81,7 +81,7 @@ public class JerichoTag implements ITag { public URL getURL() { try { return new URL("file://" + sourceFile); - } catch (MalformedURLException e) { + } catch (@SuppressWarnings("unused") MalformedURLException e) { return null; } } 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 44077f225..bf303c658 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 @@ -226,10 +226,10 @@ public class JSCallGraphUtil extends com.ibm.wala.cast.ipa.callgraph.CAstCallGra cha.addClass(fcls); } return names; - } catch (Error e) { + } catch (@SuppressWarnings("unused") Error e) { return Collections.emptySet(); } - } catch (RuntimeException e) { + } catch (@SuppressWarnings("unused") RuntimeException e) { return Collections.emptySet(); } } diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java index b9600fb76..d7c0180e1 100755 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java @@ -203,7 +203,7 @@ public class JSSSAPropagationCallGraphBuilder extends AstSSAPropagationCallGraph try { byte[] utf8 = "__proto__".getBytes("UTF-8"); x = FieldReference.findOrCreate(JavaScriptTypes.Root, Atom.findOrCreate(utf8, 0, utf8.length), JavaScriptTypes.Root); - } catch (UnsupportedEncodingException e) { + } catch (@SuppressWarnings("unused") UnsupportedEncodingException e) { assert false; } prototypeRef = x; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java index 87d82b9e3..28ca33c5c 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java @@ -81,11 +81,11 @@ public class LoadFileTargetSelector implements MethodTargetSelector { IClass script = builder.getClassHierarchy().lookupClass(TypeReference.findOrCreate(cl.getReference(), "L" + url.getFile())); return script.getMethod(JavaScriptMethods.fnSelector); } - } catch (MalformedURLException e1) { + } catch (@SuppressWarnings("unused") MalformedURLException e1) { // do nothing, fall through and return 'target' - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { // do nothing, fall through and return 'target' - } catch (RuntimeException e) { + } catch (@SuppressWarnings("unused") RuntimeException e) { // do nothing, fall through and return 'target' } } diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java index 9afe0ac95..90357b121 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java @@ -291,7 +291,7 @@ public class CorrelationFinder { IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, JavaScriptLoader.JS); try { Util.checkForFrontEndErrors(cha); - } catch (WalaException e) { + } catch (@SuppressWarnings("unused") WalaException e) { return Collections.emptyMap(); } IRFactory factory = AstIRFactory.makeDefaultFactory(); diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/summaries/JavaScriptConstructorFunctions.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/summaries/JavaScriptConstructorFunctions.java index 5bd749d17..ff8e2d352 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/summaries/JavaScriptConstructorFunctions.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/summaries/JavaScriptConstructorFunctions.java @@ -521,7 +521,7 @@ public class JavaScriptConstructorFunctions { public URL getURL() { try { return new URL("file://" + fileName); - } catch (MalformedURLException e) { + } catch (@SuppressWarnings("unused") MalformedURLException e) { assert false; return null; } @@ -542,7 +542,7 @@ public class JavaScriptConstructorFunctions { if (fcls != null) return makeFunctionConstructor(cls, fcls); - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { } diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java index 39066398e..ae340afce 100755 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java @@ -262,7 +262,7 @@ public class JavaScriptLoader extends CAstAbstractModuleLoader { byte[] utf8 = field.getBytes("UTF-8"); return PutInstruction(iindex, ref, value, FieldReference.findOrCreate(JavaScriptTypes.Root, Atom.findOrCreate(utf8, 0, utf8.length), JavaScriptTypes.Root)); - } catch (UnsupportedEncodingException e) { + } catch (@SuppressWarnings("unused") UnsupportedEncodingException e) { Assertions.UNREACHABLE(); return null; } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstCallGraph.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstCallGraph.java index c34f0d5d4..b343be297 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstCallGraph.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstCallGraph.java @@ -99,7 +99,7 @@ public class AstCallGraph extends ExplicitCallGraph { for (Iterator> x = callbacks.iterator(); x.hasNext();) { x.next().apply(null); } - } catch (ConcurrentModificationException e) { + } catch (@SuppressWarnings("unused") ConcurrentModificationException e) { done = false; continue; } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java index e62fd1b18..0f1454a13 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java @@ -444,7 +444,7 @@ public abstract class AstSSAPropagationCallGraphBuilder extends SSAPropagationCa String fieldName = null; try { fieldName = inst.getDeclaredField().getName().toUnicodeString(); - } catch (UTFDataFormatException e) { + } catch (@SuppressWarnings("unused") UTFDataFormatException e) { Assertions.UNREACHABLE(); } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java index ec451fc84..927a38f9a 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java @@ -73,7 +73,7 @@ public class CAstCallGraphUtil { System.err.println("removing BOM " + bs.getBOM()); } return bs; - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { return super.getInputStream(); } } @@ -150,7 +150,7 @@ public class CAstCallGraphUtil { PointerKey n = (PointerKey) x.next(); try { System.err.println((n + " --> " + PA.getPointsToSet(n))); - } catch (Throwable e) { + } catch (@SuppressWarnings("unused") Throwable e) { System.err.println(("error computing set for " + n)); } } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java index 4c7e54a9e..af39337b5 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java @@ -57,7 +57,7 @@ abstract public class AstFunctionClass implements IClass, ClassConstants { public String toString() { try { return "function " + functionBody.getReference().getDeclaringClass().getName(); - } catch (NullPointerException e) { + } catch (@SuppressWarnings("unused") NullPointerException e) { return ""; } } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractLoader.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractLoader.java index 3b5f5df4e..e4c21dfe7 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractLoader.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractLoader.java @@ -177,7 +177,7 @@ public abstract class CAstAbstractLoader implements IClassLoader { public Reader getSource(IClass klass) { try { return ((AstClass)klass).getSourcePosition().getReader(); - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { return null; } } @@ -186,7 +186,7 @@ public abstract class CAstAbstractLoader implements IClassLoader { public Reader getSource(IMethod method, int bcOffset) { try { return ((AstMethod)method).getSourcePosition(bcOffset).getReader(); - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { return null; } } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/SingleClassLoaderFactory.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/SingleClassLoaderFactory.java index 052eea4d6..088bb2e1d 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/SingleClassLoaderFactory.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/SingleClassLoaderFactory.java @@ -34,7 +34,7 @@ public abstract class SingleClassLoaderFactory implements ClassLoaderFactory { THE_LOADER = makeTheLoader(cha); try { THE_LOADER.init(scope.getModules(getTheReference())); - } catch (java.io.IOException e) { + } catch (@SuppressWarnings("unused") java.io.IOException e) { Assertions.UNREACHABLE(); } } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstImpl.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstImpl.java index 86c265f4a..a42000a03 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstImpl.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstImpl.java @@ -60,7 +60,7 @@ public class CAstImpl implements CAst { public CAstNode getChild(int n) { try { return cs[n]; - } catch (ArrayIndexOutOfBoundsException e) { + } catch (@SuppressWarnings("unused") ArrayIndexOutOfBoundsException e) { throw new NoSuchElementException(n + " of " + CAstPrinter.print(this)); } } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPrinter.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPrinter.java index 2651647e3..0ad7b2b57 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPrinter.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPrinter.java @@ -259,7 +259,7 @@ public class CAstPrinter { w.write("\n"); } } - } catch (java.io.IOException e) { + } catch (@SuppressWarnings("unused") java.io.IOException e) { } } diff --git a/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass1.java b/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass1.java index 449200d62..394cfc9f1 100644 --- a/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass1.java +++ b/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass1.java @@ -33,7 +33,7 @@ public class TypeAnnotatedClass1 extends @TypeAnnotationTypeUse Object { try { throw new NullPointerException(); - } catch (@TypeAnnotationTypeUse RuntimeException e) { + } catch (@SuppressWarnings("unused") @TypeAnnotationTypeUse RuntimeException e) { x = 911; } diff --git a/com.ibm.wala.core.testdata/src/dynamicCG/MainClass.java b/com.ibm.wala.core.testdata/src/dynamicCG/MainClass.java index cd4cd336b..27d33c675 100644 --- a/com.ibm.wala.core.testdata/src/dynamicCG/MainClass.java +++ b/com.ibm.wala.core.testdata/src/dynamicCG/MainClass.java @@ -29,7 +29,7 @@ public class MainClass { private String toStringImpl() { try { return "mc:" + x.toString(); - } catch (NullPointerException e) { + } catch (@SuppressWarnings("unused") NullPointerException e) { return callSomething(x); } } diff --git a/com.ibm.wala.core.testdata/src/exceptionpruning/TestPruning.java b/com.ibm.wala.core.testdata/src/exceptionpruning/TestPruning.java index b78f70b7c..d342d9a9c 100644 --- a/com.ibm.wala.core.testdata/src/exceptionpruning/TestPruning.java +++ b/com.ibm.wala.core.testdata/src/exceptionpruning/TestPruning.java @@ -19,7 +19,7 @@ public class TestPruning { invokeSingleRecursive2(i); break; } - } catch (OwnException e) { + } catch (@SuppressWarnings("unused") OwnException e) { } } @@ -37,7 +37,7 @@ public class TestPruning { case 4: res = a[5]; } - } catch (ArrayIndexOutOfBoundsException e) { + } catch (@SuppressWarnings("unused") ArrayIndexOutOfBoundsException e) { } @@ -56,7 +56,7 @@ public class TestPruning { invokeAllPassThrough(); break; } - } catch (RuntimeException e) { + } catch (@SuppressWarnings("unused") RuntimeException e) { } } @@ -86,9 +86,9 @@ public class TestPruning { invokeAllPassThrough(); break; } - } catch (ArrayIndexOutOfBoundsException e) { + } catch (@SuppressWarnings("unused") ArrayIndexOutOfBoundsException e) { - } catch (OwnException e) { + } catch (@SuppressWarnings("unused") OwnException e) { } return res; diff --git a/com.ibm.wala.core.testdata/src/slice/TestCD3.java b/com.ibm.wala.core.testdata/src/slice/TestCD3.java index 323d99344..5330d55c0 100644 --- a/com.ibm.wala.core.testdata/src/slice/TestCD3.java +++ b/com.ibm.wala.core.testdata/src/slice/TestCD3.java @@ -29,7 +29,7 @@ public class TestCD3 { System.out.println("Y"); } } - } catch (Throwable e) { + } catch (@SuppressWarnings("unused") Throwable e) { } doNothing(I); } diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java index 0f8cca5d3..64a5afd2c 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java @@ -41,7 +41,7 @@ public class DupFieldsTest extends WalaTestCase { boolean threwException = false; try { klass.getField(Atom.findOrCreateUnicodeAtom("a")); - } catch (IllegalStateException e) { + } catch (@SuppressWarnings("unused") IllegalStateException e) { threwException = true; } Assert.assertTrue(threwException); diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java index d42f0967f..804d6aa0d 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java @@ -121,7 +121,7 @@ public class SimpleThreadEscapeAnalysis extends AbstractAnalysisEngine, CGNode, Pair> result = null; try { result = solver.solve(); - } catch (CancelException e) { + } catch (@SuppressWarnings("unused") CancelException e) { // this shouldn't happen assert false; } diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/IntraprocReachingDefs.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/IntraprocReachingDefs.java index e71bd3f0a..2baa335fe 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/IntraprocReachingDefs.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/IntraprocReachingDefs.java @@ -160,7 +160,7 @@ public class IntraprocReachingDefs { BitVectorSolver solver = new BitVectorSolver<>(framework); try { solver.solve(null); - } catch (CancelException e) { + } catch (@SuppressWarnings("unused") CancelException e) { // this shouldn't happen assert false; } diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/StaticInitializer.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/StaticInitializer.java index 76f021e40..bb6cea02f 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/StaticInitializer.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/StaticInitializer.java @@ -363,7 +363,7 @@ public class StaticInitializer { TabulationResult, CGNode, IClass> result = null; try { result = solver.solve(); - } catch (CancelException e) { + } catch (@SuppressWarnings("unused") CancelException e) { // this shouldn't happen assert false; } diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/IntraproceduralNullPointerAnalysis.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/IntraproceduralNullPointerAnalysis.java index 4734a6279..201e7f9d6 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/IntraproceduralNullPointerAnalysis.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/IntraproceduralNullPointerAnalysis.java @@ -43,7 +43,7 @@ public class IntraproceduralNullPointerAnalysis { paramValNum, ir, cfg.entry()); try { this.solver.solve(NO_PROGRESS_MONITOR); - } catch (final CancelException e) { + } catch (@SuppressWarnings("unused") final CancelException e) { // can't happen as we have no monitor } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationSelector.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationSelector.java index cc6aa32b5..ac7dfe96c 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationSelector.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationSelector.java @@ -97,7 +97,7 @@ class ReflectiveInvocationSelector implements ContextSelector { } else { return new IllegalArgumentExceptionContext(); } - } catch (IllegalArgumentException e) { + } catch (@SuppressWarnings("unused") IllegalArgumentException e) { return new ReceiverInstanceContext(receiver[0]); } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeInference.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeInference.java index 38da0c3d9..06d3a7512 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeInference.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeInference.java @@ -213,7 +213,7 @@ public class TypeInference extends SSAInference implements FixedPo } catch (InvalidClassFileException e) { e.printStackTrace(); Assertions.UNREACHABLE(); - } catch (UnsupportedOperationException e) { + } catch (@SuppressWarnings("unused") UnsupportedOperationException e) { x = new TypeReference[]{ language.getThrowableType() }; } if (x != null) { diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractNestedJarFileModule.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractNestedJarFileModule.java index 8deba7cdc..2bd9d28a8 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractNestedJarFileModule.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractNestedJarFileModule.java @@ -76,7 +76,7 @@ public abstract class AbstractNestedJarFileModule implements Module { cache.put(name, bb); } } - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { // just go with what we have Warnings.add(new Warning() { diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java index 631fe32e6..12ceb3194 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java @@ -43,7 +43,7 @@ public abstract class AbstractURLModule implements Module, ModuleEntry { return ((JarURLConnection) con).getEntryName(); else return (new FileProvider()).filePathFromURL(url); - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { Assertions.UNREACHABLE(); return null; } @@ -53,7 +53,7 @@ public abstract class AbstractURLModule implements Module, ModuleEntry { public InputStream getInputStream() { try { return url.openConnection().getInputStream(); - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { Assertions.UNREACHABLE(); return null; } diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/BinaryDirectoryTreeModule.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/BinaryDirectoryTreeModule.java index 9dead1d0e..a954f18bd 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/BinaryDirectoryTreeModule.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/BinaryDirectoryTreeModule.java @@ -34,7 +34,7 @@ public class BinaryDirectoryTreeModule extends DirectoryTreeModule { protected FileModule makeFile(final File file) { try { return new ClassFileModule(file, this); - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { Warnings.add(new Warning(Warning.MODERATE) { @Override diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java index 12b0b98a4..b9fb5875f 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java @@ -98,7 +98,7 @@ public class ClassLoaderFactoryImpl implements ClassLoaderFactory { Constructor ctor = impl.getDeclaredConstructor(new Class[] { ClassLoaderReference.class, IClassLoader.class, SetOfClasses.class, IClassHierarchy.class }); cl = (IClassLoader) ctor.newInstance(new Object[] { classLoaderReference, parent, exclusions, cha }); - } catch (Exception e) { + } catch (@SuppressWarnings("unused") Exception e) { try { Class impl = Class.forName(implClass); Constructor ctor = impl.getDeclaredConstructor(new Class[] { ClassLoaderReference.class, ArrayClassLoader.class, diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java index 5150292db..01f7d43de 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java @@ -296,7 +296,7 @@ public class ClassLoaderImpl implements IClassLoader { Warnings.add(InvalidClassFile.create(className)); } } - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { if (DEBUG_LEVEL > 0) { System.err.println("Ignoring class " + className + " due to InvalidClassFileException"); } @@ -568,13 +568,13 @@ public class ClassLoaderImpl implements IClassLoader { while (n != -1) { n = s.read(b); } - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { } finally { try { if (s != null) { s.close(); } - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { } } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java index 884695b62..4e98b1cee 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java @@ -74,7 +74,7 @@ public class JarStreamModule extends JarInputStream implements Module { cache.put(name, bb); } } - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { // just go with what we have Warnings.add(new Warning() { diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java index 6d775f9f5..dd54acb3a 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java @@ -369,7 +369,7 @@ public abstract class ShrikeBTMethod implements IMethod, BytecodeConstants { ImmutableByteArray desc = ImmutableByteArray.make(getMethodSignature()); Descriptor D = Descriptor.findOrCreate(declaringClass.getClassLoader().getLanguage(), desc); return MethodReference.findOrCreate(declaringClass.getReference(), name, D); - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { Assertions.UNREACHABLE(); return null; } @@ -804,7 +804,7 @@ public abstract class ShrikeBTMethod implements IMethod, BytecodeConstants { result[i] = TypeReference.findOrCreate(loader, TypeName.findOrCreate(ImmutableByteArray.make("L" + strings[i]))); } return result; - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { Assertions.UNREACHABLE(); return null; } @@ -833,7 +833,7 @@ public abstract class ShrikeBTMethod implements IMethod, BytecodeConstants { public int getLineNumber(int bcIndex) { try { return (getBCInfo().lineNumberMap == null) ? -1 : getBCInfo().lineNumberMap[bcIndex]; - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { return -1; } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java index 5f9a5a197..ecbfe7f8b 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java @@ -106,7 +106,7 @@ public final class ShrikeCTMethod extends ShrikeBTMethod implements IBytecodeMet final Decoder d = new CTDecoder(reader); try { d.decode(); - } catch (Decoder.InvalidBytecodeException ex) { + } catch (@SuppressWarnings("unused") Decoder.InvalidBytecodeException ex) { Assertions.UNREACHABLE(); } return d; @@ -279,7 +279,7 @@ public final class ShrikeCTMethod extends ShrikeBTMethod implements IBytecodeMet int[][] map = null; try { map = getBCInfo().localVariableMap; - } catch (InvalidClassFileException e1) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e1) { return null; } @@ -488,7 +488,7 @@ public final class ShrikeCTMethod extends ShrikeBTMethod implements IBytecodeMet try { result.addAll(getAnnotations(true)); result.addAll(getAnnotations(false)); - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { } return result; diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java index bb7c56b5a..f83b87500 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java @@ -143,7 +143,7 @@ public final class ShrikeClass extends JVMClass { if (s != null) { superName = ImmutableByteArray.make("L" + s); } - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { Assertions.UNREACHABLE(); } } @@ -161,7 +161,7 @@ public final class ShrikeClass extends JVMClass { for (int i = 0; i < interfaceNames.length; i++) { interfaceNames[i] = ImmutableByteArray.make("L" + s[i]); } - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { Assertions.UNREACHABLE(); } } @@ -257,7 +257,7 @@ public final class ShrikeClass extends JVMClass { try { result.addAll(getAnnotations(true)); result.addAll(getAnnotations(false)); - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { } return result; @@ -313,7 +313,7 @@ public final class ShrikeClass extends JVMClass { return reader.getReader(iter); } } - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { Assertions.UNREACHABLE(); } return null; @@ -333,7 +333,7 @@ public final class ShrikeClass extends JVMClass { break; } } - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { Assertions.UNREACHABLE(); } return result; @@ -432,7 +432,7 @@ public final class ShrikeClass extends JVMClass { break; } } - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { Assertions.UNREACHABLE(); } return result; diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java index d3dff84c6..435079306 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java @@ -124,7 +124,7 @@ public class ShrikeIRFactory implements IRFactory { } else { return "(line " + lineNumber + ")"; } - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { return ""; } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java b/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java index 111d04590..b0096cef3 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java +++ b/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java @@ -185,7 +185,7 @@ public class DemandRefinementPointsTo extends AbstractDemandPointsTo { CallSiteReference site = iterator.next(); try { caller.getIR().getCalls(site); - } catch (IllegalArgumentException e) { + } catch (@SuppressWarnings("unused") IllegalArgumentException e) { System.err.println(caller + " is pred of " + callee); System.err.println("no calls at site " + site); System.err.println(caller.getIR()); @@ -338,13 +338,13 @@ public class DemandRefinementPointsTo extends AbstractDemandPointsTo { } completedPassInBudget = true; break; - } catch (StatesMergedException e) { + } catch (@SuppressWarnings("unused") StatesMergedException e) { if (DEBUG) { System.err.println("restarting..."); } } } - } catch (BudgetExceededException e) { + } catch (@SuppressWarnings("unused") BudgetExceededException e) { } if (curP2Set != null) { @@ -446,7 +446,7 @@ public class DemandRefinementPointsTo extends AbstractDemandPointsTo { completedPassInBudget = true; completedSomePass = true; break; - } catch (StatesMergedException e) { + } catch (@SuppressWarnings("unused") StatesMergedException e) { if (DEBUG) { System.err.println("restarting..."); } @@ -466,7 +466,7 @@ public class DemandRefinementPointsTo extends AbstractDemandPointsTo { } } - } catch (BudgetExceededException e) { + } catch (@SuppressWarnings("unused") BudgetExceededException e) { } if (completedPassInBudget) { @@ -585,13 +585,13 @@ public class DemandRefinementPointsTo extends AbstractDemandPointsTo { System.err.println("FLOWS-TO SET " + curFlowsToSet); } break; - } catch (StatesMergedException e) { + } catch (@SuppressWarnings("unused") StatesMergedException e) { if (DEBUG) { System.err.println("restarting..."); } } } - } catch (BudgetExceededException e) { + } catch (@SuppressWarnings("unused") BudgetExceededException e) { } if (curFlowsToSet != null) { diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java index 36c2f6794..b1b0c4272 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java @@ -408,7 +408,7 @@ public class AnalysisScope { Assertions.UNREACHABLE("Manifest for " + rtJar.getName() + " has no value for Specification-Version"); } return result; - } catch (java.io.IOException e) { + } catch (@SuppressWarnings("unused") java.io.IOException e) { Assertions.UNREACHABLE("error getting rt.jar manifest!"); return null; } diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java index 4f294cc7e..afaf4272d 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java @@ -727,7 +727,7 @@ public abstract class PropagationCallGraphBuilder implements CallGraphBuilder 0) { System.err.println(("FileProvider got url: " + url + " for " + fileName)); @@ -206,7 +206,7 @@ public class FileProvider { try { URI uri = new File(URLDecoder.decode(url.getPath(), "UTF-8")).toURI(); return uri.getPath(); - } catch (UnsupportedEncodingException e) { + } catch (@SuppressWarnings("unused") UnsupportedEncodingException e) { // this really shouldn't happen Assertions.UNREACHABLE(); return null; diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java index 3e8671cdf..93b77b0a7 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java +++ b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java @@ -611,7 +611,7 @@ public class ParameterAccessor { throw new IllegalArgumentException("Class " + asType + " is not a super-class of " + this.method.getParameterType(self)); } - } catch (ClassLookupException e) { + } catch (@SuppressWarnings("unused") ClassLookupException e) { // Cant't test assume all fitts } @@ -1344,7 +1344,7 @@ public class ParameterAccessor { continue forEachParameter; } } - } catch (ClassLookupException e) { + } catch (@SuppressWarnings("unused") ClassLookupException e) { } } @@ -1356,7 +1356,7 @@ public class ParameterAccessor { debug("\t\tAsigning: {} from the callrs params (ass)", cand); continue forEachParameter; } - } catch (ClassLookupException e) { + } catch (@SuppressWarnings("unused") ClassLookupException e) { } } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java index 8738928ab..81e0f1f3f 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java +++ b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java @@ -617,7 +617,7 @@ public class TypeSafeInstructionFactory { public boolean isAssignableFrom(final TypeReference from, final TypeReference to) { try { return ParameterAccessor.isAssignable(from, to, this.cha); - } catch (ClassLookupException e) { + } catch (@SuppressWarnings("unused") ClassLookupException e) { return true; } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java b/com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java index 742dcb380..1ae41d3d6 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java +++ b/com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java @@ -99,7 +99,7 @@ public abstract class UTF8Convert { + (i - 3)); } } - } catch (ArrayIndexOutOfBoundsException e) { + } catch (@SuppressWarnings("unused") ArrayIndexOutOfBoundsException e) { throw new UTFDataFormatException("unexpected end at location " + i); } } @@ -202,7 +202,7 @@ public abstract class UTF8Convert { if (c < '\u0800') return false; } - } catch (ArrayIndexOutOfBoundsException e) { + } catch (@SuppressWarnings("unused") ArrayIndexOutOfBoundsException e) { return false; } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrViewer.java b/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrViewer.java index 3af0ce267..aa745fd7b 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrViewer.java +++ b/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrViewer.java @@ -107,7 +107,7 @@ public class IrViewer extends JPanel{ } lineNum++; } - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { // ??? assert false; } @@ -127,7 +127,7 @@ public class IrViewer extends JPanel{ String pcString = line.substring(0, firstSpace); try { return Integer.parseInt(pcString); - } catch (NumberFormatException e) { + } catch (@SuppressWarnings("unused") NumberFormatException e) { return NA; } } else { diff --git a/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/SourceViewer.java b/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/SourceViewer.java index 67fc9f01e..b5f977fe5 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/SourceViewer.java +++ b/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/SourceViewer.java @@ -75,7 +75,7 @@ public class SourceViewer extends JPanel{ } br.close(); return true; - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { System.err.println("Could not load source at " + url); return false; } diff --git a/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/drivers/APKCallGraphDriver.java b/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/drivers/APKCallGraphDriver.java index 91232a80f..d50591b25 100644 --- a/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/drivers/APKCallGraphDriver.java +++ b/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/drivers/APKCallGraphDriver.java @@ -52,7 +52,7 @@ public class APKCallGraphDriver { try { timeout = Integer.parseInt(args[1]); System.err.println("timeout is " + timeout); - } catch (Throwable e) { + } catch (@SuppressWarnings("unused") Throwable e) { // no timeout specified } FileUtil.recurseFiles(new VoidFunction() { 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 8f3cac8d8..fac9ad296 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 @@ -35,7 +35,7 @@ public class Util { static { try { walaProperties = WalaProperties.loadProperties(); - } catch (WalaException e) { + } catch (@SuppressWarnings("unused") WalaException e) { walaProperties = null; } } diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIClass.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIClass.java index 42b39ad94..c843b3772 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIClass.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIClass.java @@ -400,7 +400,7 @@ public class DexIClass extends BytecodeClass { if (methods == null){ try { computeDeclaredMethods(); - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { } } // return construcorId!=-1?methods[construcorId]:null; diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java index db1e1033e..c3c6aecba 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java @@ -93,7 +93,7 @@ public class DexIRFactory extends DefaultIRFactory { } else { return "(line " + lineNumber + ")"; } - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { return ""; } } diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java index 5a29f3d27..281808deb 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java @@ -193,7 +193,7 @@ public class ReuseParameters { final int localNumber = ssaFor(inCallTo, firstOf(param, inCallTo)); try { withName = inCallTo.getLocalVariableName (bcIndex, localNumber); - } catch (UnsupportedOperationException e) { + } catch (@SuppressWarnings("unused") UnsupportedOperationException e) { // DexIMethod doesn't implement this :( withName = null; diff --git a/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JavaEclipseProjectPath.java b/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JavaEclipseProjectPath.java index 1d8812bc7..1a39c2507 100644 --- a/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JavaEclipseProjectPath.java +++ b/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JavaEclipseProjectPath.java @@ -64,7 +64,7 @@ public class JavaEclipseProjectPath extends EclipseProjectPath { JarFile j; try { j = new JarFile(file); - } catch (ZipException z) { + } catch (@SuppressWarnings("unused") ZipException z) { // a corrupted file. ignore it. return; - } catch (IOException z) { + } catch (@SuppressWarnings("unused") IOException z) { // should ignore directories as well.. return; } @@ -216,7 +216,7 @@ public abstract class EclipseProjectPath { // This is horrible. We can't figure out the race condition yet which causes this to happen. try { Thread.sleep(5000); - } catch (InterruptedException e) { + } catch (@SuppressWarnings("unused") InterruptedException e) { // whatever. } bd = findModel(p).getBundleDescription(); diff --git a/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferGraph.java b/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferGraph.java index 9011369b8..ffa6aae9f 100644 --- a/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferGraph.java +++ b/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferGraph.java @@ -101,7 +101,7 @@ public class PrefixTransferGraph implements Graph { { sbua = new StringBuilderUseAnalysis(k,pa); } - catch(Exception e) + catch(@SuppressWarnings("unused") Exception e) { continue; diff --git a/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/UriPrefixTransferGraph.java b/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/UriPrefixTransferGraph.java index 04ff82477..ac64d4a7a 100644 --- a/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/UriPrefixTransferGraph.java +++ b/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/UriPrefixTransferGraph.java @@ -162,7 +162,7 @@ public class UriPrefixTransferGraph implements Graph { final StringBuilderUseAnalysis sbua; try { sbua = new StringBuilderUseAnalysis(ik, pa); - } catch(Exception e) { + } catch(@SuppressWarnings("unused") Exception e) { return; } diff --git a/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java b/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java index 220c15e2f..c3c5d1863 100644 --- a/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java +++ b/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java @@ -123,7 +123,7 @@ public class DexDotUtil extends DotUtil { // if we get here, the process has terminated repeat = false; - } catch (IllegalThreadStateException e) { + } catch (@SuppressWarnings("unused") IllegalThreadStateException e) { // this means the process has not yet terminated. repeat = true; } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Mangler.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Mangler.java index 049482598..755ad820d 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Mangler.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Mangler.java @@ -65,7 +65,7 @@ public class Mangler { int seed; try { seed = Integer.parseInt(args[0]); - } catch (NumberFormatException ex) { + } catch (@SuppressWarnings("unused") NumberFormatException ex) { System.err.println("Invalid number: " + args[0]); return; } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java index 0f5524b71..2ab4cc04a 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java @@ -69,19 +69,19 @@ public class Runtime { private Runtime(String fileName, String filterFileName, String policyClassName) { try (final FileInputStream in = new FileInputStream(filterFileName)) { filter = new FileOfClasses(in); - } catch (Exception e) { + } catch (@SuppressWarnings("unused") Exception e) { filter = null; } try { output = new PrintWriter(new OutputStreamWriter(new GZIPOutputStream(new FileOutputStream(fileName)), "UTF-8")); - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { output = new PrintWriter(System.err); } try { handleCallback = (Policy) Class.forName(policyClassName).newInstance(); - } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) { + } catch (@SuppressWarnings("unused") InstantiationException | IllegalAccessException | ClassNotFoundException e) { handleCallback = new DefaultCallbackPolicy(); } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Compiler.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Compiler.java index c018df390..da81e69ea 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Compiler.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Compiler.java @@ -1653,7 +1653,7 @@ public abstract class Compiler implements Constants { } else { return p; } - } catch (IllegalArgumentException ex) { + } catch (@SuppressWarnings("unused") IllegalArgumentException ex) { return null; } } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/OfflineInstrumenter.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/OfflineInstrumenter.java index 0b835ca55..81b14be8c 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/OfflineInstrumenter.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/OfflineInstrumenter.java @@ -47,7 +47,7 @@ final public class OfflineInstrumenter extends OfflineInstrumenterBase { protected String getClassName(Object cl) { try { return ((ClassInstrumenter) cl).getReader().getName().replace('/', '.'); - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { return null; } } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/AddSerialVersion.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/AddSerialVersion.java index 8f2c7b742..7390ef3aa 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/AddSerialVersion.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/AddSerialVersion.java @@ -176,7 +176,7 @@ public class AddSerialVersion { } catch (IOException e1) { throw new Error("Unexpected IOException: " + e1.getMessage()); } - } catch (IOException e2) { + } catch (@SuppressWarnings("unused") IOException e2) { } byte[] hash = digest.digest(); @@ -193,11 +193,11 @@ public class AddSerialVersion { byte[] data = Util.readFully(in); ClassReader r = new ClassReader(data); System.out.println(Util.makeClass(r.getName()) + ": serialVersionUID = " + computeSerialVersionUID(r)); - } catch (FileNotFoundException e) { + } catch (@SuppressWarnings("unused") FileNotFoundException e) { System.err.println("File not found: " + args[i]); - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { System.err.println("Error reading file: " + args[i]); - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { System.err.println("Invalid class file: " + args[i]); } } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AnnotationsReader.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AnnotationsReader.java index 3004ff232..d7be4ba91 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AnnotationsReader.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AnnotationsReader.java @@ -383,7 +383,7 @@ public class AnnotationsReader extends AttributeReader { return new AnnotationsReader(iter, attrName); } } - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { Assertions.UNREACHABLE(); } return null; 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 8a4007e26..a0c9d3c68 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 @@ -197,7 +197,7 @@ public final class ClassReader implements ClassConstants { } else { try { return cpParser.getCPClass(c); - } catch (IllegalArgumentException ex) { + } catch (@SuppressWarnings("unused") IllegalArgumentException ex) { throw new InvalidClassFileException(addr, "Invalid class constant pool index: " + c); } } @@ -361,7 +361,7 @@ public final class ClassReader implements ClassConstants { } else { try { return cpParser.getCPUtf8(s); - } catch (IllegalArgumentException ex) { + } catch (@SuppressWarnings("unused") IllegalArgumentException ex) { throw new InvalidClassFileException(addr, "Invalid Utf8 constant pool index: " + s); } } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/TypeAnnotationsReader.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/TypeAnnotationsReader.java index 0d24df2cb..4a9cba785 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/TypeAnnotationsReader.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/TypeAnnotationsReader.java @@ -801,7 +801,7 @@ public class TypeAnnotationsReader extends AnnotationsReader { for (; iter.isValid(); iter.advance()) { if (iter.getName().equals(attrName)) return newReader.apply(); } - } catch (InvalidClassFileException e) { + } catch (@SuppressWarnings("unused") InvalidClassFileException e) { Assertions.UNREACHABLE(); } return null; diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java index e3ac2e63a..3f17d4169 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java @@ -105,7 +105,7 @@ public final class CRTable extends PositionsAttribute { try { short short_pc = (short) (pc & 0xFFFF); sourceInfo = new CRTData(short_pc, short_pc, 0, 0, CRTFlags.CRT_SOURCE_INFO); - } catch (InvalidCRTDataException e) { + } catch (@SuppressWarnings("unused") InvalidCRTDataException e) { assert false; } } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java index 24fa17651..518fc0411 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java @@ -105,12 +105,12 @@ public final class MethodPositions extends PositionsAttribute { Position end = null; try { start = readPosition(in, startVarName); - } catch (InvalidPositionException e) { + } catch (@SuppressWarnings("unused") InvalidPositionException e) { valid = false; } try { end = readPosition(in, endVarName); - } catch (InvalidPositionException e) { + } catch (@SuppressWarnings("unused") InvalidPositionException e) { valid = false; } if (valid) { diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashMap.java b/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashMap.java index d29ee0693..f1dd4278d 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashMap.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashMap.java @@ -54,7 +54,7 @@ public class ParanoidHashMap extends LinkedHashMap { if (method.getDeclaringClass() == Object.class) { assert false : o.getClass().toString(); } - } catch (Exception e) { + } catch (@SuppressWarnings("unused") Exception e) { assert false : "Could not find hashCode method"; } } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/FloydWarshall.java b/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/FloydWarshall.java index e012a41ef..279279813 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/FloydWarshall.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/FloydWarshall.java @@ -124,7 +124,7 @@ public class FloydWarshall { for(int j = 0; j <= G.getMaxNumber(); j++) { try { s += getPath(G.getNode(i), G.getNode(j)); - } catch (UnsupportedOperationException e) { + } catch (@SuppressWarnings("unused") UnsupportedOperationException e) { } } @@ -179,7 +179,7 @@ public class FloydWarshall { for(int j = 0; j <= G.getMaxNumber(); j++) { try { x.add(getPaths(G.getNode(i), G.getNode(j))); - } catch (UnsupportedOperationException e) { + } catch (@SuppressWarnings("unused") UnsupportedOperationException e) { } } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorBase.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorBase.java index 3ab192b56..b6b203b8e 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorBase.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorBase.java @@ -105,7 +105,7 @@ abstract public class BitVectorBase implements Cloneabl BitVectorBase result = null; try { result = (BitVectorBase) super.clone(); - } catch (CloneNotSupportedException e) { + } catch (@SuppressWarnings("unused") CloneNotSupportedException e) { // this shouldn't happen, since we are Cloneable throw new InternalError(); } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/FixedSizeBitVector.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/FixedSizeBitVector.java index b1ecea6e9..f925c3a20 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/FixedSizeBitVector.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/FixedSizeBitVector.java @@ -119,7 +119,7 @@ public final class FixedSizeBitVector implements Cloneable, java.io.Serializable int n = subscript(bit); try { return ((bits[n] & (1 << shiftBits)) != 0); - } catch (ArrayIndexOutOfBoundsException e) { + } catch (@SuppressWarnings("unused") ArrayIndexOutOfBoundsException e) { return false; } } @@ -324,7 +324,7 @@ public final class FixedSizeBitVector implements Cloneable, java.io.Serializable FixedSizeBitVector result = null; try { result = (FixedSizeBitVector) super.clone(); - } catch (CloneNotSupportedException e) { + } catch (@SuppressWarnings("unused") CloneNotSupportedException e) { // this shouldn't happen, since we are Cloneable throw new InternalError(); } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSetUtil.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSetUtil.java index 70c17ae15..28183fab3 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSetUtil.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSetUtil.java @@ -32,7 +32,7 @@ public class IntSetUtil { Class intSetFactoryClass = Class.forName(System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME)); MutableIntSetFactory intSetFactory = (MutableIntSetFactory) intSetFactoryClass.newInstance(); setDefaultIntSetFactory(intSetFactory); - } catch (Exception e) { + } catch (@SuppressWarnings("unused") Exception e) { System.err.println(("Cannot use int set factory " + System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME))); setDefaultIntSetFactory(defaultFactory); } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSetUtil.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSetUtil.java index 6a16822ea..20b5156cd 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSetUtil.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSetUtil.java @@ -29,7 +29,7 @@ public class LongSetUtil { Class intSetFactoryClass = Class.forName(System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME)); MutableLongSetFactory intSetFactory = (MutableLongSetFactory) intSetFactoryClass.newInstance(); setDefaultLongSetFactory(intSetFactory); - } catch (Exception e) { + } catch (@SuppressWarnings("unused") Exception e) { System.err.println(("Cannot use int set factory " + System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME))); setDefaultLongSetFactory(defaultFactory); } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/processes/Launcher.java b/com.ibm.wala.util/src/com/ibm/wala/util/processes/Launcher.java index c45309ba3..9a727764b 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/processes/Launcher.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/processes/Launcher.java @@ -238,7 +238,7 @@ public abstract class Launcher { while (repeat) { try { Thread.sleep(SLEEP_MS); - } catch (InterruptedException e1) { + } catch (@SuppressWarnings("unused") InterruptedException e1) { // e1.printStackTrace(); // just ignore and continue } @@ -251,7 +251,7 @@ public abstract class Launcher { if (logger != null) { logger.fine("process terminated with exit code " + p.exitValue()); } - } catch (IllegalThreadStateException e) { + } catch (@SuppressWarnings("unused") IllegalThreadStateException e) { // this means the process has not yet terminated. repeat = true; } @@ -280,7 +280,7 @@ public abstract class Launcher { s.read(data); p.print(new String(data)); } - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { // assume the stream has been closed (e.g. the process died) // so, just exit } @@ -298,7 +298,7 @@ public abstract class Launcher { b.write(next); next = s.read(); } - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { // assume the stream has been closed (e.g. the process died) // so, just print the data and then leave } @@ -317,7 +317,7 @@ public abstract class Launcher { int nRead = s.read(data); b.write(data, 0, nRead); } - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { // assume the stream has been closed (e.g. the process died) // so, just exit } @@ -333,7 +333,7 @@ public abstract class Launcher { b.write(next); next = s.read(); } - } catch (IOException e) { + } catch (@SuppressWarnings("unused") IOException e) { // assume the stream has been closed (e.g. the process died) // so, just exit } diff --git a/com.ibm.wala.util/src/com/ibm/wala/viz/DotUtil.java b/com.ibm.wala.util/src/com/ibm/wala/viz/DotUtil.java index 549cfdeef..b3882158c 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/viz/DotUtil.java +++ b/com.ibm.wala.util/src/com/ibm/wala/viz/DotUtil.java @@ -129,7 +129,7 @@ public class DotUtil { // if we get here, the process has terminated repeat = false; System.out.println("process terminated with exit code " + p.exitValue()); - } catch (IllegalThreadStateException e) { + } catch (@SuppressWarnings("unused") IllegalThreadStateException e) { // this means the process has not yet terminated. repeat = true; } From e52d872e3ee13d8b517a114fbb557993430f0fb5 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Sat, 18 Mar 2017 00:41:04 -0500 Subject: [PATCH 6/9] 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; } /** From 67013a0d77d02e8cf48ccdc87a57d3b9ae66d227 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Sat, 18 Mar 2017 00:37:57 -0500 Subject: [PATCH 7/9] Fix 21 Eclipse warnings about unnecessary warning suppressions --- .../ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java | 2 -- .../cast/java/translator/jdt/ecj/ECJSourceModuleTranslator.java | 1 - .../src/com/ibm/wala/cast/java/ipa/slicer/AstJavaSlicer.java | 1 - .../js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java | 1 - .../ipa/callgraph/JavaScriptFunctionApplyContextSelector.java | 1 - .../source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java | 1 - .../java/com/ibm/wala/cast/ir/translator/AstTranslator.java | 1 - .../analysis/dataflow/ContextInsensitiveReachingDefs.java | 1 - .../com/ibm/wala/dalvik/classLoader/ActivityModelMethod.java | 1 - .../src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java | 1 - .../src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java | 1 - .../source/com/ibm/wala/ide/AbstractJavaAnalysisAction.java | 2 -- .../org/scandroid/flow/functions/IDTransferFunctions.java | 2 -- com.ibm.wala.util/src/com/ibm/wala/util/Predicate.java | 2 -- .../src/com/ibm/wala/util/collections/EmptyIterator.java | 1 - .../src/com/ibm/wala/util/collections/IteratorUtil.java | 1 - .../src/com/ibm/wala/util/collections/ToStringComparator.java | 1 - com.ibm.wala.util/src/com/ibm/wala/util/intset/OrdinalSet.java | 1 - 18 files changed, 22 deletions(-) diff --git a/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java b/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java index b6052e671..172a5ee32 100644 --- a/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java +++ b/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java @@ -121,7 +121,6 @@ public class JDTTypeDictionary extends CAstTypeDictionaryImpl { } @Override - @SuppressWarnings("unchecked") public Collection getSupertypes() { if (fEltJdtType.isPrimitive()) return Collections.singleton(getCAstTypeFor(fAst.resolveWellKnownType("java.lang.Object"))); @@ -160,7 +159,6 @@ public class JDTTypeDictionary extends CAstTypeDictionaryImpl { } @Override - @SuppressWarnings("unchecked") public Collection getSupertypes() { if (fSuperTypes == null) { buildSuperTypes(); diff --git a/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJSourceModuleTranslator.java b/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJSourceModuleTranslator.java index e9196a142..fa0607287 100644 --- a/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJSourceModuleTranslator.java +++ b/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJSourceModuleTranslator.java @@ -171,7 +171,6 @@ public class ECJSourceModuleTranslator implements SourceModuleTranslator { * Project -> AST code from org.eclipse.jdt.core.tests.performance */ - @SuppressWarnings("unchecked") @Override public void loadAllSources(Set modules) { List sources = new LinkedList<>(); diff --git a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/slicer/AstJavaSlicer.java b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/slicer/AstJavaSlicer.java index f7476f433..6352142b6 100644 --- a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/slicer/AstJavaSlicer.java +++ b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/slicer/AstJavaSlicer.java @@ -39,7 +39,6 @@ import com.ibm.wala.util.Predicate; import com.ibm.wala.util.collections.Pair; import com.ibm.wala.util.graph.traverse.DFS; -@SuppressWarnings("deprecation") public class AstJavaSlicer extends Slicer { /* diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java index 9bcc40c79..e39def2fb 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java @@ -138,7 +138,6 @@ public abstract class FieldBasedCallGraphBuilder { /** * Extract a call graph from a given flow graph. */ - @SuppressWarnings("deprecation") public JSCallGraph extract(FlowGraph flowgraph, Iterable eps, IProgressMonitor monitor) throws CancelException { DelegatingSSAContextInterpreter interpreter = new DelegatingSSAContextInterpreter(new AstContextInsensitiveSSAContextInterpreter(options, cache), new DefaultSSAInterpreter(options, cache)); return extract(interpreter, flowgraph, eps, monitor); diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextSelector.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextSelector.java index 52c9a8bbe..735f32a85 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextSelector.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextSelector.java @@ -73,7 +73,6 @@ public class JavaScriptFunctionApplyContextSelector implements ContextSelector { */ private final ContextItem.Value isNonNullArray; - @SuppressWarnings("unchecked") ApplyContext(Context delegate, boolean isNonNullArray) { this.delegate = delegate; this.isNonNullArray = ContextItem.Value.make(isNonNullArray); diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java index ae340afce..139beed5c 100755 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java @@ -653,7 +653,6 @@ public class JavaScriptLoader extends CAstAbstractModuleLoader { return JavaScriptTypes.String; } - @SuppressWarnings("static-access") @Override public PrimitiveType getPrimitive(TypeReference reference) { return PrimitiveType.getPrimitive(reference); diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java index 7281e2f04..f4bb25b67 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java @@ -2830,7 +2830,6 @@ public abstract class AstTranslator extends CAstVisitor, Integer>> exposedNamesForReadSet, Set, Integer>> exposedNamesForWriteSet, Set accesses) { diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java index 4d486c2de..88606cbc6 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java @@ -77,7 +77,6 @@ public class ContextInsensitiveReachingDefs { /** * generate a numbering of the putstatic instructions */ - @SuppressWarnings("unchecked") private OrdinalSetMapping> numberPutStatics() { ArrayList> putInstrs = new ArrayList<>(); for (CGNode node : icfg.getCallGraph()) { diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/ActivityModelMethod.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/ActivityModelMethod.java index b8d6237a7..620154773 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/ActivityModelMethod.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/ActivityModelMethod.java @@ -85,7 +85,6 @@ public class ActivityModelMethod extends DexIMethod { } catch (Exception e) { throw new IllegalArgumentException(e); } - @SuppressWarnings("unchecked") Section cldeff = activityModelDF.getSectionForType(TYPE_CLASS_DEF_ITEM); for (ClassDefItem cdefitems : cldeff.getItems()) { if (cdefitems.getClassType().getTypeDescriptor() diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java index c3c6aecba..eb8ccefc3 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java @@ -29,7 +29,6 @@ import com.ibm.wala.ssa.analysis.DeadAssignmentElimination; public class DexIRFactory extends DefaultIRFactory { public final static boolean buildLocalMap = false; - @SuppressWarnings("rawtypes") @Override public ControlFlowGraph makeCFG(IMethod method, Context C) throws IllegalArgumentException { if (method == null) { diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java index 234130802..9dffc861a 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java @@ -138,7 +138,6 @@ public class AndroidManifestXMLReader { /** * Only includes relevant tags. */ - @SuppressWarnings("unchecked") private enum Tag implements HistoryKey { /** * This tag is nat an actual part of the document. diff --git a/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/AbstractJavaAnalysisAction.java b/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/AbstractJavaAnalysisAction.java index 0f6329697..bd1440b23 100644 --- a/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/AbstractJavaAnalysisAction.java +++ b/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/AbstractJavaAnalysisAction.java @@ -84,7 +84,6 @@ public abstract class AbstractJavaAnalysisAction implements IObjectActionDelegat final Collection projectPaths = new LinkedList<>(); Job job = new Job("Compute project paths") { - @SuppressWarnings("unchecked") @Override protected IStatus run(IProgressMonitor monitor) { for (Iterator it = selection.iterator(); it.hasNext();) { @@ -134,7 +133,6 @@ public abstract class AbstractJavaAnalysisAction implements IObjectActionDelegat /** * compute the java projects represented by the current selection */ - @SuppressWarnings("unchecked") protected Collection computeJavaProjects() { IStructuredSelection selection = (IStructuredSelection) currentSelection; Collection projects = HashSetFactory.make(); diff --git a/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/IDTransferFunctions.java b/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/IDTransferFunctions.java index cd9611e93..e07826f19 100644 --- a/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/IDTransferFunctions.java +++ b/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/IDTransferFunctions.java @@ -66,8 +66,6 @@ import com.ibm.wala.util.intset.SparseIntSet; public class IDTransferFunctions implements IFlowFunctionMap> { - @SuppressWarnings("unused") - public static final IntSet EMPTY_SET = new SparseIntSet(); public static final IntSet ZERO_SET = SparseIntSet.singleton(0); diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/Predicate.java b/com.ibm.wala.util/src/com/ibm/wala/util/Predicate.java index a837fce66..a1725583e 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/Predicate.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/Predicate.java @@ -57,12 +57,10 @@ public abstract class Predicate { @SuppressWarnings("rawtypes") public static final Predicate TRUE = FALSE.not(); - @SuppressWarnings("unchecked") public static Predicate truePred() { return TRUE; } - @SuppressWarnings("unchecked") public static Predicate falsePred() { return FALSE; } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/collections/EmptyIterator.java b/com.ibm.wala.util/src/com/ibm/wala/util/collections/EmptyIterator.java index f053dbbed..c7dc89e0f 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/collections/EmptyIterator.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/collections/EmptyIterator.java @@ -22,7 +22,6 @@ public final class EmptyIterator implements Iterator { @SuppressWarnings("rawtypes") private static final EmptyIterator EMPTY = new EmptyIterator(); - @SuppressWarnings("unchecked") public static EmptyIterator instance() { return EMPTY; } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/collections/IteratorUtil.java b/com.ibm.wala.util/src/com/ibm/wala/util/collections/IteratorUtil.java index 8a887d6ec..199f2a300 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/collections/IteratorUtil.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/collections/IteratorUtil.java @@ -46,7 +46,6 @@ public class IteratorUtil { return count; } - @SuppressWarnings("deprecation") public static Iterator filter(Iterator iterator, final Class cls) { return new MapIterator<>( new FilterIterator(iterator, new Predicate() { diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/collections/ToStringComparator.java b/com.ibm.wala.util/src/com/ibm/wala/util/collections/ToStringComparator.java index 161fc3d19..6e4b29bef 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/collections/ToStringComparator.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/collections/ToStringComparator.java @@ -36,7 +36,6 @@ public class ToStringComparator implements Comparator { return o1.toString().compareTo(o2.toString()); } - @SuppressWarnings("unchecked") public static ToStringComparator instance() { return INSTANCE; } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/OrdinalSet.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/OrdinalSet.java index ca6cf4bea..3b620bec6 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/OrdinalSet.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/OrdinalSet.java @@ -29,7 +29,6 @@ public class OrdinalSet implements Iterable { @SuppressWarnings("rawtypes") private final static OrdinalSet EMPTY = new OrdinalSet(); - @SuppressWarnings("unchecked") public static OrdinalSet empty() { return EMPTY; } From 16492c7b78cfa6f2c32ccc050f27df52c26a50c3 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Thu, 23 Mar 2017 16:32:00 -0500 Subject: [PATCH 8/9] Revert "Suppress 157 Eclipse warnings about unused exception parameters" This reverts commit fe9f7a793a1dfb1b0717ae32a08966617622c62c. --- .../src/Exception2.java | 6 +++--- .../ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java | 4 ++-- .../wala/cast/js/test/JSCallGraphBuilderUtil.java | 4 ++-- .../wala/cast/js/html/DefaultSourceExtractor.java | 2 +- .../ibm/wala/cast/js/html/jericho/JerichoTag.java | 2 +- .../cast/js/ipa/callgraph/JSCallGraphUtil.java | 4 ++-- .../JSSSAPropagationCallGraphBuilder.java | 2 +- .../js/ipa/callgraph/LoadFileTargetSelector.java | 6 +++--- .../callgraph/correlations/CorrelationFinder.java | 2 +- .../summaries/JavaScriptConstructorFunctions.java | 4 ++-- .../ibm/wala/cast/js/loader/JavaScriptLoader.java | 2 +- .../ibm/wala/cast/ipa/callgraph/AstCallGraph.java | 2 +- .../AstSSAPropagationCallGraphBuilder.java | 2 +- .../wala/cast/ipa/callgraph/CAstCallGraphUtil.java | 4 ++-- .../com/ibm/wala/cast/loader/AstFunctionClass.java | 2 +- .../ibm/wala/cast/loader/CAstAbstractLoader.java | 4 ++-- .../wala/cast/loader/SingleClassLoaderFactory.java | 2 +- .../java/com/ibm/wala/cast/tree/impl/CAstImpl.java | 2 +- .../java/com/ibm/wala/cast/util/CAstPrinter.java | 2 +- .../src/annotations/TypeAnnotatedClass1.java | 2 +- .../src/dynamicCG/MainClass.java | 2 +- .../src/exceptionpruning/TestPruning.java | 10 +++++----- com.ibm.wala.core.testdata/src/slice/TestCD3.java | 2 +- .../com/ibm/wala/core/tests/cha/DupFieldsTest.java | 2 +- .../analysis/SimpleThreadEscapeAnalysis.java | 2 +- .../dataflow/ContextInsensitiveReachingDefs.java | 2 +- .../dataflow/ContextSensitiveReachingDefs.java | 2 +- .../analysis/dataflow/IntraprocReachingDefs.java | 2 +- .../analysis/dataflow/StaticInitializer.java | 2 +- .../IntraproceduralNullPointerAnalysis.java | 2 +- .../reflection/ReflectiveInvocationSelector.java | 2 +- .../wala/analysis/typeInference/TypeInference.java | 2 +- .../classLoader/AbstractNestedJarFileModule.java | 2 +- .../ibm/wala/classLoader/AbstractURLModule.java | 4 ++-- .../classLoader/BinaryDirectoryTreeModule.java | 2 +- .../wala/classLoader/ClassLoaderFactoryImpl.java | 2 +- .../com/ibm/wala/classLoader/ClassLoaderImpl.java | 6 +++--- .../com/ibm/wala/classLoader/JarStreamModule.java | 2 +- .../com/ibm/wala/classLoader/ShrikeBTMethod.java | 6 +++--- .../com/ibm/wala/classLoader/ShrikeCTMethod.java | 6 +++--- .../src/com/ibm/wala/classLoader/ShrikeClass.java | 12 ++++++------ .../com/ibm/wala/classLoader/ShrikeIRFactory.java | 2 +- .../demandpa/alg/DemandRefinementPointsTo.java | 14 +++++++------- .../com/ibm/wala/ipa/callgraph/AnalysisScope.java | 2 +- .../propagation/PropagationCallGraphBuilder.java | 2 +- .../propagation/rta/AbstractRTABuilder.java | 2 +- .../com/ibm/wala/properties/WalaProperties.java | 2 +- com.ibm.wala.core/src/com/ibm/wala/ssa/DefUse.java | 2 +- .../src/com/ibm/wala/ssa/SymbolTable.java | 2 +- .../ibm/wala/types/annotations/TypeAnnotation.java | 6 +++--- .../src/com/ibm/wala/util/ProgressMaster.java | 4 ++-- .../ibm/wala/util/config/AnalysisScopeReader.java | 2 +- .../src/com/ibm/wala/util/io/FileProvider.java | 4 ++-- .../com/ibm/wala/util/ssa/ParameterAccessor.java | 6 +++--- .../wala/util/ssa/TypeSafeInstructionFactory.java | 2 +- .../src/com/ibm/wala/util/strings/UTF8Convert.java | 4 ++-- .../src/com/ibm/wala/viz/viewer/IrViewer.java | 4 ++-- .../src/com/ibm/wala/viz/viewer/SourceViewer.java | 2 +- .../wala/dalvik/drivers/APKCallGraphDriver.java | 2 +- .../source/com/ibm/wala/dalvik/test/util/Util.java | 2 +- .../com/ibm/wala/dalvik/classLoader/DexIClass.java | 2 +- .../ibm/wala/dalvik/classLoader/DexIRFactory.java | 2 +- .../androidModel/parameters/ReuseParameters.java | 2 +- .../ibm/wala/ide/util/JavaEclipseProjectPath.java | 2 +- .../source/com/ibm/wala/ide/util/JdtUtil.java | 8 ++++---- .../ibm/wala/ide/util/EclipseWebProjectPath.java | 2 +- .../ide/util/JavaScriptEclipseProjectPath.java | 2 +- .../ibm/wala/ide/util/JavaScriptHeadlessUtil.java | 2 +- .../source/com/ibm/wala/ide/util/JsdtUtil.java | 4 ++-- .../client/EclipseProjectSourceAnalysisEngine.java | 4 ++-- .../src/com/ibm/wala/ide/plugin/CorePlugin.java | 4 ++-- .../com/ibm/wala/ide/util/EclipseFileProvider.java | 4 ++-- .../com/ibm/wala/ide/util/EclipseProjectPath.java | 6 +++--- .../prefixtransfer/PrefixTransferGraph.java | 2 +- .../prefixtransfer/UriPrefixTransferGraph.java | 2 +- .../source/org/scandroid/util/DexDotUtil.java | 2 +- .../src/com/ibm/wala/shrike/bench/Mangler.java | 2 +- .../src/com/ibm/wala/shrike/cg/Runtime.java | 6 +++--- .../src/com/ibm/wala/shrikeBT/Compiler.java | 2 +- .../shrikeBT/shrikeCT/OfflineInstrumenter.java | 2 +- .../shrikeBT/shrikeCT/tools/AddSerialVersion.java | 8 ++++---- .../com/ibm/wala/shrikeCT/AnnotationsReader.java | 2 +- .../src/com/ibm/wala/shrikeCT/ClassReader.java | 4 ++-- .../ibm/wala/shrikeCT/TypeAnnotationsReader.java | 2 +- .../src/com/ibm/wala/sourcepos/CRTable.java | 2 +- .../com/ibm/wala/sourcepos/MethodPositions.java | 4 ++-- .../ibm/wala/util/collections/ParanoidHashMap.java | 2 +- .../wala/util/graph/traverse/FloydWarshall.java | 4 ++-- .../com/ibm/wala/util/intset/BitVectorBase.java | 2 +- .../ibm/wala/util/intset/FixedSizeBitVector.java | 4 ++-- .../src/com/ibm/wala/util/intset/IntSetUtil.java | 2 +- .../src/com/ibm/wala/util/intset/LongSetUtil.java | 2 +- .../src/com/ibm/wala/util/processes/Launcher.java | 12 ++++++------ .../src/com/ibm/wala/viz/DotUtil.java | 2 +- 94 files changed, 157 insertions(+), 157 deletions(-) diff --git a/com.ibm.wala.cast.java.test.data/src/Exception2.java b/com.ibm.wala.cast.java.test.data/src/Exception2.java index 14e504468..dd0e4b319 100644 --- a/com.ibm.wala.cast.java.test.data/src/Exception2.java +++ b/com.ibm.wala.cast.java.test.data/src/Exception2.java @@ -28,7 +28,7 @@ public final class Exception2 { while ( (data = fis.read()) != -1 ) { fos.write(data); } - } catch (@SuppressWarnings("unused") FileNotFoundException e) { + } catch (FileNotFoundException e) { System.err.println( "File not found" ); // whatever } catch (IOException e) { @@ -38,14 +38,14 @@ public final class Exception2 { if (fis != null) { try { fis.close(); - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { System.exit(-1); } } if (fos != null) { try { fos.close(); - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { System.exit(-1); } } diff --git a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java index 0136b81aa..c07de7174 100644 --- a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java +++ b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java @@ -86,7 +86,7 @@ public class HTMLCGBuilder { URL url = null; try { url = toUrl(src); - } catch (@SuppressWarnings("unused") MalformedURLException e1) { + } catch (MalformedURLException e1) { Assert.fail("Could not find page to analyse: " + src); } com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil.setTranslatorFactory(new CAstRhinoTranslatorFactory()); @@ -129,7 +129,7 @@ public class HTMLCGBuilder { File f = (new FileProvider()).getFileFromClassLoader(src, HTMLCGBuilder.class.getClassLoader()); URL url = f.toURI().toURL(); return url; - } catch (@SuppressWarnings("unused") FileNotFoundException fnfe) { + } catch (FileNotFoundException fnfe) { return new URL(src); } } diff --git a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java index d711e6f6a..5de0961e2 100644 --- a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java +++ b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java @@ -108,7 +108,7 @@ public class JSCallGraphBuilderUtil extends com.ibm.wala.cast.js.ipa.callgraph.J FileProvider provider = new FileProvider(); try { f = provider.getFile(dir + File.separator + name, loader); - } catch (@SuppressWarnings("unused") FileNotFoundException e) { + } catch (FileNotFoundException e) { // I guess we need to do this on Windows sometimes? --MS // if this fails, we won't catch the exception f = provider.getFile(dir + "/" + name, JSCallGraphBuilderUtil.class.getClassLoader()); @@ -239,7 +239,7 @@ public class JSCallGraphBuilderUtil extends com.ibm.wala.cast.js.ipa.callgraph.J builder.setContextSelector(new PropertyNameContextSelector(builder.getAnalysisCache(), 2, builder.getContextSelector())); return builder; - } catch (@SuppressWarnings("unused") ClassHierarchyException e) { + } catch (ClassHierarchyException e) { Assert.assertTrue("internal error building class hierarchy", false); return null; } diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java index bcd60a6c2..ca13b3c1d 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java @@ -62,7 +62,7 @@ public class DefaultSourceExtractor extends DomLessSourceExtractor{ if (v != null && v.startsWith("javascript:")) { try { writeEntrypoint(" " + v.substring(11), e.getValue().snd, new URL(tag.getElementPosition().getURL().toString() + "#" + a), true); - } catch (@SuppressWarnings("unused") MalformedURLException ex) { + } catch (MalformedURLException ex) { writeEntrypoint(v.substring(11), e.getValue().snd, entrypointUrl, false); } } diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java index 248e514f5..e9dd61d93 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java @@ -81,7 +81,7 @@ public class JerichoTag implements ITag { public URL getURL() { try { return new URL("file://" + sourceFile); - } catch (@SuppressWarnings("unused") MalformedURLException e) { + } catch (MalformedURLException e) { return null; } } 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 a950fb26d..7a314c1a8 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 @@ -226,10 +226,10 @@ public class JSCallGraphUtil extends com.ibm.wala.cast.ipa.callgraph.CAstCallGra cha.addClass(fcls); } return names; - } catch (@SuppressWarnings("unused") Error e) { + } catch (Error e) { return Collections.emptySet(); } - } catch (@SuppressWarnings("unused") RuntimeException e) { + } catch (RuntimeException e) { return Collections.emptySet(); } } diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java index d7c0180e1..b9600fb76 100755 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java @@ -203,7 +203,7 @@ public class JSSSAPropagationCallGraphBuilder extends AstSSAPropagationCallGraph try { byte[] utf8 = "__proto__".getBytes("UTF-8"); x = FieldReference.findOrCreate(JavaScriptTypes.Root, Atom.findOrCreate(utf8, 0, utf8.length), JavaScriptTypes.Root); - } catch (@SuppressWarnings("unused") UnsupportedEncodingException e) { + } catch (UnsupportedEncodingException e) { assert false; } prototypeRef = x; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java index 28ca33c5c..87d82b9e3 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java @@ -81,11 +81,11 @@ public class LoadFileTargetSelector implements MethodTargetSelector { IClass script = builder.getClassHierarchy().lookupClass(TypeReference.findOrCreate(cl.getReference(), "L" + url.getFile())); return script.getMethod(JavaScriptMethods.fnSelector); } - } catch (@SuppressWarnings("unused") MalformedURLException e1) { + } catch (MalformedURLException e1) { // do nothing, fall through and return 'target' - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { // do nothing, fall through and return 'target' - } catch (@SuppressWarnings("unused") RuntimeException e) { + } catch (RuntimeException e) { // do nothing, fall through and return 'target' } } diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java index 90357b121..9afe0ac95 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java @@ -291,7 +291,7 @@ public class CorrelationFinder { IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, JavaScriptLoader.JS); try { Util.checkForFrontEndErrors(cha); - } catch (@SuppressWarnings("unused") WalaException e) { + } catch (WalaException e) { return Collections.emptyMap(); } IRFactory factory = AstIRFactory.makeDefaultFactory(); diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/summaries/JavaScriptConstructorFunctions.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/summaries/JavaScriptConstructorFunctions.java index ff8e2d352..5bd749d17 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/summaries/JavaScriptConstructorFunctions.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/summaries/JavaScriptConstructorFunctions.java @@ -521,7 +521,7 @@ public class JavaScriptConstructorFunctions { public URL getURL() { try { return new URL("file://" + fileName); - } catch (@SuppressWarnings("unused") MalformedURLException e) { + } catch (MalformedURLException e) { assert false; return null; } @@ -542,7 +542,7 @@ public class JavaScriptConstructorFunctions { if (fcls != null) return makeFunctionConstructor(cls, fcls); - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { } diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java index 139beed5c..389ae075e 100755 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java @@ -262,7 +262,7 @@ public class JavaScriptLoader extends CAstAbstractModuleLoader { byte[] utf8 = field.getBytes("UTF-8"); return PutInstruction(iindex, ref, value, FieldReference.findOrCreate(JavaScriptTypes.Root, Atom.findOrCreate(utf8, 0, utf8.length), JavaScriptTypes.Root)); - } catch (@SuppressWarnings("unused") UnsupportedEncodingException e) { + } catch (UnsupportedEncodingException e) { Assertions.UNREACHABLE(); return null; } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstCallGraph.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstCallGraph.java index b343be297..c34f0d5d4 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstCallGraph.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstCallGraph.java @@ -99,7 +99,7 @@ public class AstCallGraph extends ExplicitCallGraph { for (Iterator> x = callbacks.iterator(); x.hasNext();) { x.next().apply(null); } - } catch (@SuppressWarnings("unused") ConcurrentModificationException e) { + } catch (ConcurrentModificationException e) { done = false; continue; } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java index 0f1454a13..e62fd1b18 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java @@ -444,7 +444,7 @@ public abstract class AstSSAPropagationCallGraphBuilder extends SSAPropagationCa String fieldName = null; try { fieldName = inst.getDeclaredField().getName().toUnicodeString(); - } catch (@SuppressWarnings("unused") UTFDataFormatException e) { + } catch (UTFDataFormatException e) { Assertions.UNREACHABLE(); } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java index 927a38f9a..ec451fc84 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java @@ -73,7 +73,7 @@ public class CAstCallGraphUtil { System.err.println("removing BOM " + bs.getBOM()); } return bs; - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { return super.getInputStream(); } } @@ -150,7 +150,7 @@ public class CAstCallGraphUtil { PointerKey n = (PointerKey) x.next(); try { System.err.println((n + " --> " + PA.getPointsToSet(n))); - } catch (@SuppressWarnings("unused") Throwable e) { + } catch (Throwable e) { System.err.println(("error computing set for " + n)); } } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java index af39337b5..4c7e54a9e 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java @@ -57,7 +57,7 @@ abstract public class AstFunctionClass implements IClass, ClassConstants { public String toString() { try { return "function " + functionBody.getReference().getDeclaringClass().getName(); - } catch (@SuppressWarnings("unused") NullPointerException e) { + } catch (NullPointerException e) { return ""; } } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractLoader.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractLoader.java index e4c21dfe7..3b5f5df4e 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractLoader.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractLoader.java @@ -177,7 +177,7 @@ public abstract class CAstAbstractLoader implements IClassLoader { public Reader getSource(IClass klass) { try { return ((AstClass)klass).getSourcePosition().getReader(); - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { return null; } } @@ -186,7 +186,7 @@ public abstract class CAstAbstractLoader implements IClassLoader { public Reader getSource(IMethod method, int bcOffset) { try { return ((AstMethod)method).getSourcePosition(bcOffset).getReader(); - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { return null; } } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/SingleClassLoaderFactory.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/SingleClassLoaderFactory.java index 088bb2e1d..052eea4d6 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/SingleClassLoaderFactory.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/SingleClassLoaderFactory.java @@ -34,7 +34,7 @@ public abstract class SingleClassLoaderFactory implements ClassLoaderFactory { THE_LOADER = makeTheLoader(cha); try { THE_LOADER.init(scope.getModules(getTheReference())); - } catch (@SuppressWarnings("unused") java.io.IOException e) { + } catch (java.io.IOException e) { Assertions.UNREACHABLE(); } } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstImpl.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstImpl.java index a42000a03..86c265f4a 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstImpl.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstImpl.java @@ -60,7 +60,7 @@ public class CAstImpl implements CAst { public CAstNode getChild(int n) { try { return cs[n]; - } catch (@SuppressWarnings("unused") ArrayIndexOutOfBoundsException e) { + } catch (ArrayIndexOutOfBoundsException e) { throw new NoSuchElementException(n + " of " + CAstPrinter.print(this)); } } diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPrinter.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPrinter.java index 0ad7b2b57..2651647e3 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPrinter.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPrinter.java @@ -259,7 +259,7 @@ public class CAstPrinter { w.write("\n"); } } - } catch (@SuppressWarnings("unused") java.io.IOException e) { + } catch (java.io.IOException e) { } } diff --git a/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass1.java b/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass1.java index 394cfc9f1..449200d62 100644 --- a/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass1.java +++ b/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass1.java @@ -33,7 +33,7 @@ public class TypeAnnotatedClass1 extends @TypeAnnotationTypeUse Object { try { throw new NullPointerException(); - } catch (@SuppressWarnings("unused") @TypeAnnotationTypeUse RuntimeException e) { + } catch (@TypeAnnotationTypeUse RuntimeException e) { x = 911; } diff --git a/com.ibm.wala.core.testdata/src/dynamicCG/MainClass.java b/com.ibm.wala.core.testdata/src/dynamicCG/MainClass.java index 27d33c675..cd4cd336b 100644 --- a/com.ibm.wala.core.testdata/src/dynamicCG/MainClass.java +++ b/com.ibm.wala.core.testdata/src/dynamicCG/MainClass.java @@ -29,7 +29,7 @@ public class MainClass { private String toStringImpl() { try { return "mc:" + x.toString(); - } catch (@SuppressWarnings("unused") NullPointerException e) { + } catch (NullPointerException e) { return callSomething(x); } } diff --git a/com.ibm.wala.core.testdata/src/exceptionpruning/TestPruning.java b/com.ibm.wala.core.testdata/src/exceptionpruning/TestPruning.java index d342d9a9c..b78f70b7c 100644 --- a/com.ibm.wala.core.testdata/src/exceptionpruning/TestPruning.java +++ b/com.ibm.wala.core.testdata/src/exceptionpruning/TestPruning.java @@ -19,7 +19,7 @@ public class TestPruning { invokeSingleRecursive2(i); break; } - } catch (@SuppressWarnings("unused") OwnException e) { + } catch (OwnException e) { } } @@ -37,7 +37,7 @@ public class TestPruning { case 4: res = a[5]; } - } catch (@SuppressWarnings("unused") ArrayIndexOutOfBoundsException e) { + } catch (ArrayIndexOutOfBoundsException e) { } @@ -56,7 +56,7 @@ public class TestPruning { invokeAllPassThrough(); break; } - } catch (@SuppressWarnings("unused") RuntimeException e) { + } catch (RuntimeException e) { } } @@ -86,9 +86,9 @@ public class TestPruning { invokeAllPassThrough(); break; } - } catch (@SuppressWarnings("unused") ArrayIndexOutOfBoundsException e) { + } catch (ArrayIndexOutOfBoundsException e) { - } catch (@SuppressWarnings("unused") OwnException e) { + } catch (OwnException e) { } return res; diff --git a/com.ibm.wala.core.testdata/src/slice/TestCD3.java b/com.ibm.wala.core.testdata/src/slice/TestCD3.java index 5330d55c0..323d99344 100644 --- a/com.ibm.wala.core.testdata/src/slice/TestCD3.java +++ b/com.ibm.wala.core.testdata/src/slice/TestCD3.java @@ -29,7 +29,7 @@ public class TestCD3 { System.out.println("Y"); } } - } catch (@SuppressWarnings("unused") Throwable e) { + } catch (Throwable e) { } doNothing(I); } diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java index 64a5afd2c..0f8cca5d3 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java @@ -41,7 +41,7 @@ public class DupFieldsTest extends WalaTestCase { boolean threwException = false; try { klass.getField(Atom.findOrCreateUnicodeAtom("a")); - } catch (@SuppressWarnings("unused") IllegalStateException e) { + } catch (IllegalStateException e) { threwException = true; } Assert.assertTrue(threwException); diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java index 804d6aa0d..d42f0967f 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java @@ -121,7 +121,7 @@ public class SimpleThreadEscapeAnalysis extends AbstractAnalysisEngine, CGNode, Pair> result = null; try { result = solver.solve(); - } catch (@SuppressWarnings("unused") CancelException e) { + } catch (CancelException e) { // this shouldn't happen assert false; } diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/IntraprocReachingDefs.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/IntraprocReachingDefs.java index 2baa335fe..e71bd3f0a 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/IntraprocReachingDefs.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/IntraprocReachingDefs.java @@ -160,7 +160,7 @@ public class IntraprocReachingDefs { BitVectorSolver solver = new BitVectorSolver<>(framework); try { solver.solve(null); - } catch (@SuppressWarnings("unused") CancelException e) { + } catch (CancelException e) { // this shouldn't happen assert false; } diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/StaticInitializer.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/StaticInitializer.java index bb6cea02f..76f021e40 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/StaticInitializer.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/StaticInitializer.java @@ -363,7 +363,7 @@ public class StaticInitializer { TabulationResult, CGNode, IClass> result = null; try { result = solver.solve(); - } catch (@SuppressWarnings("unused") CancelException e) { + } catch (CancelException e) { // this shouldn't happen assert false; } diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/IntraproceduralNullPointerAnalysis.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/IntraproceduralNullPointerAnalysis.java index 201e7f9d6..4734a6279 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/IntraproceduralNullPointerAnalysis.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/IntraproceduralNullPointerAnalysis.java @@ -43,7 +43,7 @@ public class IntraproceduralNullPointerAnalysis { paramValNum, ir, cfg.entry()); try { this.solver.solve(NO_PROGRESS_MONITOR); - } catch (@SuppressWarnings("unused") final CancelException e) { + } catch (final CancelException e) { // can't happen as we have no monitor } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationSelector.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationSelector.java index ac7dfe96c..cc6aa32b5 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationSelector.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationSelector.java @@ -97,7 +97,7 @@ class ReflectiveInvocationSelector implements ContextSelector { } else { return new IllegalArgumentExceptionContext(); } - } catch (@SuppressWarnings("unused") IllegalArgumentException e) { + } catch (IllegalArgumentException e) { return new ReceiverInstanceContext(receiver[0]); } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeInference.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeInference.java index 06d3a7512..38da0c3d9 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeInference.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeInference.java @@ -213,7 +213,7 @@ public class TypeInference extends SSAInference implements FixedPo } catch (InvalidClassFileException e) { e.printStackTrace(); Assertions.UNREACHABLE(); - } catch (@SuppressWarnings("unused") UnsupportedOperationException e) { + } catch (UnsupportedOperationException e) { x = new TypeReference[]{ language.getThrowableType() }; } if (x != null) { diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractNestedJarFileModule.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractNestedJarFileModule.java index 2bd9d28a8..8deba7cdc 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractNestedJarFileModule.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractNestedJarFileModule.java @@ -76,7 +76,7 @@ public abstract class AbstractNestedJarFileModule implements Module { cache.put(name, bb); } } - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { // just go with what we have Warnings.add(new Warning() { diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java index 12ceb3194..631fe32e6 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java @@ -43,7 +43,7 @@ public abstract class AbstractURLModule implements Module, ModuleEntry { return ((JarURLConnection) con).getEntryName(); else return (new FileProvider()).filePathFromURL(url); - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { Assertions.UNREACHABLE(); return null; } @@ -53,7 +53,7 @@ public abstract class AbstractURLModule implements Module, ModuleEntry { public InputStream getInputStream() { try { return url.openConnection().getInputStream(); - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { Assertions.UNREACHABLE(); return null; } diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/BinaryDirectoryTreeModule.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/BinaryDirectoryTreeModule.java index a954f18bd..9dead1d0e 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/BinaryDirectoryTreeModule.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/BinaryDirectoryTreeModule.java @@ -34,7 +34,7 @@ public class BinaryDirectoryTreeModule extends DirectoryTreeModule { protected FileModule makeFile(final File file) { try { return new ClassFileModule(file, this); - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { Warnings.add(new Warning(Warning.MODERATE) { @Override diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java index b9fb5875f..12b0b98a4 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderFactoryImpl.java @@ -98,7 +98,7 @@ public class ClassLoaderFactoryImpl implements ClassLoaderFactory { Constructor ctor = impl.getDeclaredConstructor(new Class[] { ClassLoaderReference.class, IClassLoader.class, SetOfClasses.class, IClassHierarchy.class }); cl = (IClassLoader) ctor.newInstance(new Object[] { classLoaderReference, parent, exclusions, cha }); - } catch (@SuppressWarnings("unused") Exception e) { + } catch (Exception e) { try { Class impl = Class.forName(implClass); Constructor ctor = impl.getDeclaredConstructor(new Class[] { ClassLoaderReference.class, ArrayClassLoader.class, diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java index 01f7d43de..5150292db 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java @@ -296,7 +296,7 @@ public class ClassLoaderImpl implements IClassLoader { Warnings.add(InvalidClassFile.create(className)); } } - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { if (DEBUG_LEVEL > 0) { System.err.println("Ignoring class " + className + " due to InvalidClassFileException"); } @@ -568,13 +568,13 @@ public class ClassLoaderImpl implements IClassLoader { while (n != -1) { n = s.read(b); } - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { } finally { try { if (s != null) { s.close(); } - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { } } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java index 4e98b1cee..884695b62 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java @@ -74,7 +74,7 @@ public class JarStreamModule extends JarInputStream implements Module { cache.put(name, bb); } } - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { // just go with what we have Warnings.add(new Warning() { diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java index dd54acb3a..6d775f9f5 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java @@ -369,7 +369,7 @@ public abstract class ShrikeBTMethod implements IMethod, BytecodeConstants { ImmutableByteArray desc = ImmutableByteArray.make(getMethodSignature()); Descriptor D = Descriptor.findOrCreate(declaringClass.getClassLoader().getLanguage(), desc); return MethodReference.findOrCreate(declaringClass.getReference(), name, D); - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { Assertions.UNREACHABLE(); return null; } @@ -804,7 +804,7 @@ public abstract class ShrikeBTMethod implements IMethod, BytecodeConstants { result[i] = TypeReference.findOrCreate(loader, TypeName.findOrCreate(ImmutableByteArray.make("L" + strings[i]))); } return result; - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { Assertions.UNREACHABLE(); return null; } @@ -833,7 +833,7 @@ public abstract class ShrikeBTMethod implements IMethod, BytecodeConstants { public int getLineNumber(int bcIndex) { try { return (getBCInfo().lineNumberMap == null) ? -1 : getBCInfo().lineNumberMap[bcIndex]; - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { return -1; } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java index ecbfe7f8b..5f9a5a197 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java @@ -106,7 +106,7 @@ public final class ShrikeCTMethod extends ShrikeBTMethod implements IBytecodeMet final Decoder d = new CTDecoder(reader); try { d.decode(); - } catch (@SuppressWarnings("unused") Decoder.InvalidBytecodeException ex) { + } catch (Decoder.InvalidBytecodeException ex) { Assertions.UNREACHABLE(); } return d; @@ -279,7 +279,7 @@ public final class ShrikeCTMethod extends ShrikeBTMethod implements IBytecodeMet int[][] map = null; try { map = getBCInfo().localVariableMap; - } catch (@SuppressWarnings("unused") InvalidClassFileException e1) { + } catch (InvalidClassFileException e1) { return null; } @@ -488,7 +488,7 @@ public final class ShrikeCTMethod extends ShrikeBTMethod implements IBytecodeMet try { result.addAll(getAnnotations(true)); result.addAll(getAnnotations(false)); - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { } return result; diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java index f83b87500..bb7c56b5a 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java @@ -143,7 +143,7 @@ public final class ShrikeClass extends JVMClass { if (s != null) { superName = ImmutableByteArray.make("L" + s); } - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { Assertions.UNREACHABLE(); } } @@ -161,7 +161,7 @@ public final class ShrikeClass extends JVMClass { for (int i = 0; i < interfaceNames.length; i++) { interfaceNames[i] = ImmutableByteArray.make("L" + s[i]); } - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { Assertions.UNREACHABLE(); } } @@ -257,7 +257,7 @@ public final class ShrikeClass extends JVMClass { try { result.addAll(getAnnotations(true)); result.addAll(getAnnotations(false)); - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { } return result; @@ -313,7 +313,7 @@ public final class ShrikeClass extends JVMClass { return reader.getReader(iter); } } - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { Assertions.UNREACHABLE(); } return null; @@ -333,7 +333,7 @@ public final class ShrikeClass extends JVMClass { break; } } - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { Assertions.UNREACHABLE(); } return result; @@ -432,7 +432,7 @@ public final class ShrikeClass extends JVMClass { break; } } - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { Assertions.UNREACHABLE(); } return result; diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java index 435079306..d3dff84c6 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java @@ -124,7 +124,7 @@ public class ShrikeIRFactory implements IRFactory { } else { return "(line " + lineNumber + ")"; } - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { return ""; } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java b/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java index b0096cef3..111d04590 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java +++ b/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java @@ -185,7 +185,7 @@ public class DemandRefinementPointsTo extends AbstractDemandPointsTo { CallSiteReference site = iterator.next(); try { caller.getIR().getCalls(site); - } catch (@SuppressWarnings("unused") IllegalArgumentException e) { + } catch (IllegalArgumentException e) { System.err.println(caller + " is pred of " + callee); System.err.println("no calls at site " + site); System.err.println(caller.getIR()); @@ -338,13 +338,13 @@ public class DemandRefinementPointsTo extends AbstractDemandPointsTo { } completedPassInBudget = true; break; - } catch (@SuppressWarnings("unused") StatesMergedException e) { + } catch (StatesMergedException e) { if (DEBUG) { System.err.println("restarting..."); } } } - } catch (@SuppressWarnings("unused") BudgetExceededException e) { + } catch (BudgetExceededException e) { } if (curP2Set != null) { @@ -446,7 +446,7 @@ public class DemandRefinementPointsTo extends AbstractDemandPointsTo { completedPassInBudget = true; completedSomePass = true; break; - } catch (@SuppressWarnings("unused") StatesMergedException e) { + } catch (StatesMergedException e) { if (DEBUG) { System.err.println("restarting..."); } @@ -466,7 +466,7 @@ public class DemandRefinementPointsTo extends AbstractDemandPointsTo { } } - } catch (@SuppressWarnings("unused") BudgetExceededException e) { + } catch (BudgetExceededException e) { } if (completedPassInBudget) { @@ -585,13 +585,13 @@ public class DemandRefinementPointsTo extends AbstractDemandPointsTo { System.err.println("FLOWS-TO SET " + curFlowsToSet); } break; - } catch (@SuppressWarnings("unused") StatesMergedException e) { + } catch (StatesMergedException e) { if (DEBUG) { System.err.println("restarting..."); } } } - } catch (@SuppressWarnings("unused") BudgetExceededException e) { + } catch (BudgetExceededException e) { } if (curFlowsToSet != null) { diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java index b1b0c4272..36c2f6794 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java @@ -408,7 +408,7 @@ public class AnalysisScope { Assertions.UNREACHABLE("Manifest for " + rtJar.getName() + " has no value for Specification-Version"); } return result; - } catch (@SuppressWarnings("unused") java.io.IOException e) { + } catch (java.io.IOException e) { Assertions.UNREACHABLE("error getting rt.jar manifest!"); return null; } diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java index afaf4272d..4f294cc7e 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java @@ -727,7 +727,7 @@ public abstract class PropagationCallGraphBuilder implements CallGraphBuilder 0) { System.err.println(("FileProvider got url: " + url + " for " + fileName)); @@ -206,7 +206,7 @@ public class FileProvider { try { URI uri = new File(URLDecoder.decode(url.getPath(), "UTF-8")).toURI(); return uri.getPath(); - } catch (@SuppressWarnings("unused") UnsupportedEncodingException e) { + } catch (UnsupportedEncodingException e) { // this really shouldn't happen Assertions.UNREACHABLE(); return null; diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java index 93b77b0a7..3e8671cdf 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java +++ b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java @@ -611,7 +611,7 @@ public class ParameterAccessor { throw new IllegalArgumentException("Class " + asType + " is not a super-class of " + this.method.getParameterType(self)); } - } catch (@SuppressWarnings("unused") ClassLookupException e) { + } catch (ClassLookupException e) { // Cant't test assume all fitts } @@ -1344,7 +1344,7 @@ public class ParameterAccessor { continue forEachParameter; } } - } catch (@SuppressWarnings("unused") ClassLookupException e) { + } catch (ClassLookupException e) { } } @@ -1356,7 +1356,7 @@ public class ParameterAccessor { debug("\t\tAsigning: {} from the callrs params (ass)", cand); continue forEachParameter; } - } catch (@SuppressWarnings("unused") ClassLookupException e) { + } catch (ClassLookupException e) { } } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java index 81e0f1f3f..8738928ab 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java +++ b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java @@ -617,7 +617,7 @@ public class TypeSafeInstructionFactory { public boolean isAssignableFrom(final TypeReference from, final TypeReference to) { try { return ParameterAccessor.isAssignable(from, to, this.cha); - } catch (@SuppressWarnings("unused") ClassLookupException e) { + } catch (ClassLookupException e) { return true; } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java b/com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java index 1ae41d3d6..742dcb380 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java +++ b/com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java @@ -99,7 +99,7 @@ public abstract class UTF8Convert { + (i - 3)); } } - } catch (@SuppressWarnings("unused") ArrayIndexOutOfBoundsException e) { + } catch (ArrayIndexOutOfBoundsException e) { throw new UTFDataFormatException("unexpected end at location " + i); } } @@ -202,7 +202,7 @@ public abstract class UTF8Convert { if (c < '\u0800') return false; } - } catch (@SuppressWarnings("unused") ArrayIndexOutOfBoundsException e) { + } catch (ArrayIndexOutOfBoundsException e) { return false; } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrViewer.java b/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrViewer.java index aa745fd7b..3af0ce267 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrViewer.java +++ b/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrViewer.java @@ -107,7 +107,7 @@ public class IrViewer extends JPanel{ } lineNum++; } - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { // ??? assert false; } @@ -127,7 +127,7 @@ public class IrViewer extends JPanel{ String pcString = line.substring(0, firstSpace); try { return Integer.parseInt(pcString); - } catch (@SuppressWarnings("unused") NumberFormatException e) { + } catch (NumberFormatException e) { return NA; } } else { diff --git a/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/SourceViewer.java b/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/SourceViewer.java index b5f977fe5..67fc9f01e 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/SourceViewer.java +++ b/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/SourceViewer.java @@ -75,7 +75,7 @@ public class SourceViewer extends JPanel{ } br.close(); return true; - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { System.err.println("Could not load source at " + url); return false; } diff --git a/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/drivers/APKCallGraphDriver.java b/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/drivers/APKCallGraphDriver.java index d50591b25..91232a80f 100644 --- a/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/drivers/APKCallGraphDriver.java +++ b/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/drivers/APKCallGraphDriver.java @@ -52,7 +52,7 @@ public class APKCallGraphDriver { try { timeout = Integer.parseInt(args[1]); System.err.println("timeout is " + timeout); - } catch (@SuppressWarnings("unused") Throwable e) { + } catch (Throwable e) { // no timeout specified } FileUtil.recurseFiles(new VoidFunction() { 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 fac9ad296..8f3cac8d8 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 @@ -35,7 +35,7 @@ public class Util { static { try { walaProperties = WalaProperties.loadProperties(); - } catch (@SuppressWarnings("unused") WalaException e) { + } catch (WalaException e) { walaProperties = null; } } diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIClass.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIClass.java index c843b3772..42b39ad94 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIClass.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIClass.java @@ -400,7 +400,7 @@ public class DexIClass extends BytecodeClass { if (methods == null){ try { computeDeclaredMethods(); - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { } } // return construcorId!=-1?methods[construcorId]:null; diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java index eb8ccefc3..72b4c4ce9 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java @@ -92,7 +92,7 @@ public class DexIRFactory extends DefaultIRFactory { } else { return "(line " + lineNumber + ")"; } - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { return ""; } } diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java index 281808deb..5a29f3d27 100644 --- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java +++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java @@ -193,7 +193,7 @@ public class ReuseParameters { final int localNumber = ssaFor(inCallTo, firstOf(param, inCallTo)); try { withName = inCallTo.getLocalVariableName (bcIndex, localNumber); - } catch (@SuppressWarnings("unused") UnsupportedOperationException e) { + } catch (UnsupportedOperationException e) { // DexIMethod doesn't implement this :( withName = null; diff --git a/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JavaEclipseProjectPath.java b/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JavaEclipseProjectPath.java index 1a39c2507..1d8812bc7 100644 --- a/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JavaEclipseProjectPath.java +++ b/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JavaEclipseProjectPath.java @@ -64,7 +64,7 @@ public class JavaEclipseProjectPath extends EclipseProjectPath { JarFile j; try { j = new JarFile(file); - } catch (@SuppressWarnings("unused") ZipException z) { + } catch (ZipException z) { // a corrupted file. ignore it. return; - } catch (@SuppressWarnings("unused") IOException z) { + } catch (IOException z) { // should ignore directories as well.. return; } @@ -216,7 +216,7 @@ public abstract class EclipseProjectPath { // This is horrible. We can't figure out the race condition yet which causes this to happen. try { Thread.sleep(5000); - } catch (@SuppressWarnings("unused") InterruptedException e) { + } catch (InterruptedException e) { // whatever. } bd = findModel(p).getBundleDescription(); diff --git a/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferGraph.java b/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferGraph.java index ffa6aae9f..9011369b8 100644 --- a/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferGraph.java +++ b/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferGraph.java @@ -101,7 +101,7 @@ public class PrefixTransferGraph implements Graph { { sbua = new StringBuilderUseAnalysis(k,pa); } - catch(@SuppressWarnings("unused") Exception e) + catch(Exception e) { continue; diff --git a/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/UriPrefixTransferGraph.java b/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/UriPrefixTransferGraph.java index ac64d4a7a..04ff82477 100644 --- a/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/UriPrefixTransferGraph.java +++ b/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/UriPrefixTransferGraph.java @@ -162,7 +162,7 @@ public class UriPrefixTransferGraph implements Graph { final StringBuilderUseAnalysis sbua; try { sbua = new StringBuilderUseAnalysis(ik, pa); - } catch(@SuppressWarnings("unused") Exception e) { + } catch(Exception e) { return; } diff --git a/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java b/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java index c3c5d1863..220c15e2f 100644 --- a/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java +++ b/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java @@ -123,7 +123,7 @@ public class DexDotUtil extends DotUtil { // if we get here, the process has terminated repeat = false; - } catch (@SuppressWarnings("unused") IllegalThreadStateException e) { + } catch (IllegalThreadStateException e) { // this means the process has not yet terminated. repeat = true; } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Mangler.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Mangler.java index 755ad820d..049482598 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Mangler.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Mangler.java @@ -65,7 +65,7 @@ public class Mangler { int seed; try { seed = Integer.parseInt(args[0]); - } catch (@SuppressWarnings("unused") NumberFormatException ex) { + } catch (NumberFormatException ex) { System.err.println("Invalid number: " + args[0]); return; } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java index 2ab4cc04a..0f5524b71 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java @@ -69,19 +69,19 @@ public class Runtime { private Runtime(String fileName, String filterFileName, String policyClassName) { try (final FileInputStream in = new FileInputStream(filterFileName)) { filter = new FileOfClasses(in); - } catch (@SuppressWarnings("unused") Exception e) { + } catch (Exception e) { filter = null; } try { output = new PrintWriter(new OutputStreamWriter(new GZIPOutputStream(new FileOutputStream(fileName)), "UTF-8")); - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { output = new PrintWriter(System.err); } try { handleCallback = (Policy) Class.forName(policyClassName).newInstance(); - } catch (@SuppressWarnings("unused") InstantiationException | IllegalAccessException | ClassNotFoundException e) { + } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) { handleCallback = new DefaultCallbackPolicy(); } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Compiler.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Compiler.java index da81e69ea..c018df390 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Compiler.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Compiler.java @@ -1653,7 +1653,7 @@ public abstract class Compiler implements Constants { } else { return p; } - } catch (@SuppressWarnings("unused") IllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { return null; } } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/OfflineInstrumenter.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/OfflineInstrumenter.java index 81b14be8c..0b835ca55 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/OfflineInstrumenter.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/OfflineInstrumenter.java @@ -47,7 +47,7 @@ final public class OfflineInstrumenter extends OfflineInstrumenterBase { protected String getClassName(Object cl) { try { return ((ClassInstrumenter) cl).getReader().getName().replace('/', '.'); - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { return null; } } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/AddSerialVersion.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/AddSerialVersion.java index 7390ef3aa..8f2c7b742 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/AddSerialVersion.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/AddSerialVersion.java @@ -176,7 +176,7 @@ public class AddSerialVersion { } catch (IOException e1) { throw new Error("Unexpected IOException: " + e1.getMessage()); } - } catch (@SuppressWarnings("unused") IOException e2) { + } catch (IOException e2) { } byte[] hash = digest.digest(); @@ -193,11 +193,11 @@ public class AddSerialVersion { byte[] data = Util.readFully(in); ClassReader r = new ClassReader(data); System.out.println(Util.makeClass(r.getName()) + ": serialVersionUID = " + computeSerialVersionUID(r)); - } catch (@SuppressWarnings("unused") FileNotFoundException e) { + } catch (FileNotFoundException e) { System.err.println("File not found: " + args[i]); - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { System.err.println("Error reading file: " + args[i]); - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { System.err.println("Invalid class file: " + args[i]); } } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AnnotationsReader.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AnnotationsReader.java index d7be4ba91..3004ff232 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AnnotationsReader.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AnnotationsReader.java @@ -383,7 +383,7 @@ public class AnnotationsReader extends AttributeReader { return new AnnotationsReader(iter, attrName); } } - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { Assertions.UNREACHABLE(); } return null; 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 b7b413354..950fb1fba 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 @@ -197,7 +197,7 @@ public final class ClassReader implements ClassConstants { } else { try { return cpParser.getCPClass(c); - } catch (@SuppressWarnings("unused") IllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { throw new InvalidClassFileException(addr, "Invalid class constant pool index: " + c); } } @@ -361,7 +361,7 @@ public final class ClassReader implements ClassConstants { } else { try { return cpParser.getCPUtf8(s); - } catch (@SuppressWarnings("unused") IllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { throw new InvalidClassFileException(addr, "Invalid Utf8 constant pool index: " + s); } } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/TypeAnnotationsReader.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/TypeAnnotationsReader.java index 4a9cba785..0d24df2cb 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/TypeAnnotationsReader.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/TypeAnnotationsReader.java @@ -801,7 +801,7 @@ public class TypeAnnotationsReader extends AnnotationsReader { for (; iter.isValid(); iter.advance()) { if (iter.getName().equals(attrName)) return newReader.apply(); } - } catch (@SuppressWarnings("unused") InvalidClassFileException e) { + } catch (InvalidClassFileException e) { Assertions.UNREACHABLE(); } return null; diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java index 3f17d4169..e3ac2e63a 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java @@ -105,7 +105,7 @@ public final class CRTable extends PositionsAttribute { try { short short_pc = (short) (pc & 0xFFFF); sourceInfo = new CRTData(short_pc, short_pc, 0, 0, CRTFlags.CRT_SOURCE_INFO); - } catch (@SuppressWarnings("unused") InvalidCRTDataException e) { + } catch (InvalidCRTDataException e) { assert false; } } diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java index 518fc0411..24fa17651 100644 --- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java +++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java @@ -105,12 +105,12 @@ public final class MethodPositions extends PositionsAttribute { Position end = null; try { start = readPosition(in, startVarName); - } catch (@SuppressWarnings("unused") InvalidPositionException e) { + } catch (InvalidPositionException e) { valid = false; } try { end = readPosition(in, endVarName); - } catch (@SuppressWarnings("unused") InvalidPositionException e) { + } catch (InvalidPositionException e) { valid = false; } if (valid) { diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashMap.java b/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashMap.java index f1dd4278d..d29ee0693 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashMap.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashMap.java @@ -54,7 +54,7 @@ public class ParanoidHashMap extends LinkedHashMap { if (method.getDeclaringClass() == Object.class) { assert false : o.getClass().toString(); } - } catch (@SuppressWarnings("unused") Exception e) { + } catch (Exception e) { assert false : "Could not find hashCode method"; } } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/FloydWarshall.java b/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/FloydWarshall.java index 279279813..e012a41ef 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/FloydWarshall.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/FloydWarshall.java @@ -124,7 +124,7 @@ public class FloydWarshall { for(int j = 0; j <= G.getMaxNumber(); j++) { try { s += getPath(G.getNode(i), G.getNode(j)); - } catch (@SuppressWarnings("unused") UnsupportedOperationException e) { + } catch (UnsupportedOperationException e) { } } @@ -179,7 +179,7 @@ public class FloydWarshall { for(int j = 0; j <= G.getMaxNumber(); j++) { try { x.add(getPaths(G.getNode(i), G.getNode(j))); - } catch (@SuppressWarnings("unused") UnsupportedOperationException e) { + } catch (UnsupportedOperationException e) { } } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorBase.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorBase.java index b6b203b8e..3ab192b56 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorBase.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorBase.java @@ -105,7 +105,7 @@ abstract public class BitVectorBase implements Cloneabl BitVectorBase result = null; try { result = (BitVectorBase) super.clone(); - } catch (@SuppressWarnings("unused") CloneNotSupportedException e) { + } catch (CloneNotSupportedException e) { // this shouldn't happen, since we are Cloneable throw new InternalError(); } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/FixedSizeBitVector.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/FixedSizeBitVector.java index f925c3a20..b1ecea6e9 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/FixedSizeBitVector.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/FixedSizeBitVector.java @@ -119,7 +119,7 @@ public final class FixedSizeBitVector implements Cloneable, java.io.Serializable int n = subscript(bit); try { return ((bits[n] & (1 << shiftBits)) != 0); - } catch (@SuppressWarnings("unused") ArrayIndexOutOfBoundsException e) { + } catch (ArrayIndexOutOfBoundsException e) { return false; } } @@ -324,7 +324,7 @@ public final class FixedSizeBitVector implements Cloneable, java.io.Serializable FixedSizeBitVector result = null; try { result = (FixedSizeBitVector) super.clone(); - } catch (@SuppressWarnings("unused") CloneNotSupportedException e) { + } catch (CloneNotSupportedException e) { // this shouldn't happen, since we are Cloneable throw new InternalError(); } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSetUtil.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSetUtil.java index 28183fab3..70c17ae15 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSetUtil.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSetUtil.java @@ -32,7 +32,7 @@ public class IntSetUtil { Class intSetFactoryClass = Class.forName(System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME)); MutableIntSetFactory intSetFactory = (MutableIntSetFactory) intSetFactoryClass.newInstance(); setDefaultIntSetFactory(intSetFactory); - } catch (@SuppressWarnings("unused") Exception e) { + } catch (Exception e) { System.err.println(("Cannot use int set factory " + System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME))); setDefaultIntSetFactory(defaultFactory); } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSetUtil.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSetUtil.java index 20b5156cd..6a16822ea 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSetUtil.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSetUtil.java @@ -29,7 +29,7 @@ public class LongSetUtil { Class intSetFactoryClass = Class.forName(System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME)); MutableLongSetFactory intSetFactory = (MutableLongSetFactory) intSetFactoryClass.newInstance(); setDefaultLongSetFactory(intSetFactory); - } catch (@SuppressWarnings("unused") Exception e) { + } catch (Exception e) { System.err.println(("Cannot use int set factory " + System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME))); setDefaultLongSetFactory(defaultFactory); } diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/processes/Launcher.java b/com.ibm.wala.util/src/com/ibm/wala/util/processes/Launcher.java index 9a727764b..c45309ba3 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/processes/Launcher.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/processes/Launcher.java @@ -238,7 +238,7 @@ public abstract class Launcher { while (repeat) { try { Thread.sleep(SLEEP_MS); - } catch (@SuppressWarnings("unused") InterruptedException e1) { + } catch (InterruptedException e1) { // e1.printStackTrace(); // just ignore and continue } @@ -251,7 +251,7 @@ public abstract class Launcher { if (logger != null) { logger.fine("process terminated with exit code " + p.exitValue()); } - } catch (@SuppressWarnings("unused") IllegalThreadStateException e) { + } catch (IllegalThreadStateException e) { // this means the process has not yet terminated. repeat = true; } @@ -280,7 +280,7 @@ public abstract class Launcher { s.read(data); p.print(new String(data)); } - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { // assume the stream has been closed (e.g. the process died) // so, just exit } @@ -298,7 +298,7 @@ public abstract class Launcher { b.write(next); next = s.read(); } - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { // assume the stream has been closed (e.g. the process died) // so, just print the data and then leave } @@ -317,7 +317,7 @@ public abstract class Launcher { int nRead = s.read(data); b.write(data, 0, nRead); } - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { // assume the stream has been closed (e.g. the process died) // so, just exit } @@ -333,7 +333,7 @@ public abstract class Launcher { b.write(next); next = s.read(); } - } catch (@SuppressWarnings("unused") IOException e) { + } catch (IOException e) { // assume the stream has been closed (e.g. the process died) // so, just exit } diff --git a/com.ibm.wala.util/src/com/ibm/wala/viz/DotUtil.java b/com.ibm.wala.util/src/com/ibm/wala/viz/DotUtil.java index b3882158c..549cfdeef 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/viz/DotUtil.java +++ b/com.ibm.wala.util/src/com/ibm/wala/viz/DotUtil.java @@ -129,7 +129,7 @@ public class DotUtil { // if we get here, the process has terminated repeat = false; System.out.println("process terminated with exit code " + p.exitValue()); - } catch (@SuppressWarnings("unused") IllegalThreadStateException e) { + } catch (IllegalThreadStateException e) { // this means the process has not yet terminated. repeat = true; } From 1bb3d827c4d284096777972a7fc73fe0fa0e3b21 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Thu, 23 Mar 2017 16:39:58 -0500 Subject: [PATCH 9/9] Turn off Eclipse warnings about unused caught-exception parameters Manu requested that we use this approach instead of adding `@SuppressWarnings("unused")` at each affected catch block. That seems reasonable to me, given the large number of such warnings and the lack of likely harm from ignoring such caught exceptions. --- .../.settings/org.eclipse.jdt.core.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.cast.js.test/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.dalvik.test/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.dalvik/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.ide.jdt/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.ide.jsdt/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.ide/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.shrike/.settings/org.eclipse.jdt.core.prefs | 1 + com.ibm.wala.util/.settings/org.eclipse.jdt.core.prefs | 1 + 16 files changed, 16 insertions(+) diff --git a/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.jdt.core.prefs index 4c8bbd5ba..2d837975c 100644 --- a/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.jdt.core.prefs @@ -95,6 +95,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.jdt.core.prefs index 5f809a485..d22896e62 100644 --- a/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.jdt.core.prefs @@ -65,6 +65,7 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.cast.js.test/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.cast.js.test/.settings/org.eclipse.jdt.core.prefs index b01c06206..becf2a4a9 100644 --- a/com.ibm.wala.cast.js.test/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.cast.js.test/.settings/org.eclipse.jdt.core.prefs @@ -66,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs index b01c06206..becf2a4a9 100644 --- a/com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs @@ -66,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs index b01c06206..becf2a4a9 100644 --- a/com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs @@ -66,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs index fab0ce24f..1ecef3995 100644 --- a/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs @@ -94,6 +94,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs index b01c06206..becf2a4a9 100644 --- a/com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs @@ -66,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs index 2f3bfa840..c289507a5 100644 --- a/com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs @@ -107,6 +107,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.dalvik.test/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.dalvik.test/.settings/org.eclipse.jdt.core.prefs index dddcf71c2..3abb1cc33 100644 --- a/com.ibm.wala.dalvik.test/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.dalvik.test/.settings/org.eclipse.jdt.core.prefs @@ -58,6 +58,7 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.dalvik/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.dalvik/.settings/org.eclipse.jdt.core.prefs index 78bba305a..7bcb227bd 100644 --- a/com.ibm.wala.dalvik/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.dalvik/.settings/org.eclipse.jdt.core.prefs @@ -20,6 +20,7 @@ org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/com.ibm.wala.ide.jdt/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.ide.jdt/.settings/org.eclipse.jdt.core.prefs index 763f57919..a29f3bdb5 100644 --- a/com.ibm.wala.ide.jdt/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.ide.jdt/.settings/org.eclipse.jdt.core.prefs @@ -66,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.ide.jsdt/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.ide.jsdt/.settings/org.eclipse.jdt.core.prefs index 763f57919..a29f3bdb5 100644 --- a/com.ibm.wala.ide.jsdt/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.ide.jsdt/.settings/org.eclipse.jdt.core.prefs @@ -66,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.ide/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.ide/.settings/org.eclipse.jdt.core.prefs index b01c06206..becf2a4a9 100644 --- a/com.ibm.wala.ide/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.ide/.settings/org.eclipse.jdt.core.prefs @@ -66,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs index 19abf0b1d..19fa68a5f 100644 --- a/com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs @@ -6,4 +6,5 @@ org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.source=1.7 diff --git a/com.ibm.wala.shrike/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.shrike/.settings/org.eclipse.jdt.core.prefs index a0962ace8..f3683fc70 100644 --- a/com.ibm.wala.shrike/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.shrike/.settings/org.eclipse.jdt.core.prefs @@ -76,6 +76,7 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning diff --git a/com.ibm.wala.util/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.util/.settings/org.eclipse.jdt.core.prefs index b01c06206..becf2a4a9 100644 --- a/com.ibm.wala.util/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.util/.settings/org.eclipse.jdt.core.prefs @@ -66,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning