Windcorp/JavaProgressia
Windcorp/JavaProgressia
Archived
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactored Task class

Browse Source 
- Now crash reports have stacktrace
- Minor changes
This commit is contained in:
Евгений Смирнов 2021-01-09 20:52:19 +03:00
parent 361d795ab1
commit 5a521fc131
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/ru/windcorp/progressia/common/modules/Task.java
View File

@ -13,9 +13,9 @@ public abstract class Task
private boolean done = false; private boolean done = false;
ArrayList<Task> requiredTasks = new ArrayList<Task>(); ArrayList<Task> requiredTasks = new ArrayList<>();
public Task(String id) { protected Task(String id) {
super(id); super(id);
} }
@ -23,17 +23,17 @@ public abstract class Task
public void run() { public void run() {
if (!canRun()) { if (!canRun()) {
ArrayList<Task> UndoneTasks = new ArrayList<Task>(); ArrayList<Task> undoneTasks = new ArrayList<>();
for (Task j : requiredTasks) { for (Task j : requiredTasks) {
if (!j.isDone()) { 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", "The following required Tasks are not done:\n%s",
StringUtil.iterableToString(UndoneTasks, "\n")); StringUtil.iterableToString(undoneTasks, "\n"));
} }
perform(); perform();
@ -45,8 +45,8 @@ public abstract class Task
protected abstract void perform(); protected abstract void perform();
public void addRequiredTask(Task task) { public void addRequiredTask(Task task) {
if (task.getId() == this.getId()) { if (task.equals(this)) {
throw CrashReports.report(null, throw CrashReports.report(new Throwable(),
"It is impossible for the Task (%s) to require itself.", "It is impossible for the Task (%s) to require itself.",
this.getId()); this.getId());
} }