Merge branch 'Jalview-JS/develop_j2s_v3_2_9_j11' into Jalview-JS/develop

[jalview.git] / src / jalview / ws / jws2 / AAConClient.java

diff --git a/src/jalview/ws/jws2/AAConClient.java b/src/jalview/ws/jws2/AAConClient.java
index 0c6c271..327864a 100644 (file)
--- a/src/jalview/ws/jws2/AAConClient.java
+++ b/src/jalview/ws/jws2/AAConClient.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -48,10 +48,12 @@ public class AAConClient extends JabawsCalcWorker
     alignedSeqs = true;
     nucleotidesAllowed = false;
     proteinAllowed = true;
+    filterNonStandardResidues = true;
     gapMap = new boolean[0];
     initViewportParams();
   }
 
+  @Override
   public String getServiceActionText()
   {
     return "calculating Amino acid consensus using AACon service";
@@ -62,13 +64,14 @@ public class AAConClient extends JabawsCalcWorker
    * current visualization settings.
    */
 
+  @Override
   public void updateResultAnnotation(boolean immediate)
   {
     if (immediate || !calcMan.isWorking(this) && scoremanager != null)
     {
       Map<String, TreeSet<Score>> scoremap = scoremanager.asMap();
       int alWidth = alignViewport.getAlignment().getWidth();
-      ArrayList<AlignmentAnnotation> ourAnnot = new ArrayList<AlignmentAnnotation>();
+      ArrayList<AlignmentAnnotation> ourAnnot = new ArrayList<>();
       for (String score : scoremap.keySet())
       {
         Set<Score> scores = scoremap.get(score);