miscellaneous minor cleanups. eclipse build stuff. import statements.
git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@679 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
parent
0cbace78e1
commit
6937ed8e80
|
@ -12,15 +12,8 @@ package com.ibm.wala.eclipse.cg.model;
|
|||
|
||||
import java.util.Collection;
|
||||
|
||||
import org.eclipse.jface.window.ApplicationWindow;
|
||||
|
||||
import com.ibm.wala.ecore.java.scope.EJavaAnalysisScope;
|
||||
import com.ibm.wala.emf.wrappers.EMFScopeWrapper;
|
||||
import com.ibm.wala.emf.wrappers.JavaScopeUtil;
|
||||
import com.ibm.wala.ipa.callgraph.CallGraph;
|
||||
import com.ibm.wala.util.graph.Graph;
|
||||
import com.ibm.wala.util.warnings.WalaException;
|
||||
import com.ibm.wala.viz.SWTTreeViewer;
|
||||
|
||||
|
||||
public interface WalaCGModel {
|
||||
|
|
|
@ -10,22 +10,23 @@
|
|||
*******************************************************************************/
|
||||
package com.ibm.wala.eclipse.cg.model;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
|
||||
import org.eclipse.jdt.core.IJavaProject;
|
||||
|
||||
import com.ibm.wala.cast.java.client.EclipseProjectSourceAnalysisEngine;
|
||||
import com.ibm.wala.cast.js.client.JavaScriptAnalysisEngine;
|
||||
import com.ibm.wala.cast.js.translator.*;
|
||||
import com.ibm.wala.cast.js.util.*;
|
||||
import com.ibm.wala.client.impl.*;
|
||||
import com.ibm.wala.classLoader.*;
|
||||
import com.ibm.wala.ipa.callgraph.*;
|
||||
import com.ibm.wala.ipa.cha.*;
|
||||
import com.ibm.wala.util.graph.Graph;
|
||||
import com.ibm.wala.cast.js.translator.JavaScriptTranslatorFactory;
|
||||
import com.ibm.wala.cast.js.util.WebUtil;
|
||||
import com.ibm.wala.classLoader.SourceFileModule;
|
||||
import com.ibm.wala.client.impl.AbstractAnalysisEngine;
|
||||
import com.ibm.wala.ipa.callgraph.AnalysisScope;
|
||||
import com.ibm.wala.ipa.callgraph.CallGraph;
|
||||
import com.ibm.wala.ipa.callgraph.Entrypoints;
|
||||
import com.ibm.wala.ipa.cha.ClassHierarchy;
|
||||
import com.ibm.wala.util.warnings.WalaException;
|
||||
|
||||
import org.eclipse.jface.window.ApplicationWindow;
|
||||
import org.eclipse.jdt.core.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
abstract public class WalaProjectCGModel implements WalaCGModel {
|
||||
|
||||
protected AbstractAnalysisEngine engine;
|
||||
|
|
|
@ -10,17 +10,18 @@
|
|||
*******************************************************************************/
|
||||
package com.ibm.wala.eclipse.cg.model;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
import org.eclipse.jdt.core.IJavaProject;
|
||||
import org.eclipse.jdt.core.IType;
|
||||
|
||||
import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
|
||||
import com.ibm.wala.ipa.callgraph.*;
|
||||
import com.ibm.wala.ipa.callgraph.impl.Util;
|
||||
import com.ibm.wala.ipa.callgraph.AnalysisScope;
|
||||
import com.ibm.wala.ipa.callgraph.CallGraph;
|
||||
import com.ibm.wala.ipa.callgraph.Entrypoints;
|
||||
import com.ibm.wala.ipa.cha.ClassHierarchy;
|
||||
import com.ibm.wala.util.graph.InferGraphRootsImpl;
|
||||
import com.ibm.wala.util.warnings.WalaException;
|
||||
import com.ibm.wala.util.warnings.WarningSet;
|
||||
|
||||
import org.eclipse.jdt.core.*;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
|
@ -10,18 +10,16 @@
|
|||
*******************************************************************************/
|
||||
package com.ibm.wala.eclipse.cg.model;
|
||||
|
||||
import com.ibm.wala.cast.js.ipa.callgraph.*;
|
||||
import com.ibm.wala.cast.js.types.*;
|
||||
import com.ibm.wala.ipa.callgraph.*;
|
||||
import com.ibm.wala.ipa.callgraph.impl.Util;
|
||||
import java.util.Collection;
|
||||
|
||||
import com.ibm.wala.cast.js.ipa.callgraph.JavaScriptEntryPoints;
|
||||
import com.ibm.wala.cast.js.types.JavaScriptTypes;
|
||||
import com.ibm.wala.ipa.callgraph.AnalysisScope;
|
||||
import com.ibm.wala.ipa.callgraph.CallGraph;
|
||||
import com.ibm.wala.ipa.callgraph.Entrypoints;
|
||||
import com.ibm.wala.ipa.cha.ClassHierarchy;
|
||||
import com.ibm.wala.util.graph.InferGraphRootsImpl;
|
||||
import com.ibm.wala.util.warnings.WalaException;
|
||||
import com.ibm.wala.util.warnings.WarningSet;
|
||||
|
||||
import org.eclipse.jdt.core.*;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
|
@ -14,9 +14,7 @@ package com.ibm.wala.eclipse.cg.views;
|
|||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.jdt.core.IJavaElement;
|
||||
import org.eclipse.jface.viewers.ITreeContentProvider;
|
||||
import org.eclipse.jface.viewers.Viewer;
|
||||
|
||||
|
@ -67,6 +65,7 @@ public class CGContentProvider implements ITreeContentProvider {
|
|||
*
|
||||
* @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public Object[] getChildren(Object parentElement) {
|
||||
Collection result = new ArrayList();
|
||||
|
||||
|
|
|
@ -16,10 +16,7 @@ import com.ibm.wala.classLoader.CallSiteReference;
|
|||
import com.ibm.wala.classLoader.IMethod;
|
||||
import com.ibm.wala.classLoader.ShrikeBTMethod;
|
||||
import com.ibm.wala.ipa.callgraph.CGNode;
|
||||
import com.ibm.wala.ipa.callgraph.CallGraph;
|
||||
import com.ibm.wala.ssa.IR;
|
||||
import com.ibm.wala.util.collections.Pair;
|
||||
import com.ibm.wala.util.warnings.WarningSet;
|
||||
|
||||
public class CGJavaLabelProvider extends LabelProvider {
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@ import java.util.Collection;
|
|||
import java.util.Map;
|
||||
|
||||
import org.eclipse.core.resources.IFile;
|
||||
import org.eclipse.core.resources.IProject;
|
||||
import org.eclipse.jdt.core.IJavaElement;
|
||||
import org.eclipse.jdt.core.IJavaProject;
|
||||
import org.eclipse.jdt.core.IType;
|
||||
|
@ -31,7 +30,11 @@ import org.eclipse.swt.widgets.Composite;
|
|||
import org.eclipse.ui.PartInitException;
|
||||
import org.eclipse.ui.part.ViewPart;
|
||||
|
||||
import com.ibm.wala.eclipse.cg.model.*;
|
||||
import com.ibm.wala.eclipse.cg.model.WalaCGModel;
|
||||
import com.ibm.wala.eclipse.cg.model.WalaJarFileCGModelWithMain;
|
||||
import com.ibm.wala.eclipse.cg.model.WalaProjectCGModelWithMain;
|
||||
import com.ibm.wala.eclipse.cg.model.WalaProjectCGModelWithType;
|
||||
import com.ibm.wala.eclipse.cg.model.WalaWebPageCGModel;
|
||||
import com.ibm.wala.eclipse.util.CapaToJavaEltConverter;
|
||||
import com.ibm.wala.eclipse.util.JdtUtil;
|
||||
import com.ibm.wala.ipa.callgraph.CGNode;
|
||||
|
@ -157,7 +160,7 @@ public class CGView extends ViewPart {
|
|||
private void createScriptViewer(Composite parent, IFile htmlFile) {
|
||||
// get the selected script file
|
||||
String scriptPathName = htmlFile.getRawLocation().toString();
|
||||
IProject project = htmlFile.getProject();
|
||||
// IProject project = htmlFile.getProject();
|
||||
|
||||
// compute the call graph
|
||||
WalaCGModel model = new WalaWebPageCGModel(scriptPathName);
|
||||
|
|
Loading…
Reference in New Issue