Skip to content

Read classpath for the file, rather then for the directory, to help with cases where files have classpath, but directories don't. #9093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lahodaj wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Open

Read classpath for the file, rather then for the directory, to help with cases where files have classpath, but directories don't. #9093

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions java/java.source.base/src/org/netbeans/modules/java/source/JavaSourceUtilImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,31 +153,31 @@ protected Map<String, byte[]> generate(
.register(FileManagerTransaction.class, FileManagerTransaction.writeThrough())
.register(ProcessorGenerated.class, ProcessorGenerated.create(srcRoot.toURL()));
try {
ClassPath src = ClassPath.getClassPath(srcRoot, ClassPath.SOURCE);
ClassPath src = ClassPath.getClassPath(file, ClassPath.SOURCE);
if (src == null) {
src = ClassPathSupport.createClassPath(srcRoot);
}
ClassPath moduleSrc = ClassPath.getClassPath(srcRoot, JavaClassPathConstants.MODULE_SOURCE_PATH);
ClassPath moduleSrc = ClassPath.getClassPath(file, JavaClassPathConstants.MODULE_SOURCE_PATH);
if (moduleSrc == null) {
moduleSrc = ClassPath.EMPTY;
}
ClassPath boot = ClassPath.getClassPath(srcRoot, ClassPath.BOOT);
ClassPath boot = ClassPath.getClassPath(file, ClassPath.BOOT);
if (boot == null) {
boot = JavaPlatform.getDefault().getBootstrapLibraries();
}
ClassPath moduleBoot = ClassPath.getClassPath(srcRoot, JavaClassPathConstants.MODULE_BOOT_PATH);
ClassPath moduleBoot = ClassPath.getClassPath(file, JavaClassPathConstants.MODULE_BOOT_PATH);
if (moduleBoot == null) {
moduleBoot = ClassPath.EMPTY;
}
ClassPath compile = ClassPath.getClassPath(srcRoot, ClassPath.COMPILE);
ClassPath compile = ClassPath.getClassPath(file, ClassPath.COMPILE);
if (compile == null) {
compile = ClassPath.EMPTY;
}
ClassPath moduleCompile = ClassPath.getClassPath(srcRoot, JavaClassPathConstants.MODULE_COMPILE_PATH);
ClassPath moduleCompile = ClassPath.getClassPath(file, JavaClassPathConstants.MODULE_COMPILE_PATH);
if (moduleCompile == null) {
moduleCompile = ClassPath.EMPTY;
}
ClassPath moduleClass = ClassPath.getClassPath(srcRoot, JavaClassPathConstants.MODULE_CLASS_PATH);
ClassPath moduleClass = ClassPath.getClassPath(file, JavaClassPathConstants.MODULE_CLASS_PATH);
if (moduleClass == null) {
moduleClass = ClassPath.EMPTY;
}
Expand Down
Loading