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

adapt to eclipse luna

This commit is contained in:
Julian Dolby 2014-10-10 17:47:50 -04:00
parent 63232e4a02
commit 0e55cd2eec
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/FakeExceptionTypeBinding.java
View File

@ -440,4 +440,16 @@ public class FakeExceptionTypeBinding implements ITypeBinding {
return 0;
}
@Override
public IMethodBinding getFunctionalInterfaceMethod() {
Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
return null;
}
@Override
public IAnnotationBinding[] getTypeAnnotations() {
Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
return null;
}
}

10
com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java
View File

@ -29,11 +29,13 @@ import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.internal.core.ClasspathEntry;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.osgi.service.resolver.ImportPackageSpecification;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.internal.core.ClasspathUtilCore;
import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.pde.internal.core.PDEStateHelper;
import com.ibm.wala.classLoader.BinaryDirectoryTreeModule;
import com.ibm.wala.classLoader.JarFileModule;
@ -239,13 +241,13 @@ public abstract class EclipseProjectPath<E, P> {
bundlesProcessed.add(bd.getName());
// handle the classpath entries for bd
ArrayList l = new ArrayList();
ArrayList<IClasspathEntry> l = new ArrayList<IClasspathEntry>();
ClasspathUtilCore.addLibraries(findModel(bd), l);
resolveClasspathEntries(project, l, loader, includeSource, false);
// recurse to handle dependencies. put these in the Extension loader
for (BundleDescription b : PDEStateHelper.getImportedBundles(bd)) {
resolveBundleDescriptionClassPath(project, b, Loader.EXTENSION, includeSource);
for (ImportPackageSpecification b : bd.getImportPackages()) {
resolveBundleDescriptionClassPath(project, b.getBundle(), Loader.EXTENSION, includeSource);
}
for (BundleDescription b : bd.getResolvedRequires()) {
resolveBundleDescriptionClassPath(project, b, Loader.EXTENSION, includeSource);