ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

containable frame: assume jdk 12/13/14 do not have fix for JDK-8231564

Browse Source 
These versions are EOL, and although greater than 11, do not include JDK-8231564
This commit is contained in:
Adam
2020-09-24 18:44:54 -04:00
parent 1091bc42cd
commit 9c362fb836
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java
View File

@@ -76,6 +76,11 @@ public class ContainableFrame extends JFrame
} }
String[] s = javaVersion.split("\\."); String[] s = javaVersion.split("\\.");
int major = Integer.parseInt(s[0]), minor = Integer.parseInt(s[1]), patch = Integer.parseInt(s[2]); 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); return major > 11 || (major == 11 && minor > 0) || (major == 11 && minor == 0 && patch >= 8);
} }

3
runelite-client/src/test/java/net/runelite/client/ui/ContainableFrameTest.java
View File

@@ -36,5 +36,8 @@ public class ContainableFrameTest
assertTrue(ContainableFrame.jdk8231564("11.0.8")); assertTrue(ContainableFrame.jdk8231564("11.0.8"));
assertFalse(ContainableFrame.jdk8231564("11.0.7")); assertFalse(ContainableFrame.jdk8231564("11.0.7"));
assertFalse(ContainableFrame.jdk8231564("1.8.0_261")); 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"));
} }
} }