Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD

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

diff --git a/src/jalview/ws/jws2/SequenceAnnotationWSClient.java b/src/jalview/ws/jws2/SequenceAnnotationWSClient.java
index 838ea60..39217bb 100644 (file)
--- a/src/jalview/ws/jws2/SequenceAnnotationWSClient.java
+++ b/src/jalview/ws/jws2/SequenceAnnotationWSClient.java
@@ -33,6 +33,8 @@ import jalview.ws.uimodel.AlignAnalysisUIText;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.List;
+import java.util.Locale;
+
 
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -122,6 +124,7 @@ public class SequenceAnnotationWSClient extends Jws2Client
             startSeqAnnotationWorker(sh, alignFrame, preset, editParams);
           }
         });
+
       }
       else
       {
@@ -153,16 +156,7 @@ public class SequenceAnnotationWSClient extends Jws2Client
         }
       }
     }
-    else
-    {
-      startSeqAnnotationWorker(sh, alignFrame, preset, editParams);
-    }
-  }
-
-  private void startSeqAnnotationWorker(ServiceWithParameters sh,
-      AlignFrame alignFrame, WsParamSetI preset, boolean editParams)
-  {
-    if (!sh.isInteractiveUpdate())
+    if (sh.action.toLowerCase(Locale.ROOT).contains("disorder"))
     {
       // build IUPred style client. take sequences, returns annotation per
       // sequence.