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

fix: tasks with default name will not be displayed

Browse Source
This commit is contained in:
huanghongxun
2020-02-20 14:06:03 +08:00
parent 5c25ab3eda
commit 0a68e52fca
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCLCore/src/main/java/org/jackhuang/hmcl/download/VersionList.java
View File

@@ -86,7 +86,7 @@ public abstract class VersionList<T extends RemoteVersion> {
}
public Task<?> loadAsync(String gameVersion) {
return Task.composeAsync(null, () -> {
return Task.composeAsync(() -> {
lock.readLock().lock();
boolean loaded;

21
HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java
View File

@@ -63,8 +63,9 @@ public abstract class Task<T> {
return significance;
}
public final void setSignificance(TaskSignificance significance) {
public final Task<T> setSignificance(TaskSignificance significance) {
this.significance = significance;
return this;
}
// cancel
@@ -419,7 +420,7 @@ public abstract class Task<T> {
* @return the new Task
*/
public <U, E extends Exception> Task<U> thenApplyAsync(Executor executor, ExceptionalFunction<T, U, E> fn) {
return thenApplyAsync(getCaller(), executor, fn);
return thenApplyAsync(getCaller(), executor, fn).setSignificance(TaskSignificance.MODERATE);
}
/**
@@ -460,7 +461,7 @@ public abstract class Task<T> {
* @return the new Task
*/
public <E extends Exception> Task<Void> thenAcceptAsync(Executor executor, ExceptionalConsumer<T, E> action) {
return thenAcceptAsync(getCaller(), executor, action);
return thenAcceptAsync(getCaller(), executor, action).setSignificance(TaskSignificance.MODERATE);
}
/**
@@ -502,7 +503,7 @@ public abstract class Task<T> {
* @return the new Task
*/
public <E extends Exception> Task<Void> thenRunAsync(Executor executor, ExceptionalRunnable<E> action) {
return thenRunAsync(getCaller(), executor, action);
return thenRunAsync(getCaller(), executor, action).setSignificance(TaskSignificance.MODERATE);
}
/**
@@ -614,7 +615,7 @@ public abstract class Task<T> {
* @return the new Task
*/
public <E extends Exception> Task<Void> withRunAsync(Executor executor, ExceptionalRunnable<E> action) {
return withRunAsync(getCaller(), executor, action);
return withRunAsync(getCaller(), executor, action).setSignificance(TaskSignificance.MODERATE);
}
/**
@@ -701,7 +702,7 @@ public abstract class Task<T> {
public List<String> getStages() {
return Lang.merge(Task.this.getStages(), super.getStages());
}
}.setExecutor(executor).setName(getCaller());
}.setExecutor(executor).setName(getCaller()).setSignificance(TaskSignificance.MODERATE);
}
/**
@@ -810,7 +811,7 @@ public abstract class Task<T> {
}
public static Task<Void> runAsync(Executor executor, ExceptionalRunnable<?> closure) {
return runAsync(getCaller(), executor, closure);
return runAsync(getCaller(), executor, closure).setSignificance(TaskSignificance.MODERATE);
}
public static Task<Void> runAsync(String name, Executor executor, ExceptionalRunnable<?> closure) {
@@ -818,7 +819,7 @@ public abstract class Task<T> {
}
public static <T> Task<T> composeAsync(ExceptionalSupplier<Task<T>, ?> fn) {
return composeAsync(getCaller(), fn);
return composeAsync(getCaller(), fn).setSignificance(TaskSignificance.MODERATE);
}
public static <T> Task<T> composeAsync(String name, ExceptionalSupplier<Task<T>, ?> fn) {
@@ -845,11 +846,11 @@ public abstract class Task<T> {
}
public static <V> Task<V> supplyAsync(Callable<V> callable) {
return supplyAsync(getCaller(), callable);
return supplyAsync(getCaller(), callable).setSignificance(TaskSignificance.MODERATE);
}
public static <V> Task<V> supplyAsync(Executor executor, Callable<V> callable) {
return supplyAsync(getCaller(), executor, callable);
return supplyAsync(getCaller(), executor, callable).setSignificance(TaskSignificance.MODERATE);
}
public static <V> Task<V> supplyAsync(String name, Callable<V> callable) {