JAL-3690 Fixed slivka wsmenu categories.

[jalview.git] / src / jalview / ws / slivkaws / SlivkaAnnotationServiceInstance.java

diff --git a/src/jalview/ws/slivkaws/SlivkaAnnotationServiceInstance.java b/src/jalview/ws/slivkaws/SlivkaAnnotationServiceInstance.java
index cc5c1e4..f11eb1c 100644 (file)
--- a/src/jalview/ws/slivkaws/SlivkaAnnotationServiceInstance.java
+++ b/src/jalview/ws/slivkaws/SlivkaAnnotationServiceInstance.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import compbio.data.msa.Category;
 import uk.ac.dundee.compbio.slivkaclient.RemoteFile;
 import uk.ac.dundee.compbio.slivkaclient.SlivkaClient;
 import uk.ac.dundee.compbio.slivkaclient.SlivkaService;
@@ -29,13 +30,12 @@ import uk.ac.dundee.compbio.slivkaclient.SlivkaService;
 public class SlivkaAnnotationServiceInstance extends SlivkaWSInstance implements SequenceAnnotationServiceI
 {
   public SlivkaAnnotationServiceInstance(SlivkaClient client,
-          SlivkaService service, boolean conservation)
+          SlivkaService service, String category)
   {
-    super(client, service, !conservation ? "Protein sequence analysis"
-        : "Alignment Conservation");
-    if (conservation)
+    super(client, service, category);
+    if (category == Category.CATEGORY_CONSERVATION)
     {
-      setAlignAnalysisUI(new AlignAnalysisUIText(getName(),
+      setAlignAnalysisUI(new AlignAnalysisUIText(category,
               SlivkaAnnotationServiceInstance.class,
               "Slivka.AACons", false, true, true, true, true, 2,
               MessageManager.getString("label.aacon_calculations"),