external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix parsing of Java version strings

Browse Source
This commit is contained in:
Krazy
2017-06-21 18:13:45 +00:00
parent 850e446fbe
commit 5f201dc5a3
3 changed files with 129 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
View File

@@ -12,6 +12,7 @@ import forge.screens.home.IVSubmenu;
import forge.screens.home.VHomeUI;
import forge.toolbox.*;
import forge.util.FileUtil;
import forge.util.RuntimeVersion;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
@@ -107,12 +108,9 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
private boolean javaRecentEnough() {
String fullJavaVersion = System.getProperty("java.version");
RuntimeVersion javaVersion = RuntimeVersion.of(System.getProperty("java.version"));
int majorVersion = Integer.parseInt(fullJavaVersion.split("_")[0].split("\\.")[1]);
int minorVersion = Integer.parseInt(fullJavaVersion.split("_")[1]);
return majorVersion > 8 || (majorVersion == 8 && minorVersion >= 101);
return javaVersion.getMajor() > 8 || (javaVersion.getMajor() == 8 && javaVersion.getSecurityLevel() >= 101);
}
@@ -274,4 +272,5 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
return new FLabel.Builder().fontAlign(SwingConstants.CENTER)
.text(label).fontStyle(Font.ITALIC).build();
}
}