X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fjabaws2%2FJabawsAnnotationInstance.java;h=3c269c45f2e57f7d018cb908f77dd9d5ffac9633;hb=d66fa7f908037c4bd6f4007911a86b0bdc6edcb4;hp=95abe3cb5e0fa5bd7ae1f68630b05701bb565c19;hpb=47ecacc91ed5d80b59b42d255ef5c13e79d3dfa0;p=jalview.git

diff --git a/src/jalview/ws/jws2/jabaws2/JabawsAnnotationInstance.java b/src/jalview/ws/jws2/jabaws2/JabawsAnnotationInstance.java
index 95abe3c..3c269c4 100644
--- a/src/jalview/ws/jws2/jabaws2/JabawsAnnotationInstance.java
+++ b/src/jalview/ws/jws2/jabaws2/JabawsAnnotationInstance.java
@@ -125,11 +125,28 @@ public abstract class JabawsAnnotationInstance
             abstractJabaCalcWorker.getGapMap());
   }
 
+  /**
+   * service specific annotation creation method
+   * 
+   * @param running
+   * @param alignViewport
+   * @param gapMap
+   * @return
+   */
   abstract List<AlignmentAnnotation> annotationFromScoreManager(
           AnnotationWsJob running,
           AlignViewportI alignViewport, boolean[] gapMap);
 
-  // From JabawsCalcWorker
+  /**
+   * create and complete an annotation row from a JABAWS score object
+   * 
+   * @param alignViewport
+   * @param gapMap
+   * @param ourAnnot
+   * @param calcId
+   * @param alWidth
+   * @param scr
+   */
 
   protected void createAnnotationRowsForScores(AlignViewportI alignViewport,
           boolean[] gapMap, List<AlignmentAnnotation> ourAnnot,
@@ -148,6 +165,19 @@ public abstract class JabawsAnnotationInstance
     }
   }
 
+  /**
+   * create a sequence associated annotation row for JABAWS score object scr
+   * 
+   * @param alignViewport
+   * @param gapMap
+   * @param ourAnnot
+   * @param typeName
+   * @param calcId
+   * @param dseq
+   * @param base
+   * @param scr
+   * @return
+   */
   protected AlignmentAnnotation createAnnotationRowsForScores(
           AlignViewportI alignViewport, boolean[] gapMap,
           List<AlignmentAnnotation> ourAnnot, String typeName,
@@ -171,6 +201,20 @@ public abstract class JabawsAnnotationInstance
     return annotation;
   }
 
+  /**
+   * replace an existing sequence associated annotation with another, creating
+   * association as necessary
+   * 
+   * @param newAnnot
+   *          - annotation row used to create an instance on the dataset
+   *          sequence.
+   * @param typeName
+   *          - label used to match existing row
+   * @param calcId
+   *          - calcId for existing row
+   * @param aSeq
+   *          - alignment sequence with reference to destination dataet sequence
+   */
   protected void replaceAnnotationOnAlignmentWith(
           AlignmentAnnotation newAnnot, String typeName, String calcId,
           SequenceI aSeq)
@@ -195,6 +239,16 @@ public abstract class JabawsAnnotationInstance
     dssan.adjustForAlignment();
   }
 
+  /**
+   * create column annotation elements from Jabaws score object
+   * 
+   * @param gapMap
+   * @param annotation
+   * @param base
+   * @param alWidth
+   * @param scr
+   *          JABAWS score object
+   */
   protected void constructAnnotationFromScore(boolean[] gapMap,
           AlignmentAnnotation annotation,
           int base, int alWidth, Score scr)