Skip to content

Commit 9b66c3e

Browse files
Fix #85 Check libs subfolder on uno package creation (#102)
1 parent 337eb1c commit 9b66c3e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

java/source/org/libreoffice/ide/eclipse/java/JavaBuilder.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,18 +352,19 @@ private List<IFile> getLibsFromLibsDir(IJavaProject javaProject) {
352352
List<IFile> libs = new ArrayList<>();
353353
IFolder libFolder = javaProject.getProject().getFolder(LIBS_DIR_NAME);
354354
if (libFolder.exists()) {
355-
IPath rawLoc = libFolder.getRawLocation();
356-
String libFolderOsString = rawLoc.toOSString();
357-
try (Stream<java.nio.file.Path> walk = Files.walk(Paths.get(libFolderOsString))) {
355+
java.nio.file.Path pathLibs = Paths.get(libFolder.getRawLocation().toOSString());
356+
try (Stream<java.nio.file.Path> walk = Files.walk(pathLibs)) {
358357
libs = walk.map(jarFile -> {
359-
return libFolder.getFile(jarFile.getFileName().toString());
358+
java.nio.file.Path pathRelative = pathLibs.relativize(jarFile);
359+
return libFolder.getFile(pathRelative.toString());
360360
}).filter(f -> f.getFileExtension() != null && f.getFileExtension().equalsIgnoreCase("jar"))
361361
.collect(Collectors.toList());
362362
} catch (IOException e) {
363363
PluginLogger.error(
364364
Messages.getString("JavaBuilder.GetExternalLibsFailed"), e);
365365
}
366366
}
367+
PluginLogger.debug("Found " + libs.size() + " Jars");
367368
return libs;
368369
}
369370
}

0 commit comments

Comments
 (0)