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

some stronger types to avoid generics warnings 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@495 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
sjfink 2006-11-22 19:08:02 +00:00
parent 2e084319f2
commit e50eb2f691
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
com.ibm.wala.eclipse/src/com/ibm/wala/eclipse/cg/model/WalaCGModel.java
View File

@ -51,7 +51,7 @@ abstract public class WalaCGModel {
roots = inferRoots(callGraph);
}
public Graph getGraph() {
public CallGraph getGraph() {
return callGraph;
}
@ -76,7 +76,7 @@ abstract public class WalaCGModel {
abstract protected Collection inferRoots(CallGraph cg) throws WalaException;
public ApplicationWindow makeUI(Graph graph, Collection roots) throws WalaException {
public ApplicationWindow makeUI(Graph graph, Collection<?> roots) throws WalaException {
final SWTTreeViewer v = new SWTTreeViewer();
v.setGraphInput(graph);
v.setRootsInput(roots);

6
com.ibm.wala.eclipse/src/com/ibm/wala/eclipse/cg/views/CGContentProvider.java
View File

@ -21,8 +21,8 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import com.ibm.wala.ipa.callgraph.CGNode;
import com.ibm.wala.ipa.callgraph.CallGraph;
import com.ibm.wala.util.debug.Assertions;
import com.ibm.wala.util.graph.Graph;
/**
* @author sfink
@ -32,13 +32,13 @@ import com.ibm.wala.util.graph.Graph;
*/
public class CGContentProvider implements ITreeContentProvider {
protected Graph graph;
protected CallGraph graph;
protected Collection roots;
protected Map<Integer, IJavaElement> capaNodeIdToJavaElement = null;
public CGContentProvider(Graph g, Collection roots, Map<Integer, IJavaElement> capaNodeIdToJavaElement) {
public CGContentProvider(CallGraph g, Collection roots, Map<Integer, IJavaElement> capaNodeIdToJavaElement) {
this.graph = g;
this.roots = roots;
this.capaNodeIdToJavaElement = capaNodeIdToJavaElement;

4
com.ibm.wala.eclipse/src/com/ibm/wala/eclipse/cg/views/CGView.java
View File

@ -34,7 +34,7 @@ import com.ibm.wala.eclipse.cg.model.WalaCGModelWithMain;
import com.ibm.wala.eclipse.util.CapaToJavaEltConverter;
import com.ibm.wala.eclipse.util.JdtUtil;
import com.ibm.wala.ipa.callgraph.CGNode;
import com.ibm.wala.util.graph.Graph;
import com.ibm.wala.ipa.callgraph.CallGraph;
import com.ibm.wala.util.warnings.WalaException;
/**
@ -99,7 +99,7 @@ public class CGView extends ViewPart {
WalaCGModel model = new WalaCGModelWithMain(applicationJar);
model.buildGraph();
Collection roots = model.getRoots();
Graph graph = model.getGraph();
CallGraph graph = model.getGraph();
// convert call graph nodes to Eclipse JDT elements
final Map<Integer, IJavaElement> capaNodeIdToJavaElement = CapaToJavaEltConverter.convert(