From 4f95f2c842a3170c2d180169617b517779a0941d Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 30 Nov 2017 05:35:31 +0000 Subject: [PATCH] - Attempting to update the Java warning dialog to play ball with Java 9. --- .../java/forge/screens/home/settings/VSubmenuDownloaders.java | 3 +-- forge-gui-desktop/src/main/java/forge/view/FView.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java index e443e2b193e..759c5e5c174 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java @@ -16,7 +16,6 @@ import forge.util.RuntimeVersion; import net.miginfocom.swing.MigLayout; import javax.swing.*; - import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -110,7 +109,7 @@ public enum VSubmenuDownloaders implements IVSubmenu { RuntimeVersion javaVersion = RuntimeVersion.of(System.getProperty("java.version")); - return javaVersion.getMajor() >= 1 && (javaVersion.getMinor() > 8 || (javaVersion.getMinor() == 8 && javaVersion.getUpdate() >= 101)); + return javaVersion.getMajor() >= 9 || (javaVersion.getMajor() >= 1 && (javaVersion.getMinor() > 8 || (javaVersion.getMinor() == 8 && javaVersion.getUpdate() >= 101))); } diff --git a/forge-gui-desktop/src/main/java/forge/view/FView.java b/forge-gui-desktop/src/main/java/forge/view/FView.java index a024228ae50..9fd94019353 100644 --- a/forge-gui-desktop/src/main/java/forge/view/FView.java +++ b/forge-gui-desktop/src/main/java/forge/view/FView.java @@ -233,7 +233,7 @@ public enum FView { RuntimeVersion javaVersion = RuntimeVersion.of(System.getProperty("java.version")); - if (javaVersion.getMinor() < 8 && !FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.DISABLE_DISPLAY_JAVA_8_UPDATE_WARNING)) { + if (javaVersion.getMajor() < 9 && javaVersion.getMinor() < 8 && !FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.DISABLE_DISPLAY_JAVA_8_UPDATE_WARNING)) { JPanel updateWarningOverlay = FOverlay.SINGLETON_INSTANCE.getPanel(); updateWarningOverlay.setLayout(new GridBagLayout());