just refactoring ... introduce 2 new packages in wala.util.

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@2446 f5eafffb-2e1d-0410-98e4-8ec43c5233c4

com.ibm.wala.core/META-INF/MANIFEST.MF

@@ -54,6 +54,7 @@ Export-Package: .,
  com.ibm.wala.logic,
  com.ibm.wala.model,
  com.ibm.wala.model.java.lang,
+ com.ibm.wala.model.java.lang.reflect,
  com.ibm.wala.properties,
  com.ibm.wala.ssa,
  com.ibm.wala.ssa.analysis,
@@ -74,7 +75,9 @@ Export-Package: .,
  com.ibm.wala.util.io,
  com.ibm.wala.util.math,
  com.ibm.wala.util.perf,
+ com.ibm.wala.util.ref,
  com.ibm.wala.util.scope,
+ com.ibm.wala.util.strings,
  com.ibm.wala.util.tables,
  com.ibm.wala.util.warnings,
  com.ibm.wala.viz

com.ibm.wala.core/src/com/ibm/wala/analysis/pointers/BasicHeapGraph.java

@@ -24,10 +24,10 @@ import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.CompoundIterator;
 import com.ibm.wala.util.IntFunction;
-import com.ibm.wala.util.IntMapIterator;
+import com.ibm.wala.util.collections.CompoundIterator;
 import com.ibm.wala.util.collections.EmptyIterator;
+import com.ibm.wala.util.collections.IntMapIterator;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
 import com.ibm.wala.util.graph.AbstractNumberedGraph;

com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/CloneInterpreter.java

@@ -48,10 +48,10 @@ import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/ReceiverTypeInferenceCache.java

@@ -16,8 +16,8 @@ import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAOptions;
-import com.ibm.wala.util.CacheReference;
 import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.ref.CacheReference;
 
 /**
  * A soft cache of results of type inference

com.ibm.wala.core/src/com/ibm/wala/cfg/AbstractCFG.java

@@ -18,14 +18,14 @@ import java.util.List;
 
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.shrikeBT.Constants;
-import com.ibm.wala.util.CompoundIterator;
-import com.ibm.wala.util.IteratorPlusOne;
-import com.ibm.wala.util.IteratorPlusTwo;
+import com.ibm.wala.util.collections.CompoundIterator;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.Filter;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.IteratorPlusOne;
+import com.ibm.wala.util.collections.IteratorPlusTwo;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;

com.ibm.wala.core/src/com/ibm/wala/cfg/CFGCache.java

@@ -17,9 +17,9 @@ import java.util.Map;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ssa.IRFactory;
-import com.ibm.wala.util.CacheReference;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.Pair;
+import com.ibm.wala.util.ref.CacheReference;
 
 /**
  *

com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClass.java

@@ -21,10 +21,10 @@ import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * Implementation of {@link IClass} for array classes.

com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassFileModule.java

@@ -14,9 +14,9 @@ package com.ibm.wala.classLoader;
 import java.io.File;
 
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
-import com.ibm.wala.util.ImmutableByteArray;
 import com.ibm.wala.util.ShrikeClassReaderHandle;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.strings.ImmutableByteArray;
 
 /**
  *

com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java

@@ -24,7 +24,6 @@ import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeName;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.ShrikeClassReaderHandle;
 import com.ibm.wala.util.collections.HashCodeComparator;
 import com.ibm.wala.util.collections.HashMapFactory;
@@ -33,6 +32,7 @@ import com.ibm.wala.util.collections.Iterator2Collection;
 import com.ibm.wala.util.collections.ToStringComparator;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
+import com.ibm.wala.util.strings.Atom;
 import com.ibm.wala.util.warnings.Warning;
 import com.ibm.wala.util.warnings.Warnings;
 

com.ibm.wala.core/src/com/ibm/wala/classLoader/FieldImpl.java

@@ -15,8 +15,8 @@ import com.ibm.wala.shrikeCT.ClassConstants;
 import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.types.annotations.Annotation;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.strings.Atom;
 
 import java.util.Collection;
 import java.util.Collections;

com.ibm.wala.core/src/com/ibm/wala/classLoader/IClass.java

@@ -18,7 +18,7 @@ import com.ibm.wala.ipa.cha.IClassHierarchyDweller;
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  *

com.ibm.wala.core/src/com/ibm/wala/classLoader/IClassLoader.java

@@ -18,7 +18,7 @@ import java.util.Set;
 
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeName;
-import com.ibm.wala.util.Atom;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * Base class for an object that represents a single

com.ibm.wala.core/src/com/ibm/wala/classLoader/IMember.java

@@ -11,7 +11,7 @@
 package com.ibm.wala.classLoader;
 
 import com.ibm.wala.ipa.cha.IClassHierarchyDweller;
-import com.ibm.wala.util.Atom;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  *

com.ibm.wala.core/src/com/ibm/wala/classLoader/JarFileModule.java

@@ -20,10 +20,10 @@ import java.util.Iterator;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
-import com.ibm.wala.util.CacheReference;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.ref.CacheReference;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/classLoader/Language.java

@@ -4,7 +4,7 @@ import java.util.Set;
 
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
+import com.ibm.wala.util.strings.Atom;
 
 public interface Language {
 

com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java

@@ -41,14 +41,14 @@ import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.Exceptions;
-import com.ibm.wala.util.ImmutableByteArray;
 import com.ibm.wala.util.ShrikeUtil;
 import com.ibm.wala.util.bytecode.BytecodeStream;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.strings.Atom;
+import com.ibm.wala.util.strings.ImmutableByteArray;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java

@@ -39,8 +39,6 @@ import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.types.annotations.Annotation;
 import com.ibm.wala.types.generics.ClassSignature;
-import com.ibm.wala.util.Atom;
-import com.ibm.wala.util.ImmutableByteArray;
 import com.ibm.wala.util.ShrikeClassReaderHandle;
 import com.ibm.wala.util.collections.BimodalMap;
 import com.ibm.wala.util.collections.HashMapFactory;
@@ -48,6 +46,8 @@ import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.SmallMap;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
+import com.ibm.wala.util.strings.Atom;
+import com.ibm.wala.util.strings.ImmutableByteArray;
 import com.ibm.wala.util.warnings.Warning;
 import com.ibm.wala.util.warnings.Warnings;
 

com.ibm.wala.core/src/com/ibm/wala/classLoader/SyntheticMethod.java

@@ -21,9 +21,9 @@ import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.bytecode.BytecodeStream;
 import com.ibm.wala.util.debug.UnimplementedError;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * @author sfink

com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/ExplodedSupergraphPath.java

@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.Stack;
 
 import com.ibm.wala.ipa.callgraph.CGNode;
-import com.ibm.wala.util.CollectionFilter;
+import com.ibm.wala.util.collections.CollectionFilter;
 import com.ibm.wala.util.collections.Filter;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashMapFactory;

com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyCollapsedSupergraph.java

@@ -24,15 +24,15 @@ import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.cfg.BasicBlockInContext;
 import com.ibm.wala.ipa.cfg.InterproceduralCFG;
 import com.ibm.wala.ssa.ISSABasicBlock;
-import com.ibm.wala.util.CollectionFilter;
-import com.ibm.wala.util.CompoundIterator;
-import com.ibm.wala.util.IndiscriminateFilter;
+import com.ibm.wala.util.collections.CollectionFilter;
+import com.ibm.wala.util.collections.CompoundIterator;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.Filter;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.Filtersection;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.IndiscriminateFilter;
 import com.ibm.wala.util.collections.Iterator2Collection;
 import com.ibm.wala.util.collections.MapUtil;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;

com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java

@@ -25,7 +25,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import com.ibm.wala.cfg.IBasicBlock;
 import com.ibm.wala.eclipse.util.CancelException;
 import com.ibm.wala.eclipse.util.MonitorUtil;
-import com.ibm.wala.util.ReferenceCleanser;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Heap;
@@ -39,6 +38,7 @@ import com.ibm.wala.util.intset.IntSet;
 import com.ibm.wala.util.intset.IntSetAction;
 import com.ibm.wala.util.intset.MutableIntSet;
 import com.ibm.wala.util.intset.MutableSparseIntSet;
+import com.ibm.wala.util.ref.ReferenceCleanser;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java

@@ -103,10 +103,10 @@ import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAInvokeInstruction;
 import com.ibm.wala.util.Function;
-import com.ibm.wala.util.MapIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;

com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractDemandFlowGraph.java

@@ -64,12 +64,12 @@ import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAInvokeInstruction;
 import com.ibm.wala.ssa.SSAPhiInstruction;
-import com.ibm.wala.util.ReferenceCleanser;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
 import com.ibm.wala.util.intset.BitVectorIntSet;
+import com.ibm.wala.util.ref.ReferenceCleanser;
 
 /**
  * A graph representing program flow, constructed method-by-method on demand

com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/SimpleDemandPointerFlowGraph.java

@@ -64,7 +64,6 @@ import com.ibm.wala.ssa.SSAThrowInstruction;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.ReferenceCleanser;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
@@ -72,6 +71,7 @@ import com.ibm.wala.util.debug.UnimplementedError;
 import com.ibm.wala.util.graph.impl.SlowSparseNumberedGraph;
 import com.ibm.wala.util.intset.BitVectorIntSet;
 import com.ibm.wala.util.intset.IntSet;
+import com.ibm.wala.util.ref.ReferenceCleanser;
 import com.ibm.wala.util.warnings.ResolutionFailure;
 import com.ibm.wala.util.warnings.Warnings;
 

com.ibm.wala.core/src/com/ibm/wala/demandpa/util/ArrayContents.java

@@ -42,9 +42,9 @@ import com.ibm.wala.classLoader.IField;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * Pseudo-field modelling the contents of an array of reference type. Only for

com.ibm.wala.core/src/com/ibm/wala/eclipse/util/EclipseProjectPath.java

@@ -38,12 +38,12 @@ import com.ibm.wala.classLoader.SourceDirectoryTreeModule;
 import com.ibm.wala.client.impl.AbstractAnalysisEngine;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.MapUtil;
 import com.ibm.wala.util.config.*;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * Representation of an analysis scope from an Eclipse project.

com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisCache.java

@@ -15,7 +15,7 @@ import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ssa.DefaultIRFactory;
 import com.ibm.wala.ssa.IRFactory;
 import com.ibm.wala.ssa.SSACache;
-import com.ibm.wala.util.ReferenceCleanser;
+import com.ibm.wala.util.ref.ReferenceCleanser;
 
 /**
  * A place to hold onto caches of various analysis artifacts.

com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java

@@ -35,12 +35,12 @@ import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
-import com.ibm.wala.util.ImmutableByteArray;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.MapUtil;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
+import com.ibm.wala.util.strings.Atom;
+import com.ibm.wala.util.strings.ImmutableByteArray;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java

@@ -29,11 +29,11 @@ import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.util.IntFunction;
-import com.ibm.wala.util.IntMapIterator;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.Filter;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.IntMapIterator;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
 import com.ibm.wala.util.graph.EdgeManager;

com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeRootClass.java

@@ -25,10 +25,10 @@ import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeRootMethod.java

@@ -18,7 +18,7 @@ import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.types.MemberReference;
 import com.ibm.wala.types.MethodReference;
-import com.ibm.wala.util.Atom;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeWorldClinitMethod.java

@@ -15,7 +15,7 @@ import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.types.MethodReference;
-import com.ibm.wala.util.Atom;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * A synthetic method that calls all class initializers

com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/Util.java

@@ -45,12 +45,12 @@ import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.traverse.SlowDFSDiscoverTimeIterator;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * @author sfink

com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerFlowGraph.java

@@ -36,7 +36,6 @@ import com.ibm.wala.ssa.SSAThrowInstruction;
 import com.ibm.wala.ssa.SSACFG.BasicBlock;
 import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.ReferenceCleanser;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
@@ -45,6 +44,7 @@ import com.ibm.wala.util.graph.EdgeManager;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.NodeManager;
 import com.ibm.wala.util.graph.impl.SlowSparseNumberedGraph;
+import com.ibm.wala.util.ref.ReferenceCleanser;
 
 /**
  * A graphical view that represents the flow of pointers between abstract heap

com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationGraph.java

@@ -24,7 +24,7 @@ import com.ibm.wala.fixedpoint.impl.UnaryStatement;
 import com.ibm.wala.fixpoint.IFixedPointStatement;
 import com.ibm.wala.fixpoint.IFixedPointSystem;
 import com.ibm.wala.fixpoint.IVariable;
-import com.ibm.wala.util.CompoundIterator;
+import com.ibm.wala.util.collections.CompoundIterator;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.Filter;
 import com.ibm.wala.util.collections.FilterIterator;

com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationSystem.java

@@ -34,7 +34,6 @@ import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder.Filter
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.ClassHierarchyWarning;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.ReferenceCleanser;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
@@ -51,6 +50,7 @@ import com.ibm.wala.util.intset.IntSetAction;
 import com.ibm.wala.util.intset.IntSetUtil;
 import com.ibm.wala.util.intset.MutableIntSet;
 import com.ibm.wala.util.intset.MutableMapping;
+import com.ibm.wala.util.ref.ReferenceCleanser;
 import com.ibm.wala.util.warnings.Warnings;
 
 /**

com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java

@@ -71,13 +71,13 @@ import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.ReferenceCleanser;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.intset.IntSet;
 import com.ibm.wala.util.intset.IntSetAction;
 import com.ibm.wala.util.intset.IntSetUtil;
 import com.ibm.wala.util.intset.MutableIntSet;
+import com.ibm.wala.util.ref.ReferenceCleanser;
 import com.ibm.wala.util.warnings.ResolutionFailure;
 import com.ibm.wala.util.warnings.Warning;
 import com.ibm.wala.util.warnings.Warnings;

com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContainerContextSelector.java

@@ -26,8 +26,8 @@ import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/AbstractInterproceduralCFG.java

@@ -26,11 +26,11 @@ import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.util.Function;
-import com.ibm.wala.util.IndiscriminateFilter;
-import com.ibm.wala.util.MapIterator;
 import com.ibm.wala.util.collections.Filter;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.IndiscriminateFilter;
+import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
 import com.ibm.wala.util.graph.GraphIntegrity;

com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchy.java

@@ -38,18 +38,18 @@ import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
-import com.ibm.wala.util.CacheReference;
 import com.ibm.wala.util.Function;
-import com.ibm.wala.util.MapIterator;
-import com.ibm.wala.util.ReferenceCleanser;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.collections.MapUtil;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
 import com.ibm.wala.util.debug.UnimplementedError;
+import com.ibm.wala.util.ref.CacheReference;
+import com.ibm.wala.util.ref.ReferenceCleanser;
+import com.ibm.wala.util.strings.Atom;
 import com.ibm.wala.util.warnings.Warning;
 import com.ibm.wala.util.warnings.Warnings;
 

com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/SDG.java

@@ -27,7 +27,7 @@ import com.ibm.wala.ipa.slicer.Slicer.DataDependenceOptions;
 import com.ibm.wala.ipa.slicer.Statement.Kind;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
-import com.ibm.wala.util.CompoundIterator;
+import com.ibm.wala.util.collections.CompoundIterator;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;

com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassMethodTargetSelector.java

@@ -28,9 +28,9 @@ import com.ibm.wala.types.MemberReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.debug.Trace;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassSyntheticClass.java

@@ -23,10 +23,10 @@ import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * A synthetic implementation of a class

com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassSyntheticClassLoader.java

@@ -22,8 +22,8 @@ import com.ibm.wala.ipa.callgraph.impl.SetOfClasses;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeName;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * This class represents class loaders that introduce classes that do not exist

com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodBypass.java

@@ -22,11 +22,11 @@ import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.MemberReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java

@@ -45,11 +45,11 @@ import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
+import com.ibm.wala.util.strings.Atom;
 import com.ibm.wala.util.warnings.Warning;
 
 /**

com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLReflectionReader.java

@@ -34,10 +34,10 @@ import com.ibm.wala.types.MemberReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/ssa/AuxiliaryCache.java

@@ -17,11 +17,11 @@ import java.util.Map;
 
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.Context;
-import com.ibm.wala.util.CacheReference;
 import com.ibm.wala.util.collections.HashMapFactory;
 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.ref.CacheReference;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/ssa/IR.java

@@ -22,13 +22,13 @@ import com.ibm.wala.shrikeBT.IInstruction;
 import com.ibm.wala.ssa.SSACFG.BasicBlock;
 import com.ibm.wala.ssa.SSACFG.ExceptionHandlerBasicBlock;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.CompoundIterator;
-import com.ibm.wala.util.StringStuff;
+import com.ibm.wala.util.collections.CompoundIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.intset.BasicNaturalRelation;
 import com.ibm.wala.util.intset.IntIterator;
 import com.ibm.wala.util.intset.IntSet;
+import com.ibm.wala.util.strings.StringStuff;
 
 /**
  * An SSA IR

com.ibm.wala.core/src/com/ibm/wala/ssa/SSACFG.java

@@ -29,11 +29,11 @@ import com.ibm.wala.shrikeBT.ExceptionHandler;
 import com.ibm.wala.shrikeBT.IInstruction;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.Function;
-import com.ibm.wala.util.MapIterator;
 import com.ibm.wala.util.ShrikeUtil;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
 import com.ibm.wala.util.debug.UnimplementedError;

com.ibm.wala.core/src/com/ibm/wala/types/ClassLoaderReference.java

@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.types;
 
-import com.ibm.wala.util.Atom;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * Defines the meta-information that identifies a class loader. This is

com.ibm.wala.core/src/com/ibm/wala/types/Descriptor.java

@@ -12,11 +12,11 @@ package com.ibm.wala.types;
 
 import java.util.Map;
 
-import com.ibm.wala.util.ImmutableByteArray;
-import com.ibm.wala.util.StringStuff;
-import com.ibm.wala.util.UTF8Convert;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.strings.ImmutableByteArray;
+import com.ibm.wala.util.strings.StringStuff;
+import com.ibm.wala.util.strings.UTF8Convert;
 
 /**
  * A method descriptor; something like:

com.ibm.wala.core/src/com/ibm/wala/types/FieldReference.java

@@ -12,11 +12,11 @@ package com.ibm.wala.types;
 
 import java.util.HashMap;
 
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.ShrikeUtil;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * A class to represent the reference in a class file to a field.

com.ibm.wala.core/src/com/ibm/wala/types/MemberReference.java

@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.types;
 
-import com.ibm.wala.util.Atom;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * Abstract superclass of MethodReference and FieldReference

com.ibm.wala.core/src/com/ibm/wala/types/MethodReference.java

@@ -12,10 +12,10 @@ package com.ibm.wala.types;
 
 import java.util.HashMap;
 
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.ShrikeUtil;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * A class to represent the reference in a class file to a method.

com.ibm.wala.core/src/com/ibm/wala/types/Selector.java

@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.types;
 
-import com.ibm.wala.util.Atom;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * A method selector; something like: foo(Ljava/lang/String;)Ljava/lang/Class;

com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java

@@ -13,11 +13,11 @@ package com.ibm.wala.types;
 import java.io.UTFDataFormatException;
 import java.util.Map;
 
-import com.ibm.wala.util.Atom;
-import com.ibm.wala.util.ImmutableByteArray;
-import com.ibm.wala.util.StringStuff;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.strings.Atom;
+import com.ibm.wala.util.strings.ImmutableByteArray;
+import com.ibm.wala.util.strings.StringStuff;
 
 /**
  *

com.ibm.wala.core/src/com/ibm/wala/util/NormalCGNodeFilter.java

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package com.ibm.wala.util;
-
-import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.CGNode;
-import com.ibm.wala.util.collections.Filter;
-
-/**
- *
- * This silly set includes all nodes in the universe that represent
- * non-native, non-synthetic methods.
- * 
- * @author sfink
- */
-public class NormalCGNodeFilter implements Filter {
-
-  private final static NormalCGNodeFilter singleton = new NormalCGNodeFilter();
-
-  /**
-   * Class is a singleton
-   */
-  private NormalCGNodeFilter() {
-  }
-
-  /**
-   * @see java.util.Collection#contains(Object)
-   */
-  public boolean accepts(Object o) {
-    if (o instanceof CGNode) {
-      CGNode n = (CGNode) o;
-      IMethod m = n.getMethod();
-      return ((!m.isSynthetic()) && (!m.isNative()));
-    } else {
-      return false;
-    }
-  }
-
-  public static final Filter instance() {
-    return singleton;
-  }
-}

com.ibm.wala.core/src/com/ibm/wala/util/ShrikeClassReaderHandle.java

@@ -19,6 +19,7 @@ import com.ibm.wala.shrikeCT.ClassReader;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.Trace;
+import com.ibm.wala.util.ref.CacheReference;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/util/ShrikeUtil.java

@@ -21,6 +21,7 @@ import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.strings.ImmutableByteArray;
 
 /**
  * Utilties to interface with the Shrike CT library.
@@ -46,8 +47,6 @@ public class ShrikeUtil implements BytecodeConstants {
   }
 
   /**
-   * Method getInvocationCode.
-   * 
    * @param instruction
    * @return byte
    * @throws IllegalArgumentException  if instruction is null

com.ibm.wala.core/src/com/ibm/wala/util/collections/ArrayNonNullIterator.java

@@ -8,9 +8,8 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package com.ibm.wala.util;
+package com.ibm.wala.util.collections;
 
-import com.ibm.wala.util.collections.ArrayIterator;
 
 /**
  * Iterator that only returns non-null elements of the array 

com.ibm.wala.core/src/com/ibm/wala/util/collections/CollectionFilter.java

@@ -9,12 +9,11 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package com.ibm.wala.util;
+package com.ibm.wala.util.collections;
 
 import java.util.Collection;
 
 import com.ibm.wala.annotations.NonNull;
-import com.ibm.wala.util.collections.Filter;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/util/collections/CompoundIterator.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package com.ibm.wala.util;
+package com.ibm.wala.util.collections;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

com.ibm.wala.core/src/com/ibm/wala/util/collections/IndiscriminateFilter.java

@@ -9,9 +9,8 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package com.ibm.wala.util;
+package com.ibm.wala.util.collections;
 
-import com.ibm.wala.util.collections.Filter;
 
 /**
  * 

com.ibm.wala.core/src/com/ibm/wala/util/collections/IntMapIterator.java

@@ -8,10 +8,11 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package com.ibm.wala.util;
+package com.ibm.wala.util.collections;
 
 import java.util.Iterator;
 
+import com.ibm.wala.util.IntFunction;
 import com.ibm.wala.util.intset.IntIterator;
 
 /**

com.ibm.wala.core/src/com/ibm/wala/util/collections/IteratorPlusOne.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package com.ibm.wala.util;
+package com.ibm.wala.util.collections;
 
 import java.util.Iterator;
 

com.ibm.wala.core/src/com/ibm/wala/util/collections/IteratorPlusTwo.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package com.ibm.wala.util;
+package com.ibm.wala.util.collections;
 
 import java.util.Iterator;
 

com.ibm.wala.core/src/com/ibm/wala/util/collections/MapIterator.java

@@ -8,10 +8,12 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package com.ibm.wala.util;
+package com.ibm.wala.util.collections;
 
 import java.util.Iterator;
 
+import com.ibm.wala.util.Function;
+
 /**
  * An <code>MapIterator</code> maps an
  * <code>Iterator</code> contents to produce a new Iterator

com.ibm.wala.core/src/com/ibm/wala/util/config/AnalysisScopeReader.java

@@ -25,8 +25,8 @@ import com.ibm.wala.classLoader.SourceDirectoryTreeModule;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.properties.WalaProperties;
 import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * Reads {@link AnalysisScope} from a text file.

com.ibm.wala.core/src/com/ibm/wala/util/ref/CacheReference.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package com.ibm.wala.util;
+package com.ibm.wala.util.ref;
 
 import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;

com.ibm.wala.core/src/com/ibm/wala/util/ref/ReferenceCleanser.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package com.ibm.wala.util;
+package com.ibm.wala.util.ref;
 
 import java.lang.ref.WeakReference;
 import java.util.Iterator;

com.ibm.wala.core/src/com/ibm/wala/util/scope/JUnitEntryPoints.java

@@ -13,9 +13,9 @@ import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeName;
-import com.ibm.wala.util.Atom;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Trace;
+import com.ibm.wala.util.strings.Atom;
 
 /**
  * This class represents entry points (@link

com.ibm.wala.core/src/com/ibm/wala/util/strings/Atom.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package com.ibm.wala.util;
+package com.ibm.wala.util.strings;
 
 import java.util.HashMap;
 

com.ibm.wala.core/src/com/ibm/wala/util/strings/ImmutableByteArray.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package com.ibm.wala.util;
+package com.ibm.wala.util.strings;
 
 import com.ibm.wala.util.debug.Assertions;
 

com.ibm.wala.core/src/com/ibm/wala/util/strings/StringStuff.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package com.ibm.wala.util;
+package com.ibm.wala.util.strings;
 
 import java.util.ArrayList;
 import java.util.HashMap;

com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java

@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package com.ibm.wala.util;
+package com.ibm.wala.util.strings;
 
 import java.io.UTFDataFormatException;
 

com.ibm.wala.core/src/com/ibm/wala/util/tables/Table.java

@@ -13,10 +13,10 @@ package com.ibm.wala.util.tables;
 import java.util.ArrayList;
 import java.util.Map;
 
-import com.ibm.wala.util.StringStuff;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.intset.BitVector;
 import com.ibm.wala.util.intset.SimpleVector;
+import com.ibm.wala.util.strings.StringStuff;
 
 /**
  */

com.ibm.wala.core/src/com/ibm/wala/viz/GhostviewUtil.java

@@ -24,10 +24,10 @@ import com.ibm.wala.ssa.SSAPhiInstruction;
 import com.ibm.wala.ssa.SSAPiInstruction;
 import com.ibm.wala.ssa.SSACFG.BasicBlock;
 import com.ibm.wala.ssa.SSACFG.ExceptionHandlerBasicBlock;
-import com.ibm.wala.util.StringStuff;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.NodeDecorator;
+import com.ibm.wala.util.strings.StringStuff;
 import com.ibm.wala.util.warnings.WalaException;
 
 /**