Upgrade Java and JavaFX version to 25

Author: pcastornii

.github/workflows/snapshot-deploy.yml

@@ -12,10 +12,10 @@ jobs:
       packages: write
     steps:
     - uses: actions/checkout@v4
-    - name: Setup Java 11
+    - name: Setup Java 25
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '25'
         distribution: 'temurin'
         cache: 'maven'
     - name: Generate settings.xml

README.md

@@ -818,7 +818,7 @@ single dedicated component without nested components to avoid duplicating styles
 
 ## Requirements <a name="requirements"></a>
 
-Java 11+ and JavaFX 19.
+Java 25+ and JavaFX 25+.
 
 ## Dependencies <a name="dependencies"></a>
 

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/Demo.java

@@ -62,14 +62,9 @@ protected void updateItem(Pattern item, boolean empty) {
                     // the unit will be deinitialized automatically when the stage
                     // is closed, via the handler registered with stage#setOnCloseRequest
                     switch (pattern) {
-                        case MVP:
-                            new MvpRunner().run();
-                            break;
-                        case MVVM:
-                            new MvvmRunner().run();
-                            break;
-                        default:
-                            throw new AssertionError();
+                        case MVP -> new MvpRunner().run();
+                        case MVVM -> new MvvmRunner().run();
+                        default -> throw new AssertionError();
                     }
                 }
             });

patternfx-mvp/src/main/java/com/techsenger/patternfx/mvp/AbstractPresenter.java

@@ -165,18 +165,13 @@ protected final void restoreHistory() {
                 logger.debug("{} History is new. Skipping restoration", getDescriptor().getLogPrefix());
             } else {
                 switch (policy) {
-                    case DATA:
+                    case DATA -> restoreData();
+                    case APPEARANCE -> restoreAppearance();
+                    case ALL -> {
                         restoreData();
-                        break;
-                    case APPEARANCE:
                         restoreAppearance();
-                        break;
-                    case ALL:
-                        restoreData();
-                        restoreAppearance();
-                    break;
-                    default:
-                        throw new AssertionError();
+                    }
+                    default -> throw new AssertionError();
                 }
             }
         }
@@ -200,20 +195,14 @@ protected final void saveHistory() {
         var policy = getHistoryPolicy();
         logger.debug("{} History policy during save: {}", getDescriptor().getLogPrefix(), policy);
         switch (policy) {
-            case DATA:
+            case DATA -> saveData();
+            case APPEARANCE -> saveAppearance();
+            case ALL -> {
                 saveData();
-                break;
-            case APPEARANCE:
                 saveAppearance();
-                break;
-            case ALL:
-                saveData();
-                saveAppearance();
-                break;
-            case NONE:
-                break;
-            default:
-                throw new AssertionError();
+            }
+            case NONE -> { }
+            default -> throw new AssertionError();
         }
     }
 

patternfx-mvvm/src/main/java/com/techsenger/patternfx/mvvm/AbstractViewModel.java

@@ -105,18 +105,13 @@ protected final void restoreHistory() {
                 logger.debug("{} History is new. Skipping restoration", getDescriptor().getLogPrefix());
             } else {
                 switch (policy) {
-                    case DATA:
+                    case DATA -> restoreData();
+                    case APPEARANCE -> restoreAppearance();
+                    case ALL -> {
                         restoreData();
-                        break;
-                    case APPEARANCE:
                         restoreAppearance();
-                        break;
-                    case ALL:
-                        restoreData();
-                        restoreAppearance();
-                    break;
-                    default:
-                        throw new AssertionError();
+                    }
+                    default -> throw new AssertionError();
                 }
             }
         }
@@ -147,20 +142,14 @@ protected final void saveHistory() {
         var policy = getHistoryPolicy();
         logger.debug("{} History policy during save: {}", getDescriptor().getLogPrefix(), policy);
         switch (policy) {
-            case DATA:
+            case DATA -> saveData();
+            case APPEARANCE -> saveAppearance();
+            case ALL -> {
                 saveData();
-                break;
-            case APPEARANCE:
                 saveAppearance();
-                break;
-            case ALL:
-                saveData();
-                saveAppearance();
-                break;
-            case NONE:
-                break;
-            default:
-                throw new AssertionError();
+            }
+            case NONE -> { }
+            default -> throw new AssertionError();
         }
     }
 

pom.xml

@@ -43,8 +43,8 @@
 
     <properties>
         <publishing.plugin.exclusions>patternfx-demo</publishing.plugin.exclusions>
-        <!-- JavaFX 19 has a bug: it shows a system notification on Ubuntu when a dialog is closed -->
-        <javafx.version>18</javafx.version>
+        <maven.compiler.release>25</maven.compiler.release>
+        <javafx.version>25</javafx.version>
         <osp.bom.version>1.8.0-SNAPSHOT</osp.bom.version>
     </properties>