|
Lines 888-897
Link Here
|
| 888 |
boolean success = analyzer.analyzeManifestContents(reader); |
888 |
boolean success = analyzer.analyzeManifestContents(reader); |
| 889 |
List calledFileNames = analyzer.getCalledFileNames(); |
889 |
List calledFileNames = analyzer.getCalledFileNames(); |
| 890 |
if (!success || analyzer.getClasspathSectionsCount() == 1 && calledFileNames == null) { |
890 |
if (!success || analyzer.getClasspathSectionsCount() == 1 && calledFileNames == null) { |
| 891 |
Util.log(IStatus.WARNING, "Invalid Class-Path header in manifest of jar file: " + jarPath.toOSString()); //$NON-NLS-1$ |
891 |
if (JavaModelManager.CP_RESOLVE_VERBOSE_FAILURE) { |
|
|
892 |
Util.verbose("Invalid Class-Path header in manifest of jar file: " + jarPath.toOSString()); //$NON-NLS-1$ |
| 893 |
} |
| 892 |
return; |
894 |
return; |
| 893 |
} else if (analyzer.getClasspathSectionsCount() > 1) { |
895 |
} else if (analyzer.getClasspathSectionsCount() > 1) { |
| 894 |
Util.log(IStatus.WARNING, "Multiple Class-Path headers in manifest of jar file: " + jarPath.toOSString()); //$NON-NLS-1$ |
896 |
if (JavaModelManager.CP_RESOLVE_VERBOSE_FAILURE) { |
|
|
897 |
Util.verbose("Multiple Class-Path headers in manifest of jar file: " + jarPath.toOSString()); //$NON-NLS-1$ |
| 898 |
} |
| 895 |
return; |
899 |
return; |
| 896 |
} |
900 |
} |
| 897 |
if (calledFileNames != null) { |
901 |
if (calledFileNames != null) { |
|
Lines 900-906
Link Here
|
| 900 |
while (calledFilesIterator.hasNext()) { |
904 |
while (calledFilesIterator.hasNext()) { |
| 901 |
String calledFileName = (String) calledFilesIterator.next(); |
905 |
String calledFileName = (String) calledFilesIterator.next(); |
| 902 |
if (!directoryPath.isValidPath(calledFileName)) { |
906 |
if (!directoryPath.isValidPath(calledFileName)) { |
| 903 |
Util.log(IStatus.WARNING, "Invalid Class-Path entry " + calledFileName + " in manifest of jar file: " + jarPath.toOSString()); //$NON-NLS-1$ //$NON-NLS-2$ |
907 |
if (JavaModelManager.CP_RESOLVE_VERBOSE_FAILURE) { |
|
|
908 |
Util.verbose("Invalid Class-Path entry " + calledFileName + " in manifest of jar file: " + jarPath.toOSString()); //$NON-NLS-1$ //$NON-NLS-2$ |
| 909 |
} |
| 904 |
} else { |
910 |
} else { |
| 905 |
IPath calledJar = directoryPath.append(new Path(calledFileName)); |
911 |
IPath calledJar = directoryPath.append(new Path(calledFileName)); |
| 906 |
resolvedChainedLibraries(calledJar, visited, result); |
912 |
resolvedChainedLibraries(calledJar, visited, result); |
|
Lines 911-918
Link Here
|
| 911 |
} |
917 |
} |
| 912 |
} catch (CoreException e) { |
918 |
} catch (CoreException e) { |
| 913 |
// not a zip file |
919 |
// not a zip file |
|
|
920 |
if (JavaModelManager.CP_RESOLVE_VERBOSE_FAILURE) { |
| 921 |
Util.verbose("Could not read Class-Path header in manifest of jar file: " + jarPath.toOSString()); //$NON-NLS-1$ |
| 922 |
e.printStackTrace(); |
| 923 |
} |
| 914 |
} catch (IOException e) { |
924 |
} catch (IOException e) { |
| 915 |
Util.log(e, "Could not read Class-Path header in manifest of jar file: " + jarPath.toOSString()); //$NON-NLS-1$ |
925 |
// not a zip file |
|
|
926 |
if (JavaModelManager.CP_RESOLVE_VERBOSE_FAILURE) { |
| 927 |
Util.verbose("Could not read Class-Path header in manifest of jar file: " + jarPath.toOSString()); //$NON-NLS-1$ |
| 928 |
e.printStackTrace(); |
| 929 |
} |
| 916 |
} finally { |
930 |
} finally { |
| 917 |
manager.closeZipFile(zip); |
931 |
manager.closeZipFile(zip); |
| 918 |
if (reader != null) { |
932 |
if (reader != null) { |
