Skip to content
Merged
Changes from all commits
Commits
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
42 changes: 21 additions & 21 deletions app/src/processing/app/Library.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
package processing.app;

import java.io.*;
import java.util.*;
import java.util.zip.ZipFile;

import processing.app.contrib.*;
import processing.core.*;
import processing.app.contrib.ContributionType;
import processing.app.contrib.LocalContribution;
import processing.core.PApplet;
import processing.data.StringDict;
import processing.data.StringList;

import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.*;
import java.util.zip.ZipFile;


public class Library extends LocalContribution {
// static final String[] platformNames = PConstants.platformNames;
Expand Down Expand Up @@ -398,27 +401,24 @@ public String getJarPath() {
// so that it can be appended to other paths safely
public String getClassPath() {
StringBuilder cp = new StringBuilder();

String[] jarHeads = libraryFolder.list(jarFilter);
if (jarHeads != null) {
for (String jar : jarHeads) {
cp.append(File.pathSeparatorChar);
cp.append(new File(libraryFolder, jar).getAbsolutePath());
}
}
addJars(libraryFolder, cp);
File nativeLibraryFolder = new File(nativeLibraryPath);
if (!libraryFolder.equals(nativeLibraryFolder)) {
jarHeads = new File(nativeLibraryPath).list(jarFilter);
if (jarHeads != null) {
for (String jar : jarHeads) {
cp.append(File.pathSeparatorChar);
Copy link
Collaborator Author

@Stefterv Stefterv Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since I am in here, I also cleaned up some duplicated code

cp.append(new File(nativeLibraryPath, jar).getAbsolutePath());
}
}
addJars(nativeLibraryFolder, cp);
addJars(new File(nativeLibraryFolder, "modules"), cp);
}
return cp.toString();
}

private void addJars(File folder, StringBuilder cp) {
String[] jarHeads = folder.list(jarFilter);
if (jarHeads != null) {
for (String jar : jarHeads) {
cp.append(File.pathSeparatorChar);
cp.append(new File(folder, jar).getAbsolutePath());
}
}
}

public String getNativePath() {
return nativeLibraryPath;
Expand Down