From aa878f0b68a3a7a7b7df3faee8c60db910872a59 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Fri, 17 Mar 2017 22:13:02 -0500 Subject: [PATCH] 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;