JAL-3210 Barebones gradle/buildship/eclipse. See README

[jalview.git] / src / jalview / workers / AlignCalcManager.java

diff --git a/src/jalview/workers/AlignCalcManager.java b/src/jalview/workers/AlignCalcManager.java
index 9a3fc8d..08ef3a2 100644 (file)
--- a/src/jalview/workers/AlignCalcManager.java
+++ b/src/jalview/workers/AlignCalcManager.java
@@ -22,7 +22,6 @@ package jalview.workers;
 
 import jalview.api.AlignCalcManagerI;
 import jalview.api.AlignCalcWorkerI;
-import jalview.bin.Jalview;
 import jalview.datamodel.AlignmentAnnotation;
 
 import java.util.ArrayList;
@@ -35,10 +34,6 @@ import java.util.Set;
 
 public class AlignCalcManager implements AlignCalcManagerI
 {
-  public static final String STARTED = "started";
-
-  public static final String FINISHED = "finished";
-
   /*
    * list of registered workers
    */
@@ -79,7 +74,7 @@ public class AlignCalcManager implements AlignCalcManagerI
             .synchronizedList(new ArrayList<AlignCalcWorkerI>());
     updating = Collections.synchronizedMap(
             new Hashtable<Class<? extends AlignCalcWorkerI>, List<AlignCalcWorkerI>>());
-    canUpdate = new HashSet<>();
+    canUpdate = new HashSet<AlignCalcWorkerI>();
   }
 
   @Override
@@ -87,7 +82,6 @@ public class AlignCalcManager implements AlignCalcManagerI
   {
     synchronized (updating)
     {
-      Jalview.getInstance().notifyWorker(worker, STARTED);
       List<AlignCalcWorkerI> upd = updating.get(worker.getClass());
       if (upd == null)
       {
@@ -150,7 +144,6 @@ public class AlignCalcManager implements AlignCalcManagerI
   {
     synchronized (inProgress)
     {
-      Jalview.getInstance().notifyWorker(worker, FINISHED);
       // System.err.println("Worker " + worker + " marked as complete.");
       inProgress.remove(worker);
       List<AlignCalcWorkerI> upd = updating.get(worker.getClass());
@@ -292,7 +285,7 @@ public class AlignCalcManager implements AlignCalcManagerI
   public List<AlignCalcWorkerI> getRegisteredWorkersOfClass(
           Class<? extends AlignCalcWorkerI> workerClass)
   {
-    List<AlignCalcWorkerI> workingClass = new ArrayList<>();
+    List<AlignCalcWorkerI> workingClass = new ArrayList<AlignCalcWorkerI>();
     synchronized (canUpdate)
     {
       for (AlignCalcWorkerI worker : canUpdate)
@@ -319,8 +312,8 @@ public class AlignCalcManager implements AlignCalcManagerI
   public void removeRegisteredWorkersOfClass(
           Class<? extends AlignCalcWorkerI> typeToRemove)
   {
-    List<AlignCalcWorkerI> removable = new ArrayList<>();
-    Set<AlignCalcWorkerI> toremovannot = new HashSet<>();
+    List<AlignCalcWorkerI> removable = new ArrayList<AlignCalcWorkerI>();
+    Set<AlignCalcWorkerI> toremovannot = new HashSet<AlignCalcWorkerI>();
     synchronized (restartable)
     {
       for (AlignCalcWorkerI worker : restartable)
@@ -370,7 +363,7 @@ public class AlignCalcManager implements AlignCalcManagerI
      * first just find those to remove (to avoid
      * ConcurrentModificationException)
      */
-    List<AlignCalcWorkerI> toRemove = new ArrayList<>();
+    List<AlignCalcWorkerI> toRemove = new ArrayList<AlignCalcWorkerI>();
     for (AlignCalcWorkerI worker : restartable)
     {
       if (worker.involves(ann))