Added support for blocking tasks in task manager.

Author: C-Hess

src/main/java/com/github/bustedearlobes/themis/commands/ClearCommand.java

@@ -31,7 +31,7 @@ public void onCall(Matcher fullCommand, Message message, JDA jda, Themis themis)
                 targetChannel,
                 numOfMessages,
                 message.getTextChannel());
-        themis.getTaskManager().addTaskToScheduler(cmt);
+        themis.getTaskManager().addTask(cmt);
     }
 
     @Override

src/main/java/com/github/bustedearlobes/themis/commands/MuteCommand.java

@@ -29,7 +29,7 @@ public void onCall(Matcher parsedCommand, Message message, JDA jda, Themis themi
                     channel,
                     message.getTextChannel(),
                     true);
-            themis.getTaskManager().addTaskToScheduler(muteTask);
+            themis.getTaskManager().addTask(muteTask);
             if(parsedCommand.group(4) != null) {
                 TimeUnit timeUnit = parseTimeUnit(parsedCommand.group(6));
                 long time = Integer.parseInt(parsedCommand.group(5));
@@ -40,7 +40,7 @@ public void onCall(Matcher parsedCommand, Message message, JDA jda, Themis themi
                         false,
                         time,
                         timeUnit);
-                themis.getTaskManager().addTaskToScheduler(unmuteTask);
+                themis.getTaskManager().addTask(unmuteTask);
             }
         }
     }

src/main/java/com/github/bustedearlobes/themis/commands/UnmuteCommand.java

@@ -32,7 +32,7 @@ public void onCall(Matcher parsedCommand, Message message, JDA jda, Themis themi
                     false,
                     0,
                     TimeUnit.SECONDS);
-            themis.getTaskManager().addTaskToScheduler(unmuteTask);
+            themis.getTaskManager().addTask(unmuteTask);
         }
     }
 

src/main/java/com/github/bustedearlobes/themis/taskmanager/ScheduledTask.java

@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -22,13 +23,15 @@ public abstract class ScheduledTask extends ListenerAdapter implements Runnable,
     private long repeat;
     private long numberOfRuns;
     private long timeOfNextRun;
+    private AtomicBoolean isComplete;
     private transient JDA jda;
 
     public ScheduledTask(long delay, long periodicity, TimeUnit timeUnit, long repeat) {
         this.periodicity = timeUnit.toMillis(periodicity);
         this.timeOfNextRun = System.currentTimeMillis() + timeUnit.toMillis(delay);
         this.repeat = repeat;
         this.numberOfRuns = 0;
+        this.isComplete = new AtomicBoolean(false);
     }
 
     protected boolean taskIsReady() {
@@ -105,6 +108,7 @@ public final void run() {
         } finally {
             jda.removeEventListener(this);
         }
+        isComplete.set(true);
     }
 
     public final void incrementRun() {
@@ -113,6 +117,10 @@ public final void incrementRun() {
             numberOfRuns++;
         }
     }
+    
+    public boolean isComplete() {
+        return isComplete.get();
+    }
 
     protected abstract void runTask();
 }

src/main/java/com/github/bustedearlobes/themis/taskmanager/TaskManager.java

@@ -36,14 +36,21 @@ public TaskManager(JDA jda) {
         STATE_FILE.delete();
     }
 
-    public void addTaskToScheduler(ScheduledTask task) {
+    public void addTask(ScheduledTask task) {
         task.setJDA(jda);
         synchronized(scheduledTasks) {
             scheduledTasks.add(task);
         }
         saveState();
     }
 
+    public void addTaskBlocked(ScheduledTask task) throws InterruptedException {
+        addTask(task);
+        while(!task.isComplete()) {
+            Thread.sleep(100);
+        }
+    }
+    
     @Override
     public void run() {
         isRunning = new AtomicBoolean(true);
@@ -98,7 +105,7 @@ private void loadOldState() {
                 ObjectInputStream ois = new ObjectInputStream(bis)) {
             int numberOfTasks = ois.readInt();
             for(int count = 0; count < numberOfTasks; count ++) {
-                addTaskToScheduler((ScheduledTask)ois.readObject());
+                addTask((ScheduledTask)ois.readObject());
                 count ++;
             }
             LOG.log(Level.INFO, "Task manager state loaded " + numberOfTasks + " tasks from " + STATE_FILE.getCanonicalPath());