From 24eb8032119e9fdf707618b50b5237e42e9ae6ff Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Tue, 4 Sep 2012 16:24:37 -0700 Subject: [PATCH] organize imports; no semantic change --- .../ibm/wala/cast/java/translator/polyglot/ModuleSource.java | 4 ++-- .../translator/polyglot/PolyglotJava2CAstTranslator.java | 1 - .../java/ipa/callgraph/JavaScopeMappingInstanceKeys.java | 1 - .../com/ibm/wala/cast/java/loader/JavaSourceLoaderImpl.java | 2 +- .../com/ibm/wala/cast/java/translator/Java2IRTranslator.java | 1 - .../ibm/wala/cast/js/test/TestForInBodyExtractionRhino.java | 1 - .../com/ibm/wala/cast/js/test/TestSimpleCallGraphShape.java | 1 - .../ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java | 1 - .../correlations/extraction/ForInBodyExtractionPolicy.java | 2 +- .../js/ipa/callgraph/correlations/extraction/NodePos.java | 2 +- .../analysis/reflection/AbstractReflectionInterpreter.java | 5 ++++- .../src/com/ibm/wala/classLoader/ArrayClass.java | 5 ++++- .../callgraph/propagation/cfa/CallStringContextSelector.java | 2 -- com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRef.java | 1 - .../com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java | 5 ++++- .../src/com/ibm/wala/util/strings/StringStuff.java | 5 ++++- .../wala/cast/java/translator/jdt/JDTSourceLoaderImpl.java | 2 -- .../source/com/ibm/wala/ide/util/ASTNodeFinder.java | 5 +++-- .../src/com/ibm/wala/ide/util/EclipseProjectPath.java | 1 - .../src/com/ibm/wala/util/graph/GraphSlicer.java | 1 + 20 files changed, 25 insertions(+), 23 deletions(-) diff --git a/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/ModuleSource.java b/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/ModuleSource.java index 993d1f262..1be479632 100644 --- a/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/ModuleSource.java +++ b/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/ModuleSource.java @@ -17,11 +17,11 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import com.ibm.wala.classLoader.SourceModule; - import polyglot.frontend.FileSource; import polyglot.frontend.Resource; +import com.ibm.wala.classLoader.SourceModule; + /** * A Polyglot Source whose input comes from an InputStream.
* Currently extends FileSource since that's all that the Polyglot Compiler class diff --git a/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java b/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java index 359e6a8ac..a12e648a7 100644 --- a/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java +++ b/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java @@ -120,7 +120,6 @@ import polyglot.util.Position; import com.ibm.wala.cast.ir.translator.AstTranslator.InternalCAstSymbol; import com.ibm.wala.cast.ir.translator.TranslatorToCAst; import com.ibm.wala.cast.ir.translator.TranslatorToCAst.DoLoopTranslator; -import com.ibm.wala.cast.ir.translator.TranslatorToCAst.WalkContext; import com.ibm.wala.cast.java.loader.Util; import com.ibm.wala.cast.java.translator.JavaProcedureEntity; import com.ibm.wala.cast.java.types.JavaType; diff --git a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/JavaScopeMappingInstanceKeys.java b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/JavaScopeMappingInstanceKeys.java index 2d11c037f..e3ced01c7 100644 --- a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/JavaScopeMappingInstanceKeys.java +++ b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/JavaScopeMappingInstanceKeys.java @@ -16,7 +16,6 @@ import java.util.Iterator; import java.util.Set; import com.ibm.wala.cast.ipa.callgraph.ScopeMappingInstanceKeys; -import com.ibm.wala.cast.ipa.callgraph.ScopeMappingInstanceKeys.ScopeMappingInstanceKey; import com.ibm.wala.cast.ir.translator.AstTranslator; import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl.JavaClass; import com.ibm.wala.cast.loader.AstMethod; 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 da0d9a2dc..e957de704 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 @@ -54,9 +54,9 @@ import com.ibm.wala.classLoader.IClass; import com.ibm.wala.classLoader.IClassLoader; import com.ibm.wala.classLoader.IField; import com.ibm.wala.classLoader.IMethod; -import com.ibm.wala.classLoader.Module; import com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory; import com.ibm.wala.classLoader.Language; +import com.ibm.wala.classLoader.Module; import com.ibm.wala.classLoader.ModuleEntry; import com.ibm.wala.classLoader.NewSiteReference; import com.ibm.wala.ipa.callgraph.impl.SetOfClasses; diff --git a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/Java2IRTranslator.java b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/Java2IRTranslator.java index 0dd6ae558..1d45734ff 100644 --- a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/Java2IRTranslator.java +++ b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/Java2IRTranslator.java @@ -15,7 +15,6 @@ package com.ibm.wala.cast.java.translator; import java.io.PrintWriter; -import com.ibm.wala.cast.ir.translator.TranslatorToCAst; import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl; import com.ibm.wala.cast.tree.CAst; import com.ibm.wala.cast.tree.CAstEntity; diff --git a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestForInBodyExtractionRhino.java b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestForInBodyExtractionRhino.java index 13a401e4b..22fcf1073 100644 --- a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestForInBodyExtractionRhino.java +++ b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestForInBodyExtractionRhino.java @@ -13,7 +13,6 @@ package com.ibm.wala.cast.js.test; import java.io.IOException; - import com.ibm.wala.cast.js.translator.RhinoToAstTranslator; import com.ibm.wala.cast.tree.CAstEntity; import com.ibm.wala.cast.tree.impl.CAstImpl; diff --git a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShape.java b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShape.java index e304c636b..ff7b1e337 100755 --- a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShape.java +++ b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShape.java @@ -24,7 +24,6 @@ import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder; import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil; import com.ibm.wala.ipa.callgraph.CGNode; import com.ibm.wala.ipa.callgraph.CallGraph; -import com.ibm.wala.ipa.callgraph.ContextSelector; import com.ibm.wala.ipa.callgraph.propagation.InstanceKey; import com.ibm.wala.ipa.callgraph.propagation.LocalPointerKey; import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis; 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 7fd9aab7e..1b0a6dc91 100755 --- 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,7 +18,6 @@ import org.junit.Test; 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; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ForInBodyExtractionPolicy.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ForInBodyExtractionPolicy.java index cac4d7884..01f7f413c 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ForInBodyExtractionPolicy.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ForInBodyExtractionPolicy.java @@ -15,8 +15,8 @@ import static com.ibm.wala.cast.tree.CAstNode.ASSIGN; import static com.ibm.wala.cast.tree.CAstNode.BLOCK_STMT; import static com.ibm.wala.cast.tree.CAstNode.DECL_STMT; import static com.ibm.wala.cast.tree.CAstNode.EACH_ELEMENT_GET; -import static com.ibm.wala.cast.tree.CAstNode.LABEL_STMT; import static com.ibm.wala.cast.tree.CAstNode.EMPTY; +import static com.ibm.wala.cast.tree.CAstNode.LABEL_STMT; import static com.ibm.wala.cast.tree.CAstNode.LOCAL_SCOPE; import static com.ibm.wala.cast.tree.CAstNode.VAR; diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/NodePos.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/NodePos.java index d48c9e7c9..82111d86f 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/NodePos.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/NodePos.java @@ -13,8 +13,8 @@ package com.ibm.wala.cast.js.ipa.callgraph.correlations.extraction; import com.ibm.wala.cast.tree.CAstNode; import com.ibm.wala.cast.tree.impl.CAstBasicRewriter; -import com.ibm.wala.cast.tree.impl.CAstRewriter; import com.ibm.wala.cast.tree.impl.CAstBasicRewriter.NoKey; +import com.ibm.wala.cast.tree.impl.CAstRewriter; /** * Representation of a node's position in a CAst entity's syntax tree. The position is stored as a zipper 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 4b42dc984..1cb18f235 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 @@ -10,6 +10,10 @@ *******************************************************************************/ package com.ibm.wala.analysis.reflection; +import static com.ibm.wala.types.TypeName.ArrayMask; +import static com.ibm.wala.types.TypeName.ElementMask; +import static com.ibm.wala.types.TypeName.PrimitiveMask; + import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -35,7 +39,6 @@ import com.ibm.wala.ssa.SSANewInstruction; import com.ibm.wala.ssa.SSAReturnInstruction; import com.ibm.wala.types.MethodReference; import com.ibm.wala.types.TypeReference; -import static com.ibm.wala.types.TypeName.*; import com.ibm.wala.util.collections.HashMapFactory; import com.ibm.wala.util.collections.HashSetFactory; import com.ibm.wala.util.debug.Assertions; diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClass.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClass.java index 3e6d1a48b..3135e8399 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClass.java +++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClass.java @@ -10,6 +10,10 @@ *******************************************************************************/ package com.ibm.wala.classLoader; +import static com.ibm.wala.types.TypeName.ArrayMask; +import static com.ibm.wala.types.TypeName.ElementBits; +import static com.ibm.wala.types.TypeName.PrimitiveMask; + import java.io.InputStream; import java.util.Collection; import java.util.Collections; @@ -19,7 +23,6 @@ import com.ibm.wala.ipa.cha.IClassHierarchy; import com.ibm.wala.shrikeBT.Constants; import com.ibm.wala.types.Selector; import com.ibm.wala.types.TypeName; -import static com.ibm.wala.types.TypeName.*; import com.ibm.wala.types.TypeReference; import com.ibm.wala.util.collections.HashSetFactory; import com.ibm.wala.util.debug.Assertions; diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallStringContextSelector.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallStringContextSelector.java index 7829a0ce0..e776d2b98 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallStringContextSelector.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallStringContextSelector.java @@ -19,8 +19,6 @@ import com.ibm.wala.ipa.callgraph.ContextKey; import com.ibm.wala.ipa.callgraph.ContextSelector; import com.ibm.wala.ipa.callgraph.impl.Everywhere; import com.ibm.wala.ipa.callgraph.propagation.InstanceKey; -import com.ibm.wala.ipa.callgraph.propagation.ReceiverInstanceContext; -import com.ibm.wala.util.intset.EmptyIntSet; import com.ibm.wala.util.intset.IntSet; public abstract class CallStringContextSelector implements ContextSelector { diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRef.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRef.java index dc473bf73..180bd0760 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRef.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRef.java @@ -15,7 +15,6 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import com.ibm.wala.classLoader.ArrayClass; import com.ibm.wala.classLoader.IClass; import com.ibm.wala.classLoader.IField; import com.ibm.wala.dataflow.graph.BitVectorSolver; diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java index 82be9a003..58e6cf8f4 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java @@ -10,6 +10,10 @@ *******************************************************************************/ package com.ibm.wala.ipa.summaries; +import static com.ibm.wala.types.TypeName.ArrayMask; +import static com.ibm.wala.types.TypeName.ElementBits; +import static com.ibm.wala.types.TypeName.PrimitiveMask; + import java.io.IOException; import java.io.InputStream; import java.util.HashMap; @@ -45,7 +49,6 @@ import com.ibm.wala.types.Descriptor; import com.ibm.wala.types.FieldReference; import com.ibm.wala.types.MethodReference; import com.ibm.wala.types.TypeName; -import static com.ibm.wala.types.TypeName.*; import com.ibm.wala.types.TypeReference; import com.ibm.wala.util.collections.HashMapFactory; import com.ibm.wala.util.collections.HashSetFactory; diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/strings/StringStuff.java b/com.ibm.wala.core/src/com/ibm/wala/util/strings/StringStuff.java index 5607dc078..d03f6a142 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/util/strings/StringStuff.java +++ b/com.ibm.wala.core/src/com/ibm/wala/util/strings/StringStuff.java @@ -10,7 +10,10 @@ *******************************************************************************/ package com.ibm.wala.util.strings; -import static com.ibm.wala.types.TypeName.*; +import static com.ibm.wala.types.TypeName.ArrayMask; +import static com.ibm.wala.types.TypeName.ElementBits; +import static com.ibm.wala.types.TypeName.PointerMask; +import static com.ibm.wala.types.TypeName.ReferenceMask; import static com.ibm.wala.types.TypeReference.ArrayTypeCode; import static com.ibm.wala.types.TypeReference.PointerTypeCode; import static com.ibm.wala.types.TypeReference.ReferenceTypeCode; diff --git a/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTSourceLoaderImpl.java b/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTSourceLoaderImpl.java index 7dc370691..77d299886 100644 --- a/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTSourceLoaderImpl.java +++ b/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTSourceLoaderImpl.java @@ -38,12 +38,10 @@ package com.ibm.wala.cast.java.translator.jdt; import java.io.IOException; -import java.util.List; import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl; import com.ibm.wala.cast.java.translator.SourceModuleTranslator; import com.ibm.wala.classLoader.IClassLoader; -import com.ibm.wala.classLoader.Module; import com.ibm.wala.ipa.callgraph.impl.SetOfClasses; import com.ibm.wala.ipa.cha.IClassHierarchy; import com.ibm.wala.types.ClassLoaderReference; diff --git a/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/ASTNodeFinder.java b/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/ASTNodeFinder.java index f7724d312..48c744dcc 100644 --- a/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/ASTNodeFinder.java +++ b/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/ASTNodeFinder.java @@ -1,13 +1,14 @@ package com.ibm.wala.ide.util; +import static com.ibm.wala.ide.util.JdtUtil.getAST; +import static com.ibm.wala.ide.util.JdtUtil.getOriginalNode; + import java.lang.ref.SoftReference; import java.util.Map; import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.dom.ASTNode; -import static com.ibm.wala.ide.util.JdtUtil.*; - import com.ibm.wala.util.collections.HashMapFactory; public class ASTNodeFinder { diff --git a/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java b/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java index bcf37bd2e..f37b3e0f3 100644 --- a/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java +++ b/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java @@ -11,7 +11,6 @@ package com.ibm.wala.ide.util; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphSlicer.java b/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphSlicer.java index 0440982cb..755adaa45 100644 --- a/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphSlicer.java +++ b/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphSlicer.java @@ -19,6 +19,7 @@ import java.util.Map; import java.util.Set; import com.ibm.wala.util.Predicate; +import com.ibm.wala.util.WalaException; import com.ibm.wala.util.collections.Filter; import com.ibm.wala.util.collections.FilterIterator; import com.ibm.wala.util.collections.FilterPredicate;