View | Details | Raw Unified | Return to bug 101613
Collapse All | Expand All

(-)model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java (-4 / +3 lines)
Lines 12-23 Link Here
12
12
13
import java.util.*;
13
import java.util.*;
14
14
15
import org.eclipse.core.runtime.IPath;
15
import org.eclipse.core.runtime.IProgressMonitor;
16
import org.eclipse.core.runtime.IProgressMonitor;
16
import org.eclipse.core.runtime.SubProgressMonitor;
17
import org.eclipse.core.runtime.SubProgressMonitor;
17
import org.eclipse.jdt.core.*;
18
import org.eclipse.jdt.core.*;
18
import org.eclipse.jdt.core.IJavaProject;
19
import org.eclipse.jdt.core.IType;
20
import org.eclipse.jdt.core.JavaModelException;
21
import org.eclipse.jdt.core.compiler.CharOperation;
19
import org.eclipse.jdt.core.compiler.CharOperation;
22
import org.eclipse.jdt.core.search.*;
20
import org.eclipse.jdt.core.search.*;
23
import org.eclipse.jdt.internal.compiler.env.AccessRuleSet;
21
import org.eclipse.jdt.internal.compiler.env.AccessRuleSet;
Lines 350-356 Link Here
350
protected IBinaryType createInfoFromClassFileInJar(Openable classFile) {
348
protected IBinaryType createInfoFromClassFileInJar(Openable classFile) {
351
	String filePath = (((ClassFile)classFile).getType().getFullyQualifiedName('$')).replace('.', '/') + SuffixConstants.SUFFIX_STRING_class;
349
	String filePath = (((ClassFile)classFile).getType().getFullyQualifiedName('$')).replace('.', '/') + SuffixConstants.SUFFIX_STRING_class;
352
	IPackageFragmentRoot root = classFile.getPackageFragmentRoot();
350
	IPackageFragmentRoot root = classFile.getPackageFragmentRoot();
353
	String rootPath = root.getPath().toString(); // root path always contain forward slahes (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=93113)
351
	IPath path = root.getPath();
352
	String rootPath = path.getDevice() == null ? path.toString() : path.toOSString();
354
	String documentPath = rootPath + IJavaSearchScope.JAR_FILE_ENTRY_SEPARATOR + filePath;
353
	String documentPath = rootPath + IJavaSearchScope.JAR_FILE_ENTRY_SEPARATOR + filePath;
355
	IBinaryType binaryType = (IBinaryType)this.binariesFromIndexMatches.get(documentPath);
354
	IBinaryType binaryType = (IBinaryType)this.binariesFromIndexMatches.get(documentPath);
356
	if (binaryType != null) {
355
	if (binaryType != null) {

Return to bug 101613