lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the default authenticated token to 0

Browse Source
This commit is contained in:
huanghongxun
2015-07-01 20:42:55 +08:00
parent 25b6d7297c
commit dace6ab223
6 changed files with 49 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
HMCLAPI/src/main/java/org/jackhuang/hellominecraft/utils/JdkVersion.java
View File

@@ -44,6 +44,10 @@ public final class JdkVersion {
public String getLocation() {
return location;
}
public int getParsedVersion() {
return parseVersion(getVersion());
}
/**
* -1 - unkown 0 - 32Bit 1 - 64Bit
*/
@@ -79,10 +83,6 @@ public final class JdkVersion {
* Constant identifying the 1.5 JVM (Java 5).
*/
public static final int UNKOWN = 2;
/**
* Constant identifying the 1.5 JVM (Java 5).
*/
public static final int JAVA_15 = 2;
/**
* Constant identifying the 1.6 JVM (Java 6).
*/
@@ -106,17 +106,21 @@ public final class JdkVersion {
static {
javaVersion = System.getProperty("java.version");
// version String should look like "1.4.2_10"
majorJavaVersion = parseVersion(javaVersion);
}
private static int parseVersion(String javaVersion) {
if(StrUtils.isBlank(javaVersion)) return UNKOWN;
int a = UNKOWN;
if (javaVersion.contains("1.9."))
majorJavaVersion = JAVA_18;
a = JAVA_19;
else if (javaVersion.contains("1.8."))
majorJavaVersion = JAVA_18;
a = JAVA_18;
else if (javaVersion.contains("1.7."))
majorJavaVersion = JAVA_17;
a = JAVA_17;
else if (javaVersion.contains("1.6."))
majorJavaVersion = JAVA_16;
else
// else leave 1.5 as default (it's either 1.5 or unknown)
majorJavaVersion = JAVA_15;
a = JAVA_16;
return a;
}
/**
@@ -148,22 +152,6 @@ public final class JdkVersion {
return majorJavaVersion;
}
/**
* Convenience method to determine if the current JVM is at least Java 1.6
* (Java 6).
*
* @return <code>true</code> if the current JVM is at least Java 1.6
* @deprecated as of Spring 3.0, in favor of reflective checks for the
* specific Java 1.6 classes of interest
* @see #getMajorJavaVersion()
* @see #JAVA_16
* @see #JAVA_17
*/
@Deprecated
public static boolean isAtLeastJava16() {
return (majorJavaVersion >= JAVA_16);
}
public static boolean isJava64Bit() {
String jdkBit = System.getProperty("sun.arch.data.model");
return jdkBit.contains("64");
@@ -217,6 +205,6 @@ public final class JdkVersion {
}
public boolean isEarlyAccess() {
return ver != null && ver.endsWith("-ea");
return getVersion() != null && getVersion().endsWith("-ea");
}
}