From 9c362fb836b83a69dfeae4514b774f28cf573d7e Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 24 Sep 2020 18:44:54 -0400 Subject: [PATCH] containable frame: assume jdk 12/13/14 do not have fix for JDK-8231564 These versions are EOL, and although greater than 11, do not include JDK-8231564 --- .../main/java/net/runelite/client/ui/ContainableFrame.java | 5 +++++ .../java/net/runelite/client/ui/ContainableFrameTest.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java b/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java index 0a69897461..158e22a2b6 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java @@ -76,6 +76,11 @@ public class ContainableFrame extends JFrame } String[] s = javaVersion.split("\\."); int major = Integer.parseInt(s[0]), minor = Integer.parseInt(s[1]), patch = Integer.parseInt(s[2]); + if (major == 12 || major == 13 || major == 14) + { + // These versions are since EOL & do not include JDK-8231564 + return false; + } return major > 11 || (major == 11 && minor > 0) || (major == 11 && minor == 0 && patch >= 8); } diff --git a/runelite-client/src/test/java/net/runelite/client/ui/ContainableFrameTest.java b/runelite-client/src/test/java/net/runelite/client/ui/ContainableFrameTest.java index d0b432ce39..8ee1b71a80 100644 --- a/runelite-client/src/test/java/net/runelite/client/ui/ContainableFrameTest.java +++ b/runelite-client/src/test/java/net/runelite/client/ui/ContainableFrameTest.java @@ -36,5 +36,8 @@ public class ContainableFrameTest assertTrue(ContainableFrame.jdk8231564("11.0.8")); assertFalse(ContainableFrame.jdk8231564("11.0.7")); assertFalse(ContainableFrame.jdk8231564("1.8.0_261")); + assertFalse(ContainableFrame.jdk8231564("12.0.0")); + assertFalse(ContainableFrame.jdk8231564("13.0.0")); + assertFalse(ContainableFrame.jdk8231564("14.0.0")); } } \ No newline at end of file