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

- Attempting to update the Java warning dialog to play ball with Java 9.

Browse Source
This commit is contained in:
Agetian
2017-11-30 05:35:31 +00:00
parent 7e6771d550
commit 4f95f2c842
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,6 @@ import forge.util.RuntimeVersion;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
@@ -110,7 +109,7 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
RuntimeVersion javaVersion = RuntimeVersion.of(System.getProperty("java.version")); 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)));
} }

2
forge-gui-desktop/src/main/java/forge/view/FView.java
View File

@@ -233,7 +233,7 @@ public enum FView {
RuntimeVersion javaVersion = RuntimeVersion.of(System.getProperty("java.version")); 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(); JPanel updateWarningOverlay = FOverlay.SINGLETON_INSTANCE.getPanel();
updateWarningOverlay.setLayout(new GridBagLayout()); updateWarningOverlay.setLayout(new GridBagLayout());