X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fjabaws2%2FJws2Instance.java;h=2708dd3f0eb976ca47a344ea0e2ea4dceece887e;hb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;hp=49371a886b51bdf09ddb16e942e7325e0b78d8ae;hpb=95d51867c156db0ac8f9cda391eb168be8ee05fa;p=jalview.git

diff --git a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
index 49371a8..2708dd3 100644
--- a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
+++ b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
@@ -1,3 +1,21 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.ws.jws2.jabaws2;
 
 import jalview.gui.AlignFrame;
@@ -22,20 +40,34 @@ public class Jws2Instance
   public String hosturl;
 
   public String serviceType;
+
   public String action;
+
   public JABAService service;
+
   public String description;
 
-  public Jws2Instance(String hosturl, String serviceType, String action, String description, 
-          JABAService service)
+  public String docUrl;
+
+  public Jws2Instance(String hosturl, String serviceType, String action,
+          String description, JABAService service)
   {
     super();
     this.hosturl = hosturl;
     this.serviceType = serviceType;
     this.service = service;
-    this.action=action;
+    this.action = action;
     this.description = description;
-    
+    int p = description.indexOf("MORE INFORMATION:");
+    if (p > -1)
+    {
+      docUrl = description.substring(description.indexOf("http", p)).trim();
+      if (docUrl.indexOf('\n') > -1)
+      {
+        docUrl = docUrl.substring(0, docUrl.indexOf("\n")).trim();
+      }
+
+    }
   }
 
   PresetManager presets = null;
@@ -89,7 +121,7 @@ public class Jws2Instance
    */
   public String getActionText()
   {
-    return action+" with " + serviceType;
+    return action + " with " + serviceType;
   }
 
   /**
@@ -108,7 +140,9 @@ public class Jws2Instance
     {
       return ((SequenceAnnotation) service).getRunnerOptions();
     }
-    throw new Error("Implementation Error: Runner Config not available for a JABAWS service of type "+serviceType+" ("+service.getClass()+")");
+    throw new Error(
+            "Implementation Error: Runner Config not available for a JABAWS service of type "
+                    + serviceType + " (" + service.getClass() + ")");
   }
 
   @Override
@@ -140,6 +174,8 @@ public class Jws2Instance
                         : null));
       } catch (Exception ex)
       {
+        System.err.println("Unexpected exception creating JabaParamStore.");
+        ex.printStackTrace();
       }
 
     }
@@ -177,9 +213,16 @@ public class Jws2Instance
     if (service instanceof MsaWS<?>)
     {
       new MsaWSClient().attachWSMenuEntry(atpoint, this, alignFrame);
-    } else 
-    if (service instanceof SequenceAnnotation<?>){
-      new SequenceAnnotationWSClient().attachWSMenuEntry(atpoint, this, alignFrame);
     }
+    else if (service instanceof SequenceAnnotation<?>)
+    {
+      new SequenceAnnotationWSClient().attachWSMenuEntry(atpoint, this,
+              alignFrame);
+    }
+  }
+
+  public String getServiceTypeURI()
+  {
+    return "java:" + serviceType;
   }
-}
\ No newline at end of file
+}