X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FEnfinEnvision2OneWay.java;h=c048f4563381e54b572020d67458e6c67fdfc2e0;hb=35626511226b6eca47a7610f4682a3c686d64fa2;hp=b5b081d36425990bf7d65b4aefe0886b9aee2d86;hpb=9e0de5f746594b5ccb94b548e4a1bd948ea3acdc;p=jalview.git
diff --git a/src/jalview/ws/EnfinEnvision2OneWay.java b/src/jalview/ws/EnfinEnvision2OneWay.java
index b5b081d..c048f45 100644
--- a/src/jalview/ws/EnfinEnvision2OneWay.java
+++ b/src/jalview/ws/EnfinEnvision2OneWay.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * 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.
- *
+ * 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.ws;
@@ -30,17 +33,13 @@ import jalview.util.GroupUrlLink.UrlStringTooLongException;
import java.awt.Component;
import java.awt.Cursor;
import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLEncoder;
import java.util.Hashtable;
import java.util.Map;
import java.util.Vector;
+import java.util.regex.Pattern;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
@@ -54,10 +53,15 @@ import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import com.lowagie.text.html.HtmlEncoder;
+
/**
* Lightweight runnable to discover dynamic 'one way' group URL services
*
+ * as of Jalview 2.8.1 this class is mothballed and will be dropped in v3.
+ *
* @author JimP
+ * @deprecated
*
*/
public class EnfinEnvision2OneWay extends DefaultHandler implements
@@ -140,18 +144,22 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements
System.err.println("Adding entry for " + wfname + " " + description);
if (wfname.toLowerCase().indexOf("funcnet") == -1)
{
+ description = Pattern.compile("\\s+", Pattern.MULTILINE)
+ .matcher(description).replaceAll(" ");
groupURLdescr.addElement(description);
groupURLdescr.addElement(description);
- String urlstub=wfname;
- if (wfname.indexOf(" ")>-1)
+ String urlstub = wfname;
+ if (wfname.indexOf(" ") > -1)
{
- // make the name safe!
- try {
- urlstub = URLEncoder.encode(wfname,"utf-8");
- } catch (UnsupportedEncodingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ // make the name safe!
+ try
+ {
+ urlstub = URLEncoder.encode(wfname, "utf-8");
+ } catch (UnsupportedEncodingException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
groupURLLinks
.addElement(wfname
@@ -310,6 +318,14 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements
return;
}
}
+ try
+ {
+ descr = HtmlEncoder.encode(descr);
+ } catch (Exception e)
+ {
+ }
+ ;
+
boolean seqsorids = (urlgenerator.getGroupURLType() & urlgenerator.SEQUENCEIDS) == 0;
int i = urlgenerator.getNumberInvolved(urlstub);
JMenuItem item = new JMenuItem(label);