From 5a521fc13189931fb2a83e5870f3e3fdd7d3eafd Mon Sep 17 00:00:00 2001 From: ExceptNullpointer Date: Sat, 9 Jan 2021 20:52:19 +0300 Subject: [PATCH] Refactored Task class - Now crash reports have stacktrace - Minor changes --- .../windcorp/progressia/common/modules/Task.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/ru/windcorp/progressia/common/modules/Task.java b/src/main/java/ru/windcorp/progressia/common/modules/Task.java index 63d2f69..d4a6d0f 100644 --- a/src/main/java/ru/windcorp/progressia/common/modules/Task.java +++ b/src/main/java/ru/windcorp/progressia/common/modules/Task.java @@ -13,9 +13,9 @@ public abstract class Task private boolean done = false; - ArrayList requiredTasks = new ArrayList(); + ArrayList requiredTasks = new ArrayList<>(); - public Task(String id) { + protected Task(String id) { super(id); } @@ -23,17 +23,17 @@ public abstract class Task public void run() { if (!canRun()) { - ArrayList UndoneTasks = new ArrayList(); + ArrayList undoneTasks = new ArrayList<>(); for (Task j : requiredTasks) { if (!j.isDone()) { - UndoneTasks.add(j); + undoneTasks.add(j); } } - throw CrashReports.report(null, + throw CrashReports.report(new Throwable(), "The following required Tasks are not done:\n%s", - StringUtil.iterableToString(UndoneTasks, "\n")); + StringUtil.iterableToString(undoneTasks, "\n")); } perform(); @@ -45,8 +45,8 @@ public abstract class Task protected abstract void perform(); public void addRequiredTask(Task task) { - if (task.getId() == this.getId()) { - throw CrashReports.report(null, + if (task.equals(this)) { + throw CrashReports.report(new Throwable(), "It is impossible for the Task (%s) to require itself.", this.getId()); }