diff options
author | cjaun | 2010-03-26 13:41:46 +0000 |
---|---|---|
committer | cjaun | 2010-03-26 13:41:46 +0000 |
commit | 22e9b4dfdac8c5e3d486d2ac3381b62762eb3a29 (patch) | |
tree | c2d244e691e583c8c95c163debfafe6002bdb9b1 | |
parent | ee38b3a9920c7afa0ce485208aff14467b8ab39c (diff) | |
download | webtools.jsdt.core-22e9b4dfdac8c5e3d486d2ac3381b62762eb3a29.tar.gz webtools.jsdt.core-22e9b4dfdac8c5e3d486d2ac3381b62762eb3a29.tar.xz webtools.jsdt.core-22e9b4dfdac8c5e3d486d2ac3381b62762eb3a29.zip |
[307063] Make DocumentContextFragmentRoot support a wildcard "*" pattern
-rw-r--r-- | bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/DocumentContextFragmentRoot.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/DocumentContextFragmentRoot.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/DocumentContextFragmentRoot.java index 4d6da3be..6416b465 100644 --- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/DocumentContextFragmentRoot.java +++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/DocumentContextFragmentRoot.java @@ -108,7 +108,11 @@ public class DocumentContextFragmentRoot extends PackageFragmentRoot{ if(DEBUG) System.out.println("DocumentContextFragmentRoot ====>" + "Accepting binding.. " + new String(simpleTypeName) + " in " + path + "\n\tfor file " + fRelativeFile.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ this.foundPaths.add(path); return true; - }else if(HACK_DOJO) { + } else if(includedFiles[i].equals("*")) { //$NON-NLS-1$ + this.foundPaths.add(path); + return true; + } + else if(HACK_DOJO) { String includeString = includedFiles[i]; if(path.toLowerCase().indexOf(DOJO_COMPRESSED)>0 && (includeString.toLowerCase().indexOf(UNCOMPRESSED_DOJO)>0)) { this.foundPaths.add(path); @@ -313,9 +317,13 @@ public class DocumentContextFragmentRoot extends PackageFragmentRoot{ for(int i = 0; i<fileNames.length;i++) { File importFile = isValidImport(fileNames[i]); - if(importFile==null) continue; - IPath importPath = resolveChildPath(fileNames[i]); - newImports[arrayLength++] = importPath.toString(); + if(importFile==null && !fileNames[i].equals("*")) continue; //$NON-NLS-1$ + if(fileNames[i].equals("*")) { + newImports[arrayLength++] = fileNames[i]; + } else { + IPath importPath = resolveChildPath(fileNames[i]); + newImports[arrayLength++] = importPath.toString(); + } //newTimestamps[arrayLength] = new Long(importFile.lastModified()); //arrayLength++; @@ -403,7 +411,7 @@ public class DocumentContextFragmentRoot extends PackageFragmentRoot{ for(int i = 0;i<includedFiles.length;i++) { IResource theFile = folder.findMember(includedFiles[i]); - if(javaProject.isOnIncludepath(theFile)) continue; + if(theFile == null || javaProject.isOnIncludepath(theFile)) continue; IIncludePathEntry entry = JavaScriptCore.newLibraryEntry(theFile.getLocation().makeAbsolute(), null, null, new IAccessRule[0], new IIncludePathAttribute[] {IIncludePathAttribute.HIDE}, true); newEntriesList.add(entry); |