DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

API change for IClass.getDeclaredMethods() 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@521 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
sjfink 2007-01-02 16:50:31 +00:00
parent 184cca27fb
commit 05fb718826
12 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClass.java
View File

@ -11,8 +11,8 @@
package com.ibm.wala.classLoader;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import com.ibm.wala.ipa.cha.ClassHierarchy;
import com.ibm.wala.ipa.cha.ClassHierarchyException;
@ -22,7 +22,6 @@ 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.EmptyIterator;
import com.ibm.wala.util.collections.HashSetFactory;
import com.ibm.wala.util.debug.Assertions;
@ -161,8 +160,8 @@ public class ArrayClass implements IClass, Constants {
*
* @see com.ibm.wala.classLoader.IClass#getDeclaredMethods()
*/
public Iterator<IMethod> getDeclaredMethods() {
return EmptyIterator.instance();
public Collection<IMethod> getDeclaredMethods() {
return Collections.emptySet();
}
public int getNumberOfDeclaredMethods() {

5
com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java
View File

@ -458,10 +458,7 @@ public class ClassLoaderImpl implements IClassLoader {
int result = 0;
for (Iterator<IClass> it = iterateAllClasses(); it.hasNext();) {
IClass klass = it.next();
for (Iterator i2 = klass.getDeclaredMethods(); i2.hasNext();) {
i2.next();
result++;
}
result += klass.getDeclaredMethods().size();
}
return result;
}

3
com.ibm.wala.core/src/com/ibm/wala/classLoader/IClass.java
View File

@ -12,7 +12,6 @@
package com.ibm.wala.classLoader;
import java.util.Collection;
import java.util.Iterator;
import com.ibm.wala.ipa.cha.ClassHierarchyException;
import com.ibm.wala.ipa.cha.IClassHierarchyDweller;
@ -118,7 +117,7 @@ public interface IClass extends IClassHierarchyDweller {
/**
* @return an Iterator of the IMethods declared by this class.
*/
Iterator<IMethod> getDeclaredMethods();
Collection<IMethod> getDeclaredMethods();
/**
* Compute the instance fields declared by this class or any of

10
com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTClassWrapper.java
View File

@ -684,7 +684,7 @@ public final class ShrikeCTClassWrapper implements IClass {
*
* @see com.ibm.wala.classLoader.IClass#getDeclaredMethods()
*/
public Iterator<IMethod> getDeclaredMethods() {
public Collection<IMethod> getDeclaredMethods() {
if (methodMap == null) {
try {
computeMethodMap();
@ -693,7 +693,7 @@ public final class ShrikeCTClassWrapper implements IClass {
Assertions.UNREACHABLE();
}
}
return methodMap.values().iterator();
return Collections.unmodifiableCollection(methodMap.values());
}
/*
@ -755,7 +755,7 @@ public final class ShrikeCTClassWrapper implements IClass {
public void clearSoftCaches() {
// toss optional information from each method.
if (methodMap != null) {
for (Iterator it = getDeclaredMethods(); it.hasNext();) {
for (Iterator it = getDeclaredMethods().iterator(); it.hasNext();) {
ShrikeCTMethodWrapper m = (ShrikeCTMethodWrapper) it.next();
m.clearCaches();
}
@ -807,13 +807,13 @@ public final class ShrikeCTClassWrapper implements IClass {
*/
public Collection<IMethod> getAllMethods() throws ClassHierarchyException {
Collection<IMethod> result = new LinkedList<IMethod>();
Iterator<IMethod> declaredMethods = getDeclaredMethods();
Iterator<IMethod> declaredMethods = getDeclaredMethods().iterator();
while (declaredMethods.hasNext()) {
result.add(declaredMethods.next());
}
IClass s = getSuperclass();
while (s != null) {
Iterator<IMethod> superDeclaredMethods = s.getDeclaredMethods();
Iterator<IMethod> superDeclaredMethods = s.getDeclaredMethods().iterator();
while (superDeclaredMethods.hasNext()) {
result.add(superDeclaredMethods.next());
}

2
com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/AllApplicationEntrypoints.java
View File

@ -40,7 +40,7 @@ public class AllApplicationEntrypoints extends BasicEntrypoints {
IClass klass = classIt.next();
if (!klass.isInterface()) {
if (isApplicationClass(scope, klass)) {
for (Iterator methodIt = klass.getDeclaredMethods(); methodIt.hasNext();) {
for (Iterator methodIt = klass.getDeclaredMethods().iterator(); methodIt.hasNext();) {
IMethod method = (IMethod) methodIt.next();
if (!method.isAbstract()) {
add(new ArgumentTypeEntrypoint(method, cha));

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

@ -186,7 +186,7 @@ public class FakeRootMethod extends SyntheticMethod {
*
* @see com.ibm.wala.classLoader.IClass#getDeclaredMethods()
*/
public Iterator<IMethod> getDeclaredMethods() {
public Collection<IMethod> getDeclaredMethods() {
// TODO Auto-generated method stub
Assertions.UNREACHABLE();
return null;

2
com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/BasicRTABuilder.java
View File

@ -84,7 +84,7 @@ public class BasicRTABuilder extends AbstractRTABuilder {
if (DEBUG) {
Trace.println("registerImplementedMethods: " + declarer + " " + iKey);
}
for (Iterator it = declarer.getDeclaredMethods(); it.hasNext();) {
for (Iterator it = declarer.getDeclaredMethods().iterator(); it.hasNext();) {
IMethod M = (IMethod) it.next();
Selector selector = M.getReference().getSelector();
PointerKey sKey = getKeyForSelector(selector);

3
com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassSyntheticClass.java
View File

@ -12,7 +12,6 @@ package com.ibm.wala.ipa.summaries;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import com.ibm.wala.classLoader.IClass;
import com.ibm.wala.classLoader.IClassLoader;
@ -155,7 +154,7 @@ public class BypassSyntheticClass extends SyntheticClass {
*
* @see com.ibm.wala.classLoader.IClass#getDeclaredMethods()
*/
public Iterator<IMethod> getDeclaredMethods() {
public Collection<IMethod> getDeclaredMethods() {
return realType.getDeclaredMethods();
}

1
com.ibm.wala.core/src/com/ibm/wala/types/MethodReference.java
View File

@ -47,7 +47,6 @@ public final class MethodReference extends MemberReference {
public final static Atom initAtom = Atom.findOrCreateUnicodeAtom("<init>");
public final static Descriptor defaultInitDesc = Descriptor.findOrCreateUTF8("()V");
public final static Selector initSelector = new Selector(initAtom, defaultInitDesc);
public final static Atom clinitName = Atom.findOrCreateUnicodeAtom("<clinit>");

2
com.ibm.wala.core/src/com/ibm/wala/util/ReferenceCleanser.java
View File

@ -80,7 +80,7 @@ public class ReferenceCleanser {
ShrikeCTClassWrapper c = (ShrikeCTClassWrapper) klass;
c.clearSoftCaches();
} else {
for (Iterator it2 = klass.getDeclaredMethods(); it2.hasNext(); ) {
for (Iterator it2 = klass.getDeclaredMethods().iterator(); it2.hasNext(); ) {
IMethod m = (IMethod)it2.next();
if (m instanceof ShrikeCTMethodWrapper) {
((ShrikeCTMethodWrapper)m).clearCaches();

2
com.ibm.wala.core/src/com/ibm/wala/util/scope/EclipseEntrypoints.java
View File

@ -80,7 +80,7 @@ public class EclipseEntrypoints extends BasicEntrypoints {
}
if (!klass.isInterface()) {
if (isApplicationClass(scope, klass)) {
for (Iterator methodIt = klass.getDeclaredMethods(); methodIt.hasNext();) {
for (Iterator methodIt = klass.getDeclaredMethods().iterator(); methodIt.hasNext();) {
IMethod method = (IMethod) methodIt.next();
if (!method.isAbstract() && method.isPublic() || method.isProtected()) {
add(new ArgumentTypeEntrypoint(method, cha));

4
com.ibm.wala.core/src/com/ibm/wala/util/scope/JUnitEntryPoints.java
View File

@ -103,7 +103,7 @@ public class JUnitEntryPoints {
Trace.println("found test class");
}
// add entry point corresponding to the target method
for (Iterator methodsIt = klass.getDeclaredMethods(); methodsIt.hasNext();) {
for (Iterator methodsIt = klass.getDeclaredMethods().iterator(); methodsIt.hasNext();) {
IMethod method = (IMethod) methodsIt.next();
Atom methodAtom = method.getName();
if (methodAtom.equals(targetMethodAtom)) {
@ -181,7 +181,7 @@ public class JUnitEntryPoints {
IClass currClass = testClass;
while (currClass != null && !currClass.getName().equals(junitTestCaseType) && !currClass.getName().equals(junitTestSuiteType)) {
for (Iterator methodsIt = currClass.getDeclaredMethods(); methodsIt.hasNext();) {
for (Iterator methodsIt = currClass.getDeclaredMethods().iterator(); methodsIt.hasNext();) {
IMethod method = (IMethod) methodsIt.next();
final Atom methodAtom = method.getName();