JAL-1759 updates for Jmol 14.2.14_25.06.11

[jalview.git] / src / jalview / ws / EnfinEnvision2OneWay.java

diff --git a/src/jalview/ws/EnfinEnvision2OneWay.java b/src/jalview/ws/EnfinEnvision2OneWay.java
index 239a626..2055596 100644 (file)
--- a/src/jalview/ws/EnfinEnvision2OneWay.java
+++ b/src/jalview/ws/EnfinEnvision2OneWay.java
@@ -20,17 +20,6 @@
  */
 package jalview.ws;
 
-import jalview.bin.Cache;
-import jalview.datamodel.DBRefEntry;
-import jalview.datamodel.SequenceGroup;
-import jalview.datamodel.SequenceI;
-import jalview.gui.AlignFrame;
-import jalview.gui.Desktop;
-import jalview.gui.JvSwingUtils;
-import jalview.util.GroupUrlLink;
-import jalview.util.MessageManager;
-import jalview.util.GroupUrlLink.UrlStringTooLongException;
-
 import java.awt.Component;
 import java.awt.Cursor;
 import java.awt.event.ActionEvent;
@@ -54,7 +43,16 @@ import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
-import com.lowagie.text.html.HtmlEncoder;
+import jalview.bin.Cache;
+import jalview.datamodel.DBRefEntry;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.gui.AlignFrame;
+import jalview.gui.Desktop;
+import jalview.gui.JvSwingUtils;
+import jalview.util.GroupUrlLink;
+import jalview.util.GroupUrlLink.UrlStringTooLongException;
+import jalview.util.MessageManager;
 
 /**
  * Lightweight runnable to discover dynamic 'one way' group URL services
@@ -65,6 +63,7 @@ import com.lowagie.text.html.HtmlEncoder;
  * @deprecated
  * 
  */
+@Deprecated
 public class EnfinEnvision2OneWay extends DefaultHandler implements
         Runnable, WSMenuEntryProviderI
 {
@@ -321,7 +320,8 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements
     }
     try
     {
-      descr = HtmlEncoder.encode(descr);
+      // TODO check with Jim if this class (EnfinEnvision) is obsolete
+      // descr = HtmlEncoder.encode(descr); // iText removed from Jmol 14.2
     } catch (Exception e)
     {
     }
@@ -431,7 +431,9 @@ 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