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

Collapse All | Expand All

(-)search/org/eclipse/jdt/internal/core/search/HierarchyScope.java (-4 / +6 lines)
Lines 17-28 Link Here
17
17
18
import org.eclipse.core.resources.*;
18
import org.eclipse.core.resources.*;
19
import org.eclipse.core.runtime.IPath;
19
import org.eclipse.core.runtime.IPath;
20
import org.eclipse.core.runtime.Path;
20
import org.eclipse.jdt.core.*;
21
import org.eclipse.jdt.core.*;
21
import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
22
import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
22
import org.eclipse.jdt.internal.core.*;
23
import org.eclipse.jdt.internal.core.*;
23
import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
24
import org.eclipse.jdt.internal.core.JavaElement;
25
import org.eclipse.jdt.internal.core.JavaModel;
26
import org.eclipse.jdt.internal.core.hierarchy.TypeHierarchy;
24
import org.eclipse.jdt.internal.core.hierarchy.TypeHierarchy;
27
25
28
/**
26
/**
Lines 73-85 Link Here
73
		if (root.isArchive()) {
71
		if (root.isArchive()) {
74
			IPath jarPath = root.getPath();
72
			IPath jarPath = root.getPath();
75
			Object target = JavaModel.getTarget(ResourcesPlugin.getWorkspace().getRoot(), jarPath, true);
73
			Object target = JavaModel.getTarget(ResourcesPlugin.getWorkspace().getRoot(), jarPath, true);
76
			String zipFileName;
74
			String zipFileName = null;
77
			if (target instanceof IFile) {
75
			if (target instanceof IFile) {
78
				// internal jar
76
				// internal jar
79
				zipFileName = jarPath.toString();
77
				zipFileName = jarPath.toString();
80
			} else if (target instanceof File) {
78
			} else if (target instanceof File) {
81
				// external jar
79
				// external jar
82
				zipFileName = ((File)target).getPath();
80
				zipFileName = ((File)target).getPath();
81
				// make file name system independent (bug 98378)
82
				zipFileName = new Path(zipFileName).toString();
83
			} else {
83
			} else {
84
				return; // unknown target
84
				return; // unknown target
85
			}
85
			}
Lines 123-128 Link Here
123
				} else if (target instanceof File) {
123
				} else if (target instanceof File) {
124
					// external jar
124
					// external jar
125
					zipFileName = ((File)target).getPath();
125
					zipFileName = ((File)target).getPath();
126
					// make file name system independent (bug 98378)
127
					zipFileName = new Path(zipFileName).toString();
126
				} else {
128
				} else {
127
					continue; // unknown target
129
					continue; // unknown target
128
				}
130
				}

Return to bug 98378