X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FEnfinEnvision2OneWay.java;h=f40831ca2041c7ac2f9ac8f33916fc8365b05a04;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=b36956ca901f98690e297538ecddfc3a43a35f76;hpb=2a549ca83520072d6e3bb0db228097b5ff1546cb;p=jalview.git

diff --git a/src/jalview/ws/EnfinEnvision2OneWay.java b/src/jalview/ws/EnfinEnvision2OneWay.java
index b36956c..f40831c 100644
--- a/src/jalview/ws/EnfinEnvision2OneWay.java
+++ b/src/jalview/ws/EnfinEnvision2OneWay.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
  * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
@@ -366,6 +366,10 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements
   private void buildGroupLinkMenu(JMenu enfinServiceMenu,
           AlignFrame alignFrame)
   {
+    if (running || !started)
+    {
+      return;
+    }
     SequenceI[] seqs = alignFrame.getViewport().getSelectionAsNewSequence();
     SequenceGroup sg = alignFrame.getViewport().getSelectionGroup();
     if (sg == null)
@@ -400,7 +404,8 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements
    */
   private JMenu buildGroupURLMenu(SequenceI[] seqs, SequenceGroup sg)
   {
-
+    if (groupURLdescr==null || groupURLLinks==null)
+      return null;
     // TODO: usability: thread off the generation of group url content so root
     // menu appears asap
     // sequence only URLs
@@ -474,8 +479,8 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements
     int[] nsqtype = new int[] { 0,0,0,0,0,0,0,0,0,0};
     for (int i = 0; i < groupURLLinks.size(); i++)
     {
-      String link = groupURLLinks.elementAt(i).toString();
-      String descr = groupURLdescr.elementAt(i).toString();
+      String link = (String) groupURLLinks.elementAt(i);
+      String descr = (String) groupURLdescr.elementAt(i);
 
       // boolean specialCase =
       // additionalPar.elementAt(i).toString().equals(BACKGROUND);
@@ -636,7 +641,7 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements
 
       public void menuSelected(MenuEvent e)
       {
-        if (refresh)
+        if (refresh && !isRunning())
         {
           new Thread(new Runnable() {
             public void run() {