From 5f57df81109d268c79b34aac799fc7694ec5882a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Wed, 30 Dec 2015 14:24:56 +0100 Subject: GH-1365 Revert "GH-1365 use the first part of the java version number as the major version - native extraction" This reverts commit b437988d7b06c1e43928f6e285469cb6451c2c85. --- depends/launcher/org/multimc/Utils.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'depends/launcher') diff --git a/depends/launcher/org/multimc/Utils.java b/depends/launcher/org/multimc/Utils.java index 67a4b8e8..1077065a 100644 --- a/depends/launcher/org/multimc/Utils.java +++ b/depends/launcher/org/multimc/Utils.java @@ -31,9 +31,6 @@ import java.util.Enumeration; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - public class Utils { @@ -238,11 +235,8 @@ public class Utils ZipFile zip = new ZipFile(source); boolean applyHacks = false; - // find the first number in the version string, treat that as the major version - String s = System.getProperty("java.version"); - Matcher matcher = Pattern.compile("\\d+").matcher(s); - matcher.find(); - int major = Integer.valueOf(matcher.group()); + String[] javaVersionElements = System.getProperty("java.version").split("\\."); + int major = Integer.parseInt(javaVersionElements[1]); if (major >= 8) { applyHacks = true; -- cgit v1.2.3