From 16492c7b78cfa6f2c32ccc050f27df52c26a50c3 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Thu, 23 Mar 2017 16:32:00 -0500 Subject: [PATCH] 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; }