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

Added file extension support for resolving source files 

in the classpath. Defaults to "java" for basic Eclipse
projects, but can be overriden for other Eclipse projects
for other languages.

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@1418 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
smarkstr 2007-07-11 15:14:19 +00:00
parent ed11059c98
commit fa0c9d98b4
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
com.ibm.wala.core/src/com/ibm/wala/classLoader/SourceDirectoryTreeModule.java
View File

@ -18,17 +18,30 @@ import com.ibm.wala.util.debug.Assertions;
* a module representing a directory tree of source files.
*
* @author julian dolby (?)
* @author smarkstr (added file extension)
*
*/
public class SourceDirectoryTreeModule extends DirectoryTreeModule {
/**
* file extension of source files in directory tree
* (defaults to "java" for Java source files)
*/
String fileExt = "java";
public SourceDirectoryTreeModule(File root) {
super(root);
}
public SourceDirectoryTreeModule(File root, String fileExt) {
super(root);
if (fileExt != null)
this.fileExt = fileExt;
}
@Override
protected boolean includeFile(File file) {
return file.getName().endsWith("java");
return file.getName().endsWith(fileExt);
}
@Override

32
com.ibm.wala.core/src/com/ibm/wala/eclipse/util/EclipseProjectPath.java
View File

@ -58,6 +58,7 @@ import com.ibm.wala.util.debug.Assertions;
*
* @author sjfink
* @author jdolby (some code moved here from EclipseProjectAnalysisEngine)
* @author smarkstr (added support for language file extensions)
*
*/
public class EclipseProjectPath {
@ -122,7 +123,7 @@ public class EclipseProjectPath {
* of modules
*/
@SuppressWarnings("restriction")
private void resolveClasspathEntry(IClasspathEntry entry, Loader loader) throws JavaModelException, IOException {
private void resolveClasspathEntry(IClasspathEntry entry, Loader loader, String fileExtension) throws JavaModelException, IOException {
IClasspathEntry e = JavaCore.getResolvedClasspathEntry(entry);
if (alreadyResolved.contains(e)) {
return;
@ -133,7 +134,7 @@ public class EclipseProjectPath {
if (e.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
IClasspathContainer cont = JavaCore.getClasspathContainer(entry.getPath(), project);
IClasspathEntry[] entries = cont.getClasspathEntries();
resolveClasspathEntries(entries, cont.getKind() == IClasspathContainer.K_APPLICATION ? loader : Loader.PRIMORDIAL);
resolveClasspathEntries(entries, cont.getKind() == IClasspathContainer.K_APPLICATION ? loader : Loader.PRIMORDIAL, fileExtension);
} else if (e.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
File file = makeAbsolute(e.getPath()).toFile();
JarFile j;
@ -148,7 +149,7 @@ public class EclipseProjectPath {
} else if (e.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
File file = makeAbsolute(e.getPath()).toFile();
Set<Module> s = MapUtil.findOrCreateSet(sourceModules, Loader.SOURCE);
s.add(new SourceDirectoryTreeModule(file));
s.add(new SourceDirectoryTreeModule(file, fileExtension));
if (e.getOutputLocation() != null) {
File output = makeAbsolute(e.getOutputLocation()).toFile();
s = MapUtil.findOrCreateSet(binaryModules, loader);
@ -162,7 +163,7 @@ public class EclipseProjectPath {
try {
if (project.hasNature(JavaCore.NATURE_ID)) {
IJavaProject javaProject = JavaCore.create(project);
resolveClasspathEntries(javaProject.getRawClasspath(), loader);
resolveClasspathEntries(javaProject.getRawClasspath(), loader, fileExtension);
File output = makeAbsolute(javaProject.getOutputLocation()).toFile();
Set<Module> s = MapUtil.findOrCreateSet(binaryModules, loader);
s.add(new BinaryDirectoryTreeModule(output));
@ -176,9 +177,9 @@ public class EclipseProjectPath {
}
}
protected void resolveClasspathEntries(IClasspathEntry[] entries, Loader loader) throws JavaModelException, IOException {
protected void resolveClasspathEntries(IClasspathEntry[] entries, Loader loader, String fileExtension) throws JavaModelException, IOException {
for (int i = 0; i < entries.length; i++) {
resolveClasspathEntry(entries[i], loader);
resolveClasspathEntry(entries[i], loader, fileExtension);
}
}
@ -189,8 +190,25 @@ public class EclipseProjectPath {
return workspaceRootPath.append(p);
}
/**
* If file extension is not provided, use system default
*
* @throws JavaModelException
* @throws IOException
*/
public void resolveProjectClasspathEntries() throws JavaModelException, IOException {
resolveClasspathEntries(project.getRawClasspath(), Loader.EXTENSION);
resolveClasspathEntries(project.getRawClasspath(), Loader.EXTENSION, null);
}
/**
* If file extension is provided, use that to resolve source files in the classpath
*
* @param fileExtension
* @throws JavaModelException
* @throws IOException
*/
public void resolveProjectClasspathEntries(String fileExtension) throws JavaModelException, IOException {
resolveClasspathEntries(project.getRawClasspath(), Loader.EXTENSION, fileExtension);
}
/**