Unable to launch dialog

This commit is contained in:
huangyuhui
2018-02-02 10:46:27 +08:00
parent cec8249b24
commit 7ea2b57ece
8 changed files with 57 additions and 21 deletions

View File

@@ -53,10 +53,12 @@ final class CoupleTask<P extends Task> extends Task {
this.failIfDependentsFail = failIfDependentsFail;
setSignificance(TaskSignificance.MODERATE);
setName(succ.toString());
}
@Override
public void execute() throws Exception {
setName(succ.toString());
Task task = succ.apply(getVariables());
if (task != null)
dependencies.add(task);

View File

@@ -29,18 +29,16 @@ class SimpleTask extends Task {
private final ExceptionalConsumer<AutoTypingMap<String>, ?> consumer;
private final Scheduler scheduler;
public SimpleTask(String name, ExceptionalConsumer<AutoTypingMap<String>, ?> consumer) {
this(name, consumer, Schedulers.defaultScheduler());
}
public SimpleTask(String name, ExceptionalConsumer<AutoTypingMap<String>, ?> consumer, Scheduler scheduler) {
this.consumer = consumer;
this.scheduler = scheduler;
if (name == null)
if (name == null) {
setSignificance(TaskSignificance.MINOR);
else
setName(consumer.toString());
} else {
setName(name);
}
}
@Override

View File

@@ -233,7 +233,7 @@ public abstract class Task {
}
public final TaskExecutor subscribe(Scheduler scheduler, ExceptionalRunnable<?> closure) {
return subscribe(of(scheduler, i -> closure.run()));
return subscribe(of(scheduler, ExceptionalConsumer.fromRunnable(closure)));
}
public final TaskExecutor subscribe(ExceptionalConsumer<AutoTypingMap<String>, ?> closure) {
@@ -245,7 +245,7 @@ public abstract class Task {
}
public final Task then(Task b) {
return then(s -> b);
return then(convert(b));
}
public final Task then(ExceptionalFunction<AutoTypingMap<String>, Task, ?> b) {
@@ -253,15 +253,15 @@ public abstract class Task {
}
public final Task with(Task b) {
return with(s -> b);
return with(convert(b));
}
public final Task with(ExceptionalFunction<AutoTypingMap<String>, Task, ?> b) {
public final <E extends Exception> Task with(ExceptionalFunction<AutoTypingMap<String>, Task, E> b) {
return new CoupleTask<>(this, b, false, false);
}
public final Task finalized(Task b) {
return finalized(s -> b);
return finalized(convert(b));
}
public final Task finalized(ExceptionalFunction<AutoTypingMap<String>, Task, ?> b) {
@@ -269,16 +269,15 @@ public abstract class Task {
}
public static Task empty() {
return of(s -> {
});
return of(ExceptionalConsumer.empty());
}
public static Task of(String name, ExceptionalRunnable<?> runnable) {
return of(name, s -> runnable.run());
return of(name, ExceptionalConsumer.fromRunnable(runnable));
}
public static Task of(ExceptionalRunnable<?> runnable) {
return of(s -> runnable.run());
return of(ExceptionalConsumer.fromRunnable(runnable));
}
public static Task of(String name, ExceptionalConsumer<AutoTypingMap<String>, ?> closure) {
@@ -298,7 +297,7 @@ public abstract class Task {
}
public static Task of(String name, Scheduler scheduler, ExceptionalRunnable<?> closure) {
return new SimpleTask(name, i -> closure.run(), scheduler);
return new SimpleTask(name, ExceptionalConsumer.fromRunnable(closure), scheduler);
}
public static Task of(Scheduler scheduler, ExceptionalRunnable<?> closure) {
@@ -313,6 +312,20 @@ public abstract class Task {
return new TaskCallable2<>(id, closure);
}
private static ExceptionalFunction<AutoTypingMap<String>, Task, ?> convert(Task t) {
return new ExceptionalFunction<AutoTypingMap<String>, Task, Exception>() {
@Override
public Task apply(AutoTypingMap<String> autoTypingMap) {
return t;
}
@Override
public String toString() {
return t.getName();
}
};
}
public enum TaskSignificance {
MAJOR,
MODERATE,

View File

@@ -22,4 +22,23 @@ package org.jackhuang.hmcl.util;
*/
public interface ExceptionalConsumer<T, E extends Exception> {
void accept(T t) throws E;
static <T, E extends Exception> ExceptionalConsumer<T, E> fromRunnable(ExceptionalRunnable<E> runnable) {
return new ExceptionalConsumer<T, E>() {
@Override
public void accept(T o) throws E {
runnable.run();
}
@Override
public String toString() {
return runnable.toString();
}
};
}
static <T> ExceptionalConsumer<T, ?> empty() {
return s -> {
};
}
}