View | Details | Raw Unified | Return to bug 204652 | Differences between
and this patch

Collapse All | Expand All

(-)search/org/eclipse/jdt/internal/core/search/JavaSearchScope.java (-3 / +3 lines)
Lines 580-588 Link Here
580
		String projectPath = idx == -1 ? null : (String) this.projectPaths.get(idx);
580
		String projectPath = idx == -1 ? null : (String) this.projectPaths.get(idx);
581
		if (projectPath != null) {
581
		if (projectPath != null) {
582
			IJavaProject project =JavaCore.create(ResourcesPlugin.getWorkspace().getRoot().getProject(projectPath));
582
			IJavaProject project =JavaCore.create(ResourcesPlugin.getWorkspace().getRoot().getProject(projectPath));
583
			if (isJarFile) {
584
				return project.getPackageFragmentRoot(this.containerPaths[index]);
585
			}
586
			Object target = JavaModel.getTarget(ResourcesPlugin.getWorkspace().getRoot(), new Path(this.containerPaths[index]+'/'+this.relativePaths[index]), false);
583
			Object target = JavaModel.getTarget(ResourcesPlugin.getWorkspace().getRoot(), new Path(this.containerPaths[index]+'/'+this.relativePaths[index]), false);
587
			if (target instanceof IProject) {
584
			if (target instanceof IProject) {
588
				return project.getPackageFragmentRoot((IProject) target);
585
				return project.getPackageFragmentRoot((IProject) target);
Lines 591-596 Link Here
591
				IJavaElement element = JavaCore.create((IResource)target);
588
				IJavaElement element = JavaCore.create((IResource)target);
592
				return (IPackageFragmentRoot) element.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
589
				return (IPackageFragmentRoot) element.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
593
			}
590
			}
591
			if (isJarFile) {
592
				return project.getPackageFragmentRoot(this.containerPaths[index]);
593
			}
594
		}
594
		}
595
	}
595
	}
596
	return null;
596
	return null;

Return to bug 204652