From: jprocter <Jim Procter>
Date: Wed, 8 Aug 2007 11:58:49 +0000 (+0000)
Subject: generalise name of prediction method
X-Git-Tag: Release_2_4~317
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=cab9f54d732ed7b127140efd5f3b923accd10eb4;p=jalview.git

generalise name of prediction method
---

diff --git a/src/jalview/ws/JPredClient.java b/src/jalview/ws/JPredClient.java
index 2475fb1..80ed959 100755
--- a/src/jalview/ws/JPredClient.java
+++ b/src/jalview/ws/JPredClient.java
@@ -114,7 +114,7 @@ public class JPredClient
     if (msa && msf.length > 1)
     {
 
-      String altitle = "JNet prediction on " + (viewonly ? "visible " : "") +
+      String altitle = getPredictionName(WebServiceName)+" on " + (viewonly ? "visible " : "") +
           seq.getName() +
           " using alignment from " + title;
 
@@ -154,7 +154,8 @@ public class JPredClient
       {
         throw new Error("Implementation Error! Multiple single sequence prediction jobs are not yet supported.");
       }
-      String altitle = "JNet prediction for " + (viewonly ? "visible " : "") +
+      
+      String altitle = getPredictionName(WebServiceName)+" for " + (viewonly ? "visible " : "") +
           "sequence " + seq.getName() +
           " from " +
           title;
@@ -181,6 +182,16 @@ public class JPredClient
     }
   }
 
+  private String getPredictionName(String webServiceName)
+  {
+    if (webServiceName.toLowerCase().indexOf("secondary structure prediction")>-1)
+    {
+      return webServiceName;
+    } else {
+      return webServiceName+"secondary structure prediction";
+    }
+  }
+
   public JPredClient(ext.vamsas.ServiceHandle sh, String title, SequenceI seq,
                      AlignFrame parentFrame)
   {