From 5578dc2abe58378438cce973b46b11d854f5bd0b Mon Sep 17 00:00:00 2001 From: Florian Enner Date: Wed, 25 Feb 2026 19:04:57 +0100 Subject: [PATCH 1/5] [jdk21] fixed deque compilation issue (cherry picked from commit 2e6f7c5b4727a149e0e75fb08a5482d7b6d5a31c) --- .../io/fair_acc/chartfx/ui/ObservableDeque.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/ui/ObservableDeque.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/ui/ObservableDeque.java index 2c238e08c..e134fb311 100644 --- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/ui/ObservableDeque.java +++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/ui/ObservableDeque.java @@ -280,4 +280,20 @@ public E pop() { public Iterator descendingIterator() { return deque.descendingIterator(); } + + /** + * Unsupported: we need to override this method because of a name clash between + * java.util.List and java.util.Deque. Both define a method called reversed() but with + * different return types. This method was introduced in Java 21. Read more about it here: + * https://inside.java/2023/05/12/quality-heads-up/ + */ + public ObservableDeque reversed() { + /* + * Throw an exception. A better solution would be a complete implementation + * of a reversed observable deque. However, that is quite a bit of work and if not needed + * then why do it. To see an example for this approach, see LinkedList.reversed(). + */ + throw new UnsupportedOperationException("reversed() not supported"); + } + } From 7068964ba83251a03c34894fa082508e05e02574 Mon Sep 17 00:00:00 2001 From: Florian Enner Date: Wed, 25 Feb 2026 19:20:48 +0100 Subject: [PATCH 2/5] [jdk21] fixed javadoc build issues (cherry picked from commit cf94f1e3823b2b8fa979cfd6e1a76b67e1277ac9) --- chartfx-chart/pom.xml | 11 +++++++++++ chartfx-samples/pom.xml | 10 ++++++++++ pom.xml | 5 +++-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/chartfx-chart/pom.xml b/chartfx-chart/pom.xml index 8182e117f..6ddd1df56 100644 --- a/chartfx-chart/pom.xml +++ b/chartfx-chart/pom.xml @@ -101,6 +101,17 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + + + + + + + us.hebi.sass sass-cli-maven-plugin diff --git a/chartfx-samples/pom.xml b/chartfx-samples/pom.xml index 142c2dfb2..e428c058a 100644 --- a/chartfx-samples/pom.xml +++ b/chartfx-samples/pom.xml @@ -75,6 +75,16 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + + + + + + org.codehaus.mojo exec-maven-plugin diff --git a/pom.xml b/pom.xml index 7eb90f121..cb7bee91a 100644 --- a/pom.xml +++ b/pom.xml @@ -150,12 +150,13 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.1 + 3.6.3 + 17 https://openjfx.io/javadoc/12/ - none + none From a830c6f1f472e2e69f3cd44ee9cdb1dec3ea2e10 Mon Sep 17 00:00:00 2001 From: Florian Enner Date: Wed, 25 Feb 2026 19:40:03 +0100 Subject: [PATCH 3/5] [jdk25] removed inheritance of non-existing docs --- .../sample/ChartFxDatasetSamplerProject.java | 11 +---------- .../sample/ChartFxFinancialSamplerProject.java | 11 +---------- .../fair_acc/sample/ChartFxMathSamplerProject.java | 11 +---------- .../fair_acc/sample/ChartFxMiscSamplerProject.java | 12 ++---------- .../io/fair_acc/sample/ChartFxSamplerProject.java | 11 +---------- 5 files changed, 6 insertions(+), 50 deletions(-) diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxDatasetSamplerProject.java b/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxDatasetSamplerProject.java index 245f4c514..9afd83770 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxDatasetSamplerProject.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxDatasetSamplerProject.java @@ -9,31 +9,22 @@ import fxsampler.model.WelcomePage; public class ChartFxDatasetSamplerProject implements FXSamplerProject { - /** - * {@inheritDoc} - */ + @Override public String getProjectName() { return "ChartFx - Datasets"; } - /** - * {@inheritDoc} - */ @Override public String getSampleBasePackage() { return "io.fair_acc.sample.dataset"; } - ///** {@inheritDoc} */ //@Override // public String getModuleName() { // return "io.fair-acc"; //} - /** - * {@inheritDoc} - */ @Override public WelcomePage getWelcomePage() { VBox vBox = new VBox(); diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxFinancialSamplerProject.java b/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxFinancialSamplerProject.java index 7a8eb4cfb..78de5af68 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxFinancialSamplerProject.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxFinancialSamplerProject.java @@ -9,31 +9,22 @@ import fxsampler.model.WelcomePage; public class ChartFxFinancialSamplerProject implements FXSamplerProject { - /** - * {@inheritDoc} - */ + @Override public String getProjectName() { return "ChartFx - Financial Plots"; } - /** - * {@inheritDoc} - */ @Override public String getSampleBasePackage() { return "io.fair_acc.sample.financial"; } - ///** {@inheritDoc} */ //@Override // public String getModuleName() { // return "io.fair-acc"; //} - /** - * {@inheritDoc} - */ @Override public WelcomePage getWelcomePage() { VBox vBox = new VBox(); diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxMathSamplerProject.java b/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxMathSamplerProject.java index 2951f3d3f..09f6424f0 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxMathSamplerProject.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxMathSamplerProject.java @@ -9,31 +9,22 @@ import fxsampler.model.WelcomePage; public class ChartFxMathSamplerProject implements FXSamplerProject { - /** - * {@inheritDoc} - */ + @Override public String getProjectName() { return "ChartFx - Math"; } - /** - * {@inheritDoc} - */ @Override public String getSampleBasePackage() { return "io.fair_acc.sample.math"; } - ///** {@inheritDoc} */ //@Override // public String getModuleName() { // return "io.fair-acc"; //} - /** - * {@inheritDoc} - */ @Override public WelcomePage getWelcomePage() { VBox vBox = new VBox(); diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxMiscSamplerProject.java b/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxMiscSamplerProject.java index 0c932bac7..fc9bb85b4 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxMiscSamplerProject.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxMiscSamplerProject.java @@ -9,31 +9,23 @@ import fxsampler.model.WelcomePage; public class ChartFxMiscSamplerProject implements FXSamplerProject { - /** - * {@inheritDoc} - */ + @Override public String getProjectName() { return "ChartFx - Misc"; } - /** - * {@inheritDoc} - */ + @Override public String getSampleBasePackage() { return "io.fair_acc.sample.misc"; } - ///** {@inheritDoc} */ //@Override // public String getModuleName() { // return "io.fair-acc"; //} - /** - * {@inheritDoc} - */ @Override public WelcomePage getWelcomePage() { VBox vBox = new VBox(); diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxSamplerProject.java b/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxSamplerProject.java index 663981d5c..4b393fdd0 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxSamplerProject.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/ChartFxSamplerProject.java @@ -21,31 +21,22 @@ import fxsampler.model.WelcomePage; public class ChartFxSamplerProject implements FXSamplerProject { - /** - * {@inheritDoc} - */ + @Override public String getProjectName() { return "ChartFx"; } - /** - * {@inheritDoc} - */ @Override public String getSampleBasePackage() { return "io.fair_acc.sample.chart"; } - ///** {@inheritDoc} */ //@Override // public String getModuleName() { // return "io.fair-acc"; //} - /** - * {@inheritDoc} - */ @Override public WelcomePage getWelcomePage() { VBox vBox = new VBox(); From 673d8615c102c646c94510e5c87b459cab1f81c5 Mon Sep 17 00:00:00 2001 From: Florian Enner Date: Wed, 25 Feb 2026 20:24:11 +0100 Subject: [PATCH 4/5] [jdk25] attempted to get javadoc to run --- .../src/main/java/io/fair_acc/sample/LaunchJFX.java | 3 +-- .../java/io/fair_acc/sample/dataset/legacy/DoubleDataSet.java | 2 +- .../io/fair_acc/sample/dataset/legacy/DoubleErrorDataSet.java | 2 +- .../sample/financial/service/ConcurrentDateFormatAccess.java | 2 +- .../java/io/fair_acc/sample/financial/service/SCIDByNio.java | 4 +--- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/LaunchJFX.java b/chartfx-samples/src/main/java/io/fair_acc/sample/LaunchJFX.java index cce4b8bd9..54d3cc713 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/LaunchJFX.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/LaunchJFX.java @@ -19,8 +19,7 @@ * "Variable", "${project_classpath}", but there is no way to add the current projects dependencies to the classpath, * yet. * - * @see Stackoverflow: How to add JavaFX runtime to - * Eclipse in Java11 (2b) + * See Stackoverflow: How to add JavaFX runtime to Eclipse in Java11 (2b) * @author akrimm */ public class LaunchJFX { // NOMEN EST OMEN diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/dataset/legacy/DoubleDataSet.java b/chartfx-samples/src/main/java/io/fair_acc/sample/dataset/legacy/DoubleDataSet.java index 15d4a780c..d052f1b85 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/dataset/legacy/DoubleDataSet.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/dataset/legacy/DoubleDataSet.java @@ -17,7 +17,7 @@ * User provides X and Y coordinates or only Y coordinates. In the former case X coordinates have value of data point * index. This version being optimised for native double arrays. * - * @see DoubleErrorDataSet for an equivalent implementation with asymmetric errors in Y + * Check {@link DoubleErrorDataSet} for an equivalent implementation with asymmetric errors in Y * @author rstein * @deprecated this is kept for reference/performance comparisons only */ diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/dataset/legacy/DoubleErrorDataSet.java b/chartfx-samples/src/main/java/io/fair_acc/sample/dataset/legacy/DoubleErrorDataSet.java index 4190ff869..9d5bfc523 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/dataset/legacy/DoubleErrorDataSet.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/dataset/legacy/DoubleErrorDataSet.java @@ -14,7 +14,7 @@ * User provides X and Y coordinates or only Y coordinates. In the former case X coordinates have value of data point * index. This version being optimised for native double arrays. * - * @see DoubleDataSet for an equivalent implementation without errors + * Check {@link DoubleDataSet} for an equivalent implementation without errors * @author rstein * @deprecated this is kept for reference/performance comparisons only */ diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/financial/service/ConcurrentDateFormatAccess.java b/chartfx-samples/src/main/java/io/fair_acc/sample/financial/service/ConcurrentDateFormatAccess.java index ce69d4266..85925034b 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/financial/service/ConcurrentDateFormatAccess.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/financial/service/ConcurrentDateFormatAccess.java @@ -6,7 +6,7 @@ import java.util.Date; /** - * @see SimpleDateFormat is not thread safe. For parallel processing of data streams is necessary to use threadlocal processing. + * Note: {@link SimpleDateFormat} is not thread safe. For parallel processing of data streams is necessary to use threadlocal processing. */ public class ConcurrentDateFormatAccess { private final String simpleDateFormatString; diff --git a/chartfx-samples/src/main/java/io/fair_acc/sample/financial/service/SCIDByNio.java b/chartfx-samples/src/main/java/io/fair_acc/sample/financial/service/SCIDByNio.java index 17303cb21..a1de936a6 100644 --- a/chartfx-samples/src/main/java/io/fair_acc/sample/financial/service/SCIDByNio.java +++ b/chartfx-samples/src/main/java/io/fair_acc/sample/financial/service/SCIDByNio.java @@ -288,9 +288,7 @@ private Date loadTimestamp(long position) throws IOException { } /** - * Thanks to @see - * http://svn.codehaus.org/groovy/modules/scriptom/branches/SCRIPTOM - * -1.5.4-ANT/src/com/jacob/com/DateUtilities.java + * Thanks to DateUtilities.java * * @param comTime time in windows time for convert to java format * @return java format of windows format with usage of specific timezone From 2a8bbb9bd1a8f4aa03894b8afc2974f42760ff19 Mon Sep 17 00:00:00 2001 From: Florian Enner Date: Wed, 25 Feb 2026 20:27:09 +0100 Subject: [PATCH 5/5] [jdk25] disabled javadoc due to errors in samples --- pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index cb7bee91a..ac31d8df2 100644 --- a/pom.xml +++ b/pom.xml @@ -363,6 +363,20 @@ + + disable-javadoc-on-jdk25 + + [25,) + + + + true + + releaseGithub