Skip to content

Enable initial JDK25 features #137

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

Merged
samypr100 merged 3 commits into from
Nov 2, 2025
Merged

Enable initial JDK25 features #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d9eb3a
chore: enable some initial jdk 25 features
samypr100 Nov 1, 2025
f38adcc
chore: misc adjustments and cleanup
samypr100 Nov 1, 2025
cec77e0
chore: use more record classes
samypr100 Nov 2, 2025
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
22 changes: 18 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,12 @@ compileJava {
run {
jvmArgs '-Dprism.maxvram=2G'
jvmArgs '-Djavafx.animation.fullspeed=true'
jvmArgs '--enable-native-access=javafx.graphics'
jvmArgs '--enable-native-access=javafx.media'
jvmArgs '--sun-misc-unsafe-memory-access=warn'
jvmArgs '--enable-native-access=javafx.graphics,javafx.media'
jvmArgs '--illegal-native-access=warn'
jvmArgs '-XX:+UseCompactObjectHeaders'
jvmArgs '-XX:+UseShenandoahGC'
jvmArgs '-XX:ShenandoahGCMode=generational'
}

tasks.named('test', Test) {
Expand Down Expand Up @@ -377,7 +381,12 @@ jlink {
} else {
jvmArgs += ["-Dtrinity.app.dir={{BIN_DIR}}"]
}
jvmArgs += ['--enable-native-access=javafx.graphics', '--enable-native-access=javafx.media']
jvmArgs += ['--sun-misc-unsafe-memory-access=warn']
jvmArgs += ['--enable-native-access=javafx.graphics,javafx.media']
jvmArgs += ['--illegal-native-access=warn']
jvmArgs += ['-XX:+UseCompactObjectHeaders']
jvmArgs += ['-XX:+UseShenandoahGC']
jvmArgs += ['-XX:ShenandoahGCMode=generational']
//jvmArgs += ["--add-exports external.module.name/external.package.name=$sModuleName", ...]
}
//forceMerge('javafx')
Expand All @@ -391,7 +400,12 @@ jlink {
jvmArgs = ['-Dprism.maxvram=2G', '-Djavafx.animation.fullspeed=true']
jvmArgs += ["-Dlogback.configurationFile=\$APPDIR${fileSep}logback.xml"]
jvmArgs += ["-Dtrinity.app.dir=\$APPDIR"]
jvmArgs += ['--enable-native-access=javafx.graphics', '--enable-native-access=javafx.media']
jvmArgs += ['--sun-misc-unsafe-memory-access=warn']
jvmArgs += ['--enable-native-access=javafx.graphics,javafx.media']
jvmArgs += ['--illegal-native-access=warn']
jvmArgs += ['-XX:+UseCompactObjectHeaders']
jvmArgs += ['-XX:+UseShenandoahGC']
jvmArgs += ['-XX:ShenandoahGCMode=generational']
jvmArgs += ['--module-path', '.']
if (currentOS.windows) {
skipInstaller = true
Expand Down
6 changes: 3 additions & 3 deletions nbactions-4kMemory.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand All @@ -23,7 +23,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
Expand All @@ -40,7 +40,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand Down
6 changes: 3 additions & 3 deletions nbactions-DalleWalle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand All @@ -24,7 +24,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
Expand All @@ -43,7 +43,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand Down
6 changes: 3 additions & 3 deletions nbactions-OutRun.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand All @@ -25,7 +25,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
Expand All @@ -44,7 +44,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand Down
6 changes: 3 additions & 3 deletions nbactions-Synthwav.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand All @@ -24,7 +24,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
Expand All @@ -42,7 +42,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand Down
6 changes: 3 additions & 3 deletions nbactions-VRAMDebug.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand All @@ -23,7 +23,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G -Dprism.poolstats=true -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
Expand All @@ -40,7 +40,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand Down
6 changes: 3 additions & 3 deletions nbactions-ZeroMQ.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand All @@ -24,7 +24,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
Expand All @@ -42,7 +42,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand Down
6 changes: 3 additions & 3 deletions nbactions-http.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand All @@ -24,7 +24,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
Expand All @@ -42,7 +42,7 @@
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.5.0:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.6.2:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/edu/jhuapl/trinity/AppAsyncManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@ protected Void call() throws Exception {
//example: 200x100+800+800
String[] tokens = geometryParamString.split("\\+");
String[] sizeTokens = tokens[0].split("x");
((Stage) scene.getWindow()).setWidth(Double.parseDouble(sizeTokens[0]));
((Stage) scene.getWindow()).setHeight(Double.parseDouble(sizeTokens[1]));
((Stage) scene.getWindow()).setX(Double.parseDouble(tokens[1]));
((Stage) scene.getWindow()).setY(Double.parseDouble(tokens[2]));
scene.getWindow().setWidth(Double.parseDouble(sizeTokens[0]));
scene.getWindow().setHeight(Double.parseDouble(sizeTokens[1]));
scene.getWindow().setX(Double.parseDouble(tokens[1]));
scene.getWindow().setY(Double.parseDouble(tokens[2]));
});
} catch (NumberFormatException ex) {
LOG.info("Exception thrown parsing: {}. Setting to Maximized.", geometryParamString);
Expand Down Expand Up @@ -764,7 +764,7 @@ protected Void call() throws Exception {
if (null != e.object)
visible = (boolean) e.object;
projectorPane.setVisible(visible);
if (visible && projectorPane.firstTime == true) {
if (visible && projectorPane.firstTime) {
projectorPane.firstTime = false;
projectorPane.scanAndAnimate();
}
Expand Down
1 change: 0 additions & 1 deletion src/main/java/edu/jhuapl/trinity/data/FilterSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ public enum Inclusion {
INNER, OUTER, BOUNDARIES
}

;
public Inclusion inclusion;
public Number minimum = -1;
public Number maximum = 1;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/edu/jhuapl/trinity/data/audio/EndianDataInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.DataInputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;

public class EndianDataInputStream extends DataInputStream {
public EndianDataInputStream(InputStream in) {
Expand All @@ -11,7 +12,7 @@ public EndianDataInputStream(InputStream in) {
public String read4ByteString() throws Exception {
byte[] bytes = new byte[4];
readFully(bytes);
return new String(bytes, "US-ASCII");
return new String(bytes, StandardCharsets.US_ASCII);
}

public short readShortLittleEndian() throws Exception {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/jhuapl/trinity/data/audio/FourierTransform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ protected void fillSpectrum() {
}

if (whichAverage == LINAVG) {
int avgWidth = (int) spectrum.length / averages.length;
int avgWidth = spectrum.length / averages.length;
for (int i = 0; i < averages.length; i++) {
float avg = 0;
int j;
Expand Down Expand Up @@ -419,7 +419,7 @@ public float indexToFreq(int i) {
public float getAverageCenterFrequency(int i) {
if (whichAverage == LINAVG) {
// an average represents a certain number of bands in the spectrum
int avgWidth = (int) spectrum.length / averages.length;
int avgWidth = spectrum.length / averages.length;
// the "center" bin of the average, this is fudgy.
int centerBinIndex = i * avgWidth + avgWidth / 2;
return indexToFreq(centerBinIndex);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/jhuapl/trinity/data/messages/llm/Prompts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public static String loadAutochooseCaptionPrompt() throws IOException {
}

public static String insertAutochooseChoices(String captionPrompt, List<String> choices) {
StringBuilder choicesCSV = new StringBuilder("");
StringBuilder choicesCSV = new StringBuilder();
for (int i = 0; i < choices.size(); i++) {
choicesCSV.append(choices.get(i));
if (i < choices.size() - 1)
Expand Down
1 change: 0 additions & 1 deletion src/main/java/edu/jhuapl/trinity/data/messages/xai/GaussianMixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ public static enum COVARIANCE_MODE {
DIAGONAL, FULL
}

;
public static final String TYPESTRING = "gaussian_mixture";
//<editor-fold defaultstate="collapsed" desc="JSON Payload">
/*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/jhuapl/trinity/data/messages/xai/UmapConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static String configToFilename(UmapConfig uc) {
NumberFormat format = new DecimalFormat("0.00");
StringBuilder sb = new StringBuilder("UmapConfig-");
// sb.append(targetWeightSlider.getValue()).append("-");
sb.append((String) uc.getMetric()).append("-");
sb.append(uc.getMetric()).append("-");
sb.append("R").append(format.format(uc.getRepulsionStrength())).append("-");
sb.append("MD").append(format.format(uc.getMinDist())).append("-");
sb.append("S").append(format.format(uc.getSpread())).append("-");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/jhuapl/trinity/javafx/components/ExportMicroToolbar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import javafx.geometry.Bounds;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.Scene;
import javafx.scene.Node;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.SnapshotParameters;
import javafx.scene.control.CheckMenuItem;
import javafx.scene.control.ContentDisplay;
Expand Down Expand Up @@ -500,7 +500,7 @@ private WritableImage snapshot(Node target, int scale, boolean transparent) {
} else if (target.getParent() != null) {
target.getParent().applyCss();
if (target.getParent() instanceof Parent) {
((Parent) target.getParent()).layout();
target.getParent().layout();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/jhuapl/trinity/javafx/components/LockState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
package edu.jhuapl.trinity.javafx.components;

public enum LockState {
UNLOCKED, X_LOCKED, Y_LOCKED;
UNLOCKED, X_LOCKED, Y_LOCKED
}
11 changes: 1 addition & 10 deletions src/main/java/edu/jhuapl/trinity/javafx/components/MatrixHeatmapView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,7 @@ public enum PaletteKind {
/**
* Simple click payload.
*/
public static final class MatrixClick {
public final int row;
public final int col;
public final double value;

public MatrixClick(int row, int col, double value) {
this.row = row;
this.col = col;
this.value = value;
}
public record MatrixClick(int row, int col, double value) {
}

// -------------------- State --------------------
Expand Down
Loading