From 7c77c317dffaa9e505d748d3ce67fd7e3402db48 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Wed, 29 Aug 2018 00:03:50 +0800 Subject: [PATCH] Improve finalizedTask log --- .gitignore | 10 +++++++--- .../java/org/jackhuang/hmcl/task/FinalizedTask.java | 5 ++--- .../src/main/java/org/jackhuang/hmcl/task/Task.java | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 529f413ad..ce62b990a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ hs_err_pid* .gradle -.idea *.lck *.1 @@ -19,7 +18,12 @@ NVIDIA /HMCL/build/ /HMCLCore/build/ -# idea output +# idea +.idea /out/ /HMCL/out/ -/HMCLCore/out/ \ No newline at end of file +/HMCLCore/out/ + +# eclipse +.classpath +.project diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FinalizedTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FinalizedTask.java index 6ecc5ab52..dd85b0dca 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FinalizedTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FinalizedTask.java @@ -37,13 +37,13 @@ final class FinalizedTask extends Task { * @param pred the task that runs before succ. * @param callback a callback that returns the task runs after pred, succ will be executed asynchronously. You can do something that relies on the result of pred. */ - public FinalizedTask(Task pred, Scheduler scheduler, FinalizedCallback callback) { + public FinalizedTask(Task pred, Scheduler scheduler, FinalizedCallback callback, String name) { this.dependents = Collections.singleton(pred); this.scheduler = scheduler; this.callback = callback; setSignificance(TaskSignificance.MODERATE); - setName(callback.toString()); + setName(name); } @Override @@ -53,7 +53,6 @@ final class FinalizedTask extends Task { @Override public void execute() throws Exception { - setName(callback.toString()); callback.execute(getVariables(), isDependentsSucceeded()); if (!isDependentsSucceeded()) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java index 86500d02d..7dd44a065 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java @@ -281,7 +281,7 @@ public abstract class Task { } public final Task finalized(Scheduler scheduler, FinalizedCallback b) { - return new FinalizedTask(this, scheduler, b); + return new FinalizedTask(this, scheduler, b, ReflectionHelper.getCaller().toString()); } public final Task finalized(Scheduler scheduler, ExceptionalConsumer, T> success, ExceptionalConsumer failure) {