- fix typo

- add native access for Lucene - remove unused install4j-runtime in MV - use Liberica JDK in all install4j builds
mediathekview · Aug 26, 2024 · a99c5bf · a99c5bf
1 parent 44762e3
commit a99c5bf
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 29 deletions.
diff --git a/.install4j/mediathekview_arm.install4j b/.install4j/mediathekview_arm.install4j
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="${install4j.version}" transformSequenceNumber="9">
+<install4j version="10.0.9" transformSequenceNumber="10">
   <directoryPresets config="${project.basedir}/.install4j" />
   <application name="MediathekView" applicationId="1927-5045-2127-3394" mediaDir="target" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-linux-aarch64" shortName="MediathekView" publisher="MediathekView Team" publisherWeb="https://mediathekview.de" version="${project.version}" convertDotsToUnderscores="false" macVolumeId="d594baf3c2b3424d" javaMinVersion="${install4j.jdk.min-version}">
     <languages>
       <principalLanguage id="de" />
     </languages>
-    <jreBundles jdkProviderId="Zulu" release="${install4j.zulu.jdk.version}">
+    <jreBundles jdkProviderId="Liberica" release="22/22.0.2+11">
       <modules>
         <defaultModules set="all" />
+        <module name="jdk.incubator.vector" />
       </modules>
     </jreBundles>
   </application>
-  <files preserveSymlinks="false">
+  <files>
     <mountPoints>
       <mountPoint id="58" />
     </mountPoints>

diff --git a/.install4j/mediathekview_linux.install4j b/.install4j/mediathekview_linux.install4j
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="${install4j.version}" transformSequenceNumber="10">
+<install4j version="10.0.9" transformSequenceNumber="10">
   <directoryPresets config="${project.basedir}/.install4j" />
   <application name="MediathekView" applicationId="1927-5045-2127-3394" mediaDir="target" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-linux" shortName="MediathekView" publisher="MediathekView Team" publisherWeb="https://mediathekview.de" version="${project.version}" convertDotsToUnderscores="false" macVolumeId="d594baf3c2b3424d" javaMinVersion="${install4j.jdk.min-version}">
     <languages>
       <principalLanguage id="de" />
     </languages>
-    <jreBundles jdkProviderId="Zulu" release="${install4j.zulu.jdk.version}" />
+    <jreBundles jdkProviderId="Liberica" release="22/22.0.2+11">
+      <modules>
+        <defaultModules set="jre" />
+        <module name="jdk.incubator.vector" />
+      </modules>
+    </jreBundles>
   </application>
   <files>
     <mountPoints>

diff --git a/.install4j/mediathekview_windows.install4j b/.install4j/mediathekview_windows.install4j
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="${install4j.version}" transformSequenceNumber="9">
+<install4j version="10.0.9" transformSequenceNumber="10">
   <directoryPresets config="${project.build.directory}/res" />
   <application name="MediathekView" applicationId="1927-5045-2127-3394" mediaDir="target" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-win" shortName="MediathekView" publisher="MediathekView Team" publisherWeb="https://mediathekview.de" version="${project.version}" convertDotsToUnderscores="false" macVolumeId="d594baf3c2b3424d" javaMinVersion="${install4j.jdk.min-version}">
     <languages>
       <principalLanguage id="de" />
     </languages>
-    <jreBundles jdkProviderId="Zulu" release="${install4j.zulu.jdk.version}" />
+    <jreBundles jdkProviderId="Liberica" release="22/22.0.2+11">
+      <modules>
+        <defaultModules set="jre" />
+        <module name="jdk.incubator.vector" />
+      </modules>
+    </jreBundles>
   </application>
-  <files preserveSymlinks="false">
+  <files>
     <mountPoints>
       <mountPoint id="58" />
     </mountPoints>
@@ -1001,14 +1006,14 @@ return true;</property>
     </styles>
   </installerGui>
   <mediaSets>
-    <windows name="Windows" id="63">
+    <windows name="Windows" id="63" architecture="64">
       <jreBundle usePack200="false">
         <modules>
           <defaultModules set="jre" />
         </modules>
       </jreBundle>
     </windows>
-    <windowsArchive name="Windows Archive" id="65">
+    <windowsArchive name="Windows Archive" id="65" architecture="64">
       <jreBundle>
         <modules>
           <defaultModules set="jre" />

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - **FEATURE:** Selektierte Einträge in `Suchhistorie bearbeiten`-Dialog können nun mittels Entfernen-Taste gelöscht werden.
 - **FEATURE:** Das Blacklist Filter-Icon in der Toolbar kann mittels *Einstellungen/Allgemein* mit einem aussagefähigen Zusatztext dargestellt werden.
 - **FEATURE:** Dark Mode für Filter-Dialog.
+- **FEATURE:** Beschleunigte Verarbeitung von Lucene mittels native access aktiviert (benötigt `--enable-native-access=ALL-UNNAMED --add-modules jdk.incubator.vector` in den Startparametern)
 
 # **14.1.0**
 - JDK 21 wird nun mitgeliefert. Behebt primär Darstellungsfehler von Java Apps unter Windows.

diff --git a/pom.xml b/pom.xml
@@ -128,24 +128,22 @@
 
         <mainclass>mediathek.Main</mainclass>
 
-        <!-- Zulu without JavaFX is used on Linux and Windows -->
-        <install4j.zulu.jdk.version>21/21.0.1</install4j.zulu.jdk.version>
-        <install4j.jdk.min-version>21</install4j.jdk.min-version>
+        <install4j.version>10.0.9</install4j.version>
+        <install4j.home>./install4j${install4j.version}</install4j.home>
+        <!--suppress UnresolvedMavenProperty -->
+        <install4j.licenseKey>${env.LICENSE_KEY_10}</install4j.licenseKey>
+        <install4j.jdk.min-version>22</install4j.jdk.min-version>
 
         <!-- VM Parameters Windows x64 -->
         <install4j.vmparameters.win.64>-XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact -XX:MaxRAMPercentage=50.0
-            -XX:+UseStringDeduplication -DexternalUpdateCheck
+            -XX:+UseStringDeduplication --enable-native-access=ALL-UNNAMED --add-modules jdk.incubator.vector -DexternalUpdateCheck
         </install4j.vmparameters.win.64>
         <!-- VM Parameters Linux 64bit Intel and ARM -->
         <install4j.vmparameters.linux.64>-XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact
-            -XX:MaxRAMPercentage=50.0 -XX:+UseStringDeduplication --add-opens java.desktop/sun.awt.X11=ALL-UNNAMED
+            -XX:MaxRAMPercentage=50.0 -XX:+UseStringDeduplication --enable-native-access=ALL-UNNAMED --add-modules jdk.incubator.vector --add-opens java.desktop/sun.awt.X11=ALL-UNNAMED
             -DexternalUpdateCheck
         </install4j.vmparameters.linux.64>
 
-        <install4j.home>./install4j${install4j.version}</install4j.home>
-        <!--suppress UnresolvedMavenProperty -->
-        <install4j.licenseKey>${env.LICENSE_KEY_10}</install4j.licenseKey>
-        <install4j.version>10.0.7</install4j.version>
         <lucene.version>9.11.1</lucene.version>
     </properties>
 
@@ -166,13 +164,7 @@
             <artifactId>lucene-queryparser</artifactId>
             <version>${lucene.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>com.install4j</groupId>
-            <artifactId>install4j-runtime</artifactId>
-            <version>${install4j.version}</version>
-        </dependency>
-
+
         <dependency>
             <groupId>org.jfree</groupId>
             <artifactId>jfreechart</artifactId>

diff --git a/src/main/java/mediathek/gui/dialog/DialogAddDownload.java b/src/main/java/mediathek/gui/dialog/DialogAddDownload.java
@@ -52,7 +52,7 @@ public class DialogAddDownload extends JDialog {
     private static final Logger logger = LogManager.getLogger();
     private static final String NO_DATA_AVAILABLE = "Keine Daten verfügbar.";
     private static final String KEY_LABEL_FOREGROUND = "Label.foreground";
-    private static final String KEY_TEXTFIELD_BACKROUND = "TextField.background";
+    private static final String KEY_TEXTFIELD_BACKGROUND = "TextField.background";
     private static final String TITLED_BORDER_STRING = "Download-Qualität";
     private final DatenFilm film;
     private final Optional<FilmResolution.Enum> requestedResolution;
@@ -548,7 +548,7 @@ private void tus() {
                     if (!jTextFieldName.getText().equals(FilenameUtils.checkDateiname(jTextFieldName.getText(), false /*pfad*/))) {
                         jTextFieldName.setBackground(MVColor.DOWNLOAD_FEHLER.color);
                     } else {
-                        jTextFieldName.setBackground(UIManager.getDefaults().getColor(KEY_TEXTFIELD_BACKROUND));
+                        jTextFieldName.setBackground(UIManager.getDefaults().getColor(KEY_TEXTFIELD_BACKGROUND));
                     }
                 }
 
@@ -586,7 +586,7 @@ private void tus() {
                         if (!s.equals(FilenameUtils.checkDateiname(s, true))) {
                             editor.setBackground(MVColor.DOWNLOAD_FEHLER.color);
                         } else {
-                            editor.setBackground(UIManager.getColor(KEY_TEXTFIELD_BACKROUND));
+                            editor.setBackground(UIManager.getColor(KEY_TEXTFIELD_BACKGROUND));
                         }
                     }
                     calculateAndCheckDiskSpace();