AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-12 13:26:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge TaskCallable and TaskCallable2

Browse Source
This commit is contained in:
huanghongxun 2019-01-22 14:56:48 +08:00
parent 7224ed6a7d
commit 0804a2fbf8
3 changed files with 10 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,7 +376,7 @@ public abstract class Task {
} }
public static <V> TaskResult<V> ofResult(String id, ExceptionalFunction<AutoTypingMap<String>, V, ?> closure) { public static <V> TaskResult<V> ofResult(String id, ExceptionalFunction<AutoTypingMap<String>, V, ?> closure) {
return new TaskCallable2<>(id, closure); return new TaskCallable<>(id, closure);
} }
private static ExceptionalFunction<AutoTypingMap<String>, Task, ?> convert(Task t) { private static ExceptionalFunction<AutoTypingMap<String>, Task, ?> convert(Task t) {

11
HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskCallable.java
View File

@ -17,6 +17,9 @@
*/ */
package org.jackhuang.hmcl.task; package org.jackhuang.hmcl.task;
import org.jackhuang.hmcl.util.AutoTypingMap;
import org.jackhuang.hmcl.util.function.ExceptionalFunction;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
/** /**
@ -26,9 +29,13 @@ import java.util.concurrent.Callable;
class TaskCallable<V> extends TaskResult<V> { class TaskCallable<V> extends TaskResult<V> {
private final String id; private final String id;
private final Callable<V> callable; private final ExceptionalFunction<AutoTypingMap<String>, V, ?> callable;
public TaskCallable(String id, Callable<V> callable) { public TaskCallable(String id, Callable<V> callable) {
this(id, variables -> callable.call());
}
public TaskCallable(String id, ExceptionalFunction<AutoTypingMap<String>, V, ?> callable) {
this.id = id; this.id = id;
this.callable = callable; this.callable = callable;
} }
@ -40,6 +47,6 @@ class TaskCallable<V> extends TaskResult<V> {
@Override @Override
public void execute() throws Exception { public void execute() throws Exception {
setResult(callable.call()); setResult(callable.apply(getVariables()));
} }
} }

46
HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskCallable2.java
View File

@ -1,46 +0,0 @@
/*
* Hello Minecraft! Launcher
* Copyright (C) 2019 huangyuhui <huanghongxun2008@126.com> and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.jackhuang.hmcl.task;
import org.jackhuang.hmcl.util.AutoTypingMap;
import org.jackhuang.hmcl.util.function.ExceptionalFunction;
/**
*
* @author huangyuhui
*/
class TaskCallable2<V> extends TaskResult<V> {
private final String id;
private final ExceptionalFunction<AutoTypingMap<String>, V, ?> callable;
public TaskCallable2(String id, ExceptionalFunction<AutoTypingMap<String>, V, ?> callable) {
this.id = id;
this.callable = callable;
}
@Override
public String getId() {
return id;
}
@Override
public void execute() throws Exception {
setResult(callable.apply(getVariables()));
}
}