X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fworkers%2FAlignCalcManager.java;h=dd255936064009475bfe2276c4d408e765bc9317;hb=ad15cff29620f960119f80176f1fd443da9f6763;hp=bc5e8e3fcc678951620d74a259ef3e98e4b4e6c5;hpb=478ad312d5434cda157c2aecc0fbb4600b50da74;p=jalview.git

diff --git a/src/jalview/workers/AlignCalcManager.java b/src/jalview/workers/AlignCalcManager.java
index bc5e8e3..dd25593 100644
--- a/src/jalview/workers/AlignCalcManager.java
+++ b/src/jalview/workers/AlignCalcManager.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview 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.
+ *  
+ * Jalview 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 Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.workers;
 
 import java.util.ArrayList;
@@ -6,6 +26,7 @@ import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import jalview.api.AlignCalcManagerI;
 import jalview.api.AlignCalcWorkerI;
@@ -62,7 +83,7 @@ public class AlignCalcManager implements AlignCalcManagerI
 
   /*
    * (non-Javadoc)
-   *
+   * 
    * @see jalview.api.AlignCalcManagerI#isPending(jalview.api.AlignCalcWorkerI)
    */
   @Override
@@ -131,7 +152,7 @@ public class AlignCalcManager implements AlignCalcManagerI
   {
     synchronized (inProgress)
     {
-//      System.err.println("Worker "+worker.getClass()+" marked as complete.");
+      // System.err.println("Worker "+worker.getClass()+" marked as complete.");
       inProgress.remove(worker.getClass());
       List<AlignCalcWorkerI> upd = updating.get(worker.getClass());
       if (upd != null)
@@ -165,8 +186,8 @@ public class AlignCalcManager implements AlignCalcManagerI
   @Override
   public void startWorker(AlignCalcWorkerI worker)
   {
-//    System.err.println("Starting "+worker.getClass());
-//    new Exception("").printStackTrace();
+    // System.err.println("Starting "+worker.getClass());
+    // new Exception("").printStackTrace();
     Thread tw = new Thread(worker);
     tw.setName(worker.getClass().toString());
     tw.start();
@@ -315,4 +336,48 @@ public class AlignCalcManager implements AlignCalcManagerI
       }
     }
   }
+
+  @Override
+  public void removeRegisteredWorkersOfClass(Class typeToRemove)
+  {
+    List<AlignCalcWorkerI> workers = getRegisteredWorkersOfClass(typeToRemove);
+    List<AlignCalcWorkerI> removable = new ArrayList<AlignCalcWorkerI>();
+    Set<AlignCalcWorkerI> toremovannot = new HashSet<AlignCalcWorkerI>();
+    synchronized (restartable)
+    {
+      for (AlignCalcWorkerI worker : restartable)
+      {
+        if (typeToRemove.equals(worker.getClass()))
+        {
+          removable.add(worker);
+          toremovannot.add(worker);
+        }
+      }
+      restartable.removeAll(removable);
+    }
+    synchronized (canUpdate)
+    {
+      for (AlignCalcWorkerI worker : canUpdate)
+      {
+        if (typeToRemove.equals(worker.getClass()))
+        {
+          removable.add(worker);
+          toremovannot.add(worker);
+        }
+      }
+      canUpdate.removeAll(removable);
+    }
+    // TODO: finish testing this extension
+
+    /*
+     * synchronized (inProgress) { // need to kill or mark as dead any running
+     * threads... (inProgress.get(typeToRemove)); }
+     * 
+     * if (workers == null) { return; } for (AlignCalcWorkerI worker : workers)
+     * {
+     * 
+     * if (isPending(worker)) { worker.abortAndDestroy(); startWorker(worker); }
+     * else { System.err.println("Pending exists for " + workerClass); } }
+     */
+  }
 }