X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fworkers%2FAlignmentAnnotationFactory.java;h=2507bb58a9b0aee05356da7f2b371cca35f220ed;hb=09d3b755d9b00f5c3acb44049aedd49361dc0690;hp=beee1eb9b86a00bb8d87c55e6a7bcf379d3b8834;hpb=604cbee405a837565ba1a74aa9bddd62aed685ab;p=jalview.git

diff --git a/src/jalview/workers/AlignmentAnnotationFactory.java b/src/jalview/workers/AlignmentAnnotationFactory.java
index beee1eb..2507bb5 100644
--- a/src/jalview/workers/AlignmentAnnotationFactory.java
+++ b/src/jalview/workers/AlignmentAnnotationFactory.java
@@ -31,11 +31,13 @@ import java.awt.Color;
 
 /**
  * Factory class with methods which allow clients (including external scripts
- * such as Groovy) to 'register and forget' an alignment annotation calculator. <br>
+ * such as Groovy) to 'register and forget' an alignment annotation calculator.
+ * <br>
  * Currently supports two flavours of calculator:
  * <ul>
  * <li>a simple 'feature counter' which counts any desired score derivable from
- * residue value and any sequence features at each position of the alignment</li>
+ * residue value and any sequence features at each position of the
+ * alignment</li>
  * <li>a 'general purpose' calculator which computes one or more complete
  * AlignmentAnnotation objects</li>
  * </ul>
@@ -48,35 +50,18 @@ public class AlignmentAnnotationFactory
    * @param counter
    *          provider of feature counts per alignment position
    */
-  public static void newCalculator(FeatureCounterI counter)
+  public static void newCalculator(FeatureSetCounterI counter)
   {
-    // TODO need an interface for AlignFrame by which to access
-    // its AlignViewportI and AlignmentViewPanel
-    AlignmentViewPanel currentAlignFrame = Jalview.getCurrentAlignFrame().alignPanel;
-    if (currentAlignFrame != null)
+    AlignmentViewPanel currentAlignFrame = Jalview
+            .getCurrentAlignFrame().alignPanel;
+    if (currentAlignFrame == null)
     {
-      newCalculator(currentAlignFrame.getAlignViewport(),
-              currentAlignFrame, counter);
+      System.err.println(
+              "Can't register calculator as no alignment window has focus");
+      return;
     }
-    else
-    {
-      System.err
-              .println("Can't register calculator as no alignment window has focus");
-    }
-  }
-
-  /**
-   * Constructs and registers a new alignment annotation worker
-   * 
-   * @param viewport
-   * @param panel
-   * @param counter
-   *          provider of feature counts per alignment position
-   */
-  public static void newCalculator(AlignViewportI viewport,
-          AlignmentViewPanel panel, FeatureCounterI counter)
-  {
-    new ColumnCounterWorker(viewport, panel, counter);
+    new ColumnCounterSetWorker(currentAlignFrame.getAlignViewport(),
+            currentAlignFrame, counter);
   }
 
   /**
@@ -92,13 +77,13 @@ public class AlignmentAnnotationFactory
     AlignFrame currentAlignFrame = Jalview.getCurrentAlignFrame();
     if (currentAlignFrame != null)
     {
-      newCalculator(currentAlignFrame.getViewport(), currentAlignFrame
-              .getAlignPanels().get(0), calculator);
+      new AnnotationWorker(currentAlignFrame.getViewport(),
+              currentAlignFrame.getAlignPanels().get(0), calculator);
     }
     else
     {
-      System.err
-              .println("Can't register calculator as no alignment window has focus");
+      System.err.println(
+              "Can't register calculator as no alignment window has focus");
     }
   }
 
@@ -129,7 +114,8 @@ public class AlignmentAnnotationFactory
   public static Annotation newAnnotation(String displayChar, String desc,
           char secondaryStructure, float val, Color color)
   {
-    return new Annotation(displayChar, desc, secondaryStructure, val, color);
+    return new Annotation(displayChar, desc, secondaryStructure, val,
+            color);
   }
 
   /**