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

Remove 3-arg Lang.merge()

Browse Source
This commit is contained in:
yushijinhun
2018-02-18 15:44:32 +08:00
parent 470045f228
commit 65491ef18e
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java
View File

@@ -216,8 +216,8 @@ public final class Lang {
return convert(map.get(key), clazz, defaultValue); return convert(map.get(key), clazz, defaultValue);
} }
public static <T> List<T> merge(Collection<T> a, Collection<T> b) { public static <T> List<T> merge(Collection<? extends T> a, Collection<? extends T> b) {
LinkedList<T> result = new LinkedList<>(); List<T> result = new ArrayList<>();
if (a != null) if (a != null)
result.addAll(a); result.addAll(a);
if (b != null) if (b != null)
@@ -225,17 +225,6 @@ public final class Lang {
return result; return result;
} }
public static <T> List<T> merge(Collection<T> a, Collection<T> b, Collection<T> c) {
LinkedList<T> result = new LinkedList<>();
if (a != null)
result.addAll(a);
if (b != null)
result.addAll(b);
if (c != null)
result.addAll(c);
return result;
}
public static void executeDelayed(Runnable runnable, TimeUnit timeUnit, long timeout, boolean isDaemon) { public static void executeDelayed(Runnable runnable, TimeUnit timeUnit, long timeout, boolean isDaemon) {
thread(() -> { thread(() -> {
try { try {