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

代码清理 (#2072)

Browse Source 
* Remove unused methods

* newRaisedButton

* update

* update

* update

* update

* update

* toLowerCase and toUpperCase

* update

* update
This commit is contained in:
Glavo
2023-02-06 22:44:19 +08:00
committed by GitHub
parent 3198daa60a
commit ec6637728a
25 changed files with 60 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccount.java
View File

@@ -187,7 +187,7 @@ public class AuthlibInjectorAccount extends YggdrasilAccount {
return emptySet();
Set<TextureType> result = EnumSet.noneOf(TextureType.class);
for (String val : prop.split(",")) {
val = val.toUpperCase();
val = val.toUpperCase(Locale.ROOT);
TextureType parsed;
try {
parsed = TextureType.valueOf(val);

3
HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java
View File

@@ -29,6 +29,7 @@ import java.lang.reflect.Type;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.logging.Level;
@@ -87,7 +88,7 @@ public class AuthlibInjectorServer implements Observable {
}
private static String addHttpsIfMissing(String url) {
String lowercased = url.toLowerCase();
String lowercased = url.toLowerCase(Locale.ROOT);
if (!lowercased.startsWith("http://") && !lowercased.startsWith("https://")) {
url = "https://" + url;
}

2
HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java
View File

@@ -266,7 +266,7 @@ public class FileDownloadTask extends FetchTask<Void> {
}
public static final IntegrityCheckHandler ZIP_INTEGRITY_CHECK_HANDLER = (filePath, destinationPath) -> {
String ext = FileUtils.getExtension(destinationPath).toLowerCase();
String ext = FileUtils.getExtension(destinationPath).toLowerCase(Locale.ROOT);
if (ext.equals("zip") || ext.equals("jar")) {
try (FileSystem ignored = CompressingUtils.createReadOnlyZipFileSystem(filePath)) {
// test for zip format

9
HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
View File

@@ -181,16 +181,19 @@ public final class StringUtils {
}
public static boolean containsOne(Collection<String> patterns, String... targets) {
for (String pattern : patterns)
for (String pattern : patterns) {
String lowerPattern = pattern.toLowerCase(Locale.ROOT);
for (String target : targets)
if (pattern.toLowerCase().contains(target.toLowerCase()))
if (lowerPattern.contains(target.toLowerCase(Locale.ROOT)))
return true;
}
return false;
}
public static boolean containsOne(String pattern, String... targets) {
String lowerPattern = pattern.toLowerCase(Locale.ROOT);
for (String target : targets)
if (pattern.toLowerCase().contains(target.toLowerCase()))
if (lowerPattern.contains(target.toLowerCase(Locale.ROOT)))
return true;
return false;
}

4
HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/LowerCaseEnumTypeAdapterFactory.java
View File

@@ -63,12 +63,12 @@ public final class LowerCaseEnumTypeAdapterFactory implements TypeAdapterFactory
reader.nextNull();
return null;
}
return lowercaseToConstant.get(reader.nextString().toLowerCase());
return lowercaseToConstant.get(reader.nextString().toLowerCase(Locale.ROOT));
}
};
}
private static String toLowercase(Object o) {
return o.toString().toLowerCase(Locale.US);
return o.toString().toLowerCase(Locale.ROOT);
}
}

4
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/OperatingSystem.java
View File

@@ -311,9 +311,9 @@ public enum OperatingSystem {
int dot = name.indexOf('.');
// on windows, filename suffixes are not relevant to name validity
String basename = dot == -1 ? name : name.substring(0, dot);
if (Arrays.binarySearch(INVALID_RESOURCE_BASENAMES, basename.toLowerCase()) >= 0)
if (Arrays.binarySearch(INVALID_RESOURCE_BASENAMES, basename.toLowerCase(Locale.ROOT)) >= 0)
return false;
if (Arrays.binarySearch(INVALID_RESOURCE_FULLNAMES, name.toLowerCase()) >= 0)
if (Arrays.binarySearch(INVALID_RESOURCE_FULLNAMES, name.toLowerCase(Locale.ROOT)) >= 0)
return false;
if (INVALID_RESOURCE_CHARACTERS.matcher(name).find())
return false;