Technical update to JFX23 and dependencies

lanthale · Oct 11, 2024 · c58f744 · c58f744
1 parent 85d1a6c
commit c58f744
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/PhotoSlide/pom.xml b/PhotoSlide/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>org.photoslide</groupId>
     <artifactId>PhotoSlide</artifactId>
-    <version>1.5.0-RELEASE</version>   
+    <version>1.5.1-RELEASE</version>   
 
     <!-- This description text is included in the Windows installer by default, see win-jpackage.txt -->
     <description>Photoslide is an app for managing and editing photos like Lightroom/ON1/...</description>
@@ -17,7 +17,7 @@
         <mainClass>org.photoslide.App</mainClass>
         <app.name>Photoslide</app.name>        
         <maven.build.timestamp.format>yy.ww.WWkkmm</maven.build.timestamp.format>
-        <app.version>1.5.0</app.version>        
+        <app.version>1.5.1</app.version>        
         <jvm.modules>java.base,jdk.management,java.naming,java.sql,java.transaction.xa,java.xml,jdk.unsupported,java.management,java.datatransfer,java.desktop,java.security.jgss,java.xml.crypto,jdk.javadoc,javafx.media,javafx.controls,javafx.fxml,javafx.graphics,javafx.base,javafx.swing,javafx.web,java.logging,jdk.charsets,java.se,java.net.http,java.prefs,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.localedata,java.compiler,jdk.net,java.instrument,java.scripting,java.rmi</jvm.modules>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>23</maven.compiler.source>
@@ -371,7 +371,7 @@
                         <configuration>
                             <mainClass>${mainClass}</mainClass>
                             <options>                                                                     
-                                <option>-XX:+UseZGC -XX:+ZGenerational</option>
+                                <option>-XX:+UseZGC</option>
                                 <option>-Xms2g</option>
                                 <option>--enable-preview</option>
                                 <option>--add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED</option>                        
@@ -397,7 +397,7 @@
                             <mainClass>${mainClass}</mainClass>
                             <options>                                     
                                 <option>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:8000</option>                                    
-                                <option>-XX:+UseZGC -XX:+ZGenerational</option>
+                                <option>-XX:+UseZGC</option>
                                 <option>-Xms2g</option>
                                 <option>--enable-preview</option>
                                 <option>--add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED</option>                        
@@ -423,7 +423,7 @@
                             <mainClass>${mainClass}</mainClass>
                             <options>                                     
                                 <option>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</option>                                    
-                                <option>-XX:+UseZGC -XX:+ZGenerational</option>
+                                <option>-XX:+UseZGC</option>
                                 <option>-Xms2g</option>
                                 <option>--enable-preview</option>
                                 <option>--add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED</option>                        
@@ -448,7 +448,7 @@
                         <configuration>
                             <mainClass>${mainClass}</mainClass>
                             <options>
-                                <option>-XX:+UseZGC -XX:+ZGenerational</option>
+                                <option>-XX:+UseZGC</option>
                                 <option>-Xms2g</option>
                                 <option>--enable-preview</option>
                                 <option>--add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED</option>                        

diff --git a/PhotoSlide/src/main/java/org/photoslide/MainViewController.java b/PhotoSlide/src/main/java/org/photoslide/MainViewController.java
@@ -76,7 +76,6 @@
 import javafx.fxml.Initializable;
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
-import javafx.scene.Group;
 import javafx.scene.Parent;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
@@ -110,7 +109,6 @@
 import javafx.util.Duration;
 import org.controlsfx.control.PopOver;
 import org.controlsfx.control.TaskProgressView;
-import org.h2.engine.Setting;
 import org.h2.fulltext.FullText;
 import org.kordamp.ikonli.javafx.FontIcon;
 import org.photoslide.bookmarksboard.BMBIcon;
@@ -216,6 +214,7 @@ public class MainViewController implements Initializable {
     private FontIcon processListIcon;
     private TaskProgressView taskProgressView;
     private PopOver taskPopOver;
+    private final Paint activityColor = Paint.valueOf("#c5c5c5");
 
     @FXML
     private CollectionsController collectionsPaneController;
@@ -250,19 +249,19 @@ public void initialize(URL url, ResourceBundle rb) {
         taskPopOver.setTitle("Taskmanager");
         taskPopOver.setHeaderAlwaysVisible(true);
         taskPopOver.setFadeInDuration(new Duration(100));
-        taskPopOver.setContentNode(taskProgressView);
+        taskPopOver.setContentNode(taskProgressView);        
         taskProgressView.getTasks().addListener((Observable taskChange) -> {
             if (!taskProgressView.getTasks().isEmpty()) {
                 processListIcon.setIconColor(Paint.valueOf("lightgreen"));
-            } else {
-                processListIcon.setIconColor(Paint.valueOf("#c5c5c5"));
+            } else {              
+                processListIcon.setIconColor(activityColor);
             }
         });
         processListIcon.iconColorProperty().addListener((o) -> {
             if (!taskProgressView.getTasks().isEmpty()) {
                 processListIcon.setIconColor(Paint.valueOf("lightgreen"));
-            } else {
-                processListIcon.setIconColor(Paint.valueOf("#c5c5c5"));
+            } else {                                                
+                processListIcon.setIconColor(activityColor);                
             }
         });
         taskProgressView.setPrefSize(300, 200);

diff --git a/PhotoSlide/src/main/resources/pkg-config/linux-jpackage.txt b/PhotoSlide/src/main/resources/pkg-config/linux-jpackage.txt
@@ -9,7 +9,6 @@
 --runtime-image ${project.build.directory}/jvm-image
 --linux-shortcut
 --java-options -XX:+UseZGC
---java-options -XX:+ZGenerational
 --java-options -Xms2g
 --java-options --enable-preview
 --java-options --add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED

diff --git a/PhotoSlide/src/main/resources/pkg-config/mac-jpackage.txt b/PhotoSlide/src/main/resources/pkg-config/mac-jpackage.txt
@@ -9,7 +9,6 @@
 --app-version ${app.version}
 --runtime-image ${project.build.directory}/jvm-image
 --java-options -XX:+UseZGC
---java-options -XX:+ZGenerational
 --java-options -Xms2g
 --java-options --enable-preview
 --java-options --add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED

diff --git a/PhotoSlide/src/main/resources/pkg-config/win-jpackage.txt b/PhotoSlide/src/main/resources/pkg-config/win-jpackage.txt
@@ -16,7 +16,6 @@
 --description "${project.description}"
 --copyright "(C) ${windows.vendor}"
 --java-options -XX:+UseZGC
---java-options -XX:+ZGenerational
 --java-options -Xms2g
 --java-options --enable-preview
 --java-options --add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED