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

SystemInfo: support larger maximum version numbers (was 255; now ‭65535‬)

Browse Source
This commit is contained in:
Karl Tauber
2019-09-14 22:51:42 +02:00
parent af3367a119
commit 0015a48ceb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,11 +48,11 @@ public class SystemInfo
IS_LINUX = osName.startsWith( "linux" ); IS_LINUX = osName.startsWith( "linux" );
// OS versions // OS versions
int osVersion = scanVersion( System.getProperty( "os.version" ) ); long osVersion = scanVersion( System.getProperty( "os.version" ) );
IS_MAC_OS_10_11_EL_CAPITAN_OR_LATER = (IS_MAC && osVersion >= toVersion( 10, 11, 0, 0 )); IS_MAC_OS_10_11_EL_CAPITAN_OR_LATER = (IS_MAC && osVersion >= toVersion( 10, 11, 0, 0 ));
// Java versions // Java versions
int javaVersion = scanVersion( System.getProperty( "java.version" ) ); long javaVersion = scanVersion( System.getProperty( "java.version" ) );
IS_JAVA_9_OR_LATER = (javaVersion >= toVersion( 9, 0, 0, 0 )); IS_JAVA_9_OR_LATER = (javaVersion >= toVersion( 9, 0, 0, 0 ));
// Java VMs // Java VMs
@@ -60,7 +60,7 @@ public class SystemInfo
.toLowerCase( Locale.ENGLISH ).contains( "jetbrains" ); .toLowerCase( Locale.ENGLISH ).contains( "jetbrains" );
} }
private static int scanVersion( String version ) { private static long scanVersion( String version ) {
int major = 1; int major = 1;
int minor = 0; int minor = 0;
int micro = 0; int micro = 0;
@@ -78,7 +78,7 @@ public class SystemInfo
return toVersion( major, minor, micro, patch ); return toVersion( major, minor, micro, patch );
} }
private static int toVersion( int major, int minor, int micro, int patch ) { private static long toVersion( int major, int minor, int micro, int patch ) {
return (major << 24) + (minor << 16) + (micro << 8) + patch; return ((long) major << 48) + ((long) minor << 32) + ((long) micro << 16) + patch;
} }
} }