angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-15 00:07:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linux: fixed UnsatisfiedLinkError: com.formdev.flatlaf.ui.FlatNativeWindowsLibrary.getOSBuildNumberImpl() (regression in PR #643, commit 07ad467c73)

Browse Source 
added additional platform checks to `FlatNative<platform>Library.isLoaded()` methods
This commit is contained in:
Karl Tauber
2023-02-10 21:33:26 +01:00
parent 7e91d78633
commit 546382e471
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLinuxLibrary.java
View File

@@ -23,6 +23,7 @@ import java.awt.event.MouseEvent;
import java.awt.geom.AffineTransform; import java.awt.geom.AffineTransform;
import javax.swing.JDialog; import javax.swing.JDialog;
import javax.swing.JFrame; import javax.swing.JFrame;
import com.formdev.flatlaf.util.SystemInfo;
/** /**
* Native methods for Linux. * Native methods for Linux.
@@ -35,7 +36,7 @@ import javax.swing.JFrame;
class FlatNativeLinuxLibrary class FlatNativeLinuxLibrary
{ {
static boolean isLoaded() { static boolean isLoaded() {
return FlatNativeLibrary.isLoaded(); return SystemInfo.isLinux && FlatNativeLibrary.isLoaded();
} }
// direction for _NET_WM_MOVERESIZE message // direction for _NET_WM_MOVERESIZE message

3
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowsLibrary.java
View File

@@ -17,6 +17,7 @@
package com.formdev.flatlaf.ui; package com.formdev.flatlaf.ui;
import java.awt.Window; import java.awt.Window;
import com.formdev.flatlaf.util.SystemInfo;
/** /**
* Native methods for Windows. * Native methods for Windows.
@@ -31,7 +32,7 @@ public class FlatNativeWindowsLibrary
private static long osBuildNumber = Long.MIN_VALUE; private static long osBuildNumber = Long.MIN_VALUE;
public static boolean isLoaded() { public static boolean isLoaded() {
return FlatNativeLibrary.isLoaded(); return SystemInfo.isWindows && FlatNativeLibrary.isLoaded();
} }
/** /**

6
flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java
View File

@@ -126,9 +126,9 @@ public class SystemInfo
// For older Java versions, use native library to get OS build number. // For older Java versions, use native library to get OS build number.
boolean isWin_11_orLater = false; boolean isWin_11_orLater = false;
try { try {
isWin_11_orLater = (isWindows_10_orLater && isWin_11_orLater = isWindows_10_orLater &&
(scanVersion( StringUtils.removeLeading( osName, "windows " ) ) >= toVersion( 11, 0, 0, 0 )) || (scanVersion( StringUtils.removeLeading( osName, "windows " ) ) >= toVersion( 11, 0, 0, 0 ) ||
(FlatNativeWindowsLibrary.isLoaded() && FlatNativeWindowsLibrary.getOSBuildNumber() >= 22000)); (FlatNativeWindowsLibrary.isLoaded() && FlatNativeWindowsLibrary.getOSBuildNumber() >= 22000));
} catch( Throwable ex ) { } catch( Throwable ex ) {
// catch to avoid that application can not start if native library is not up-to-date // catch to avoid that application can not start if native library is not up-to-date
LoggingFacade.INSTANCE.logSevere( null, ex ); LoggingFacade.INSTANCE.logSevere( null, ex );