Attachment 11906 Details for Bug 65186 – Patch to apply on HEAD

[patch] Patch to apply on HEAD

patch_for_65186.txt (text/plain), 3.33 KB, created by Olivier Thomann

on 2004-06-10 16:04:59 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2004-06-10 16:04:59 EDT

Size: 3.33 KB

patch

obsolete

>Index: model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java,v
>retrieving revision 1.101
>diff -u -r1.101 PackageFragmentRoot.java
>--- model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java	7 Jun 2004 16:49:19 -0000	1.101
>+++ model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java	10 Jun 2004 18:20:45 -0000
>@@ -373,7 +373,7 @@
> 					if (org.eclipse.jdt.internal.compiler.util.Util.isArchiveFileName(file.getName())){
> 						return entry;
> 					}
>-				} else if (target instanceof IFolder) {
>+				} else if (target instanceof IFolder || target instanceof IProject) {
> 					return entry;
> 				}
> 				if (target instanceof java.io.File){
>Index: model/org/eclipse/jdt/internal/core/SourceMapper.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java,v
>retrieving revision 1.87
>diff -u -r1.87 SourceMapper.java
>--- model/org/eclipse/jdt/internal/core/SourceMapper.java	27 May 2004 14:41:39 -0000	1.87
>+++ model/org/eclipse/jdt/internal/core/SourceMapper.java	10 Jun 2004 18:20:45 -0000
>@@ -412,8 +412,8 @@
> 			}
> 		} else {
> 			Object target = JavaModel.getTarget(ResourcesPlugin.getWorkspace().getRoot(), this.sourcePath, true);
>-			if (target instanceof IFolder) {
>-				computeRootPath((IFolder)target, firstLevelPackageNames, containsADefaultPackage);
>+			if (target instanceof IContainer) {
>+				computeRootPath((IContainer)target, firstLevelPackageNames, containsADefaultPackage);
> 			} else if (target instanceof File) {
> 				File file = (File)target;
> 				if (file.isDirectory()) {
>@@ -454,9 +454,9 @@
> 		}
> 	}	
> 
>-	private void computeRootPath(IFolder directory, HashSet firstLevelPackageNames, boolean hasDefaultPackage) {
>+	private void computeRootPath(IContainer container, HashSet firstLevelPackageNames, boolean hasDefaultPackage) {
> 		try {
>-			IResource[] resources = directory.members();
>+			IResource[] resources = container.members();
> 			boolean hasSubDirectories = false;
> 			loop: for (int i = 0, max = resources.length; i < max; i++) {
> 				IResource resource = resources[i];
>@@ -472,9 +472,9 @@
> 					}
> 				}
> 				if (i == max - 1 && !hasSubDirectories && hasDefaultPackage) {
>-					IContainer container = resource.getParent();
>+					IContainer container2 = resource.getParent();
> 					// check if one member is a .java file
>-					IResource[] members = container.members();
>+					IResource[] members = container2.members();
> 					boolean hasJavaSourceFile = false;
> 					for (int j = 0, max2 = members.length; j < max2; j++) {
> 						if (Util.isJavaFileName(members[i].getName())) {
>@@ -907,9 +907,8 @@
> 			}
> 		} else {
> 			Object target = JavaModel.getTarget(ResourcesPlugin.getWorkspace().getRoot(), this.sourcePath, true);
>-			if (target instanceof IFolder) {
>-				IFolder folder = (IFolder)target;
>-				IResource res = folder.findMember(fullName);
>+			if (target instanceof IContainer) {
>+				IResource res = ((IContainer)target).findMember(fullName);
> 				if (res instanceof IFile) {
> 					try {
> 						source = org.eclipse.jdt.internal.core.util.Util.getResourceContentsAsCharArray((IFile)res);

Actions: View | Diff

Attachments on bug 65186: 11906 | 11907 | 12205