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

Collapse All | Expand All

(-)model/org/eclipse/jdt/internal/core/ClasspathEntry.java (-1 / +1 lines)
Lines 898-904 Link Here
898
		}
898
		}
899
	}
899
	}
900
900
901
	private static List getCalledFileNames(IPath jarPath) {
901
	static List getCalledFileNames(IPath jarPath) {
902
		Object target = JavaModel.getTarget(jarPath, true/*check existence, otherwise the manifest cannot be read*/);
902
		Object target = JavaModel.getTarget(jarPath, true/*check existence, otherwise the manifest cannot be read*/);
903
		if (!(target instanceof IFile || target instanceof File))
903
		if (!(target instanceof IFile || target instanceof File))
904
			return null;
904
			return null;
(-)model/org/eclipse/jdt/internal/core/JavaModelManager.java (-4 / +6 lines)
Lines 1525-1531 Link Here
1525
	public void addNonChainingJar(IPath path) {
1525
	public void addNonChainingJar(IPath path) {
1526
		if (this.nonChainingJars == null)
1526
		if (this.nonChainingJars == null)
1527
			return;
1527
			return;
1528
		this.nonChainingJars.add(path);
1528
		synchronized (this.nonChainingJars) {
1529
			this.nonChainingJars.add(path);			
1530
		}
1529
	}
1531
	}
1530
1532
1531
	/**
1533
	/**
Lines 2910-2918 Link Here
2910
				IClasspathEntry entry = classpath[j];
2912
				IClasspathEntry entry = classpath[j];
2911
				IPath path;
2913
				IPath path;
2912
				if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY 
2914
				if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY 
2913
					&& !result.contains(path = entry.getPath())
2915
						&& !result.contains(path = entry.getPath())
2914
					&& ClasspathEntry.resolvedChainedLibraries(path).length == 0) {
2916
						&& ClasspathEntry.getCalledFileNames(path) == null) {
2915
						result.add(path);
2917
					result.add(path);
2916
				}
2918
				}
2917
			}
2919
			}
2918
		}
2920
		}

Return to bug 302949