X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FEnfinEnvision2OneWay.java;h=d2e55c4dc2985e62db2064c08207f044fc14a7c9;hb=2b34ad8d6c224117ca2a3199c237fd74d8137da6;hp=0d5dfb3950552e63d9c37c44a978af744958227f;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git
diff --git a/src/jalview/ws/EnfinEnvision2OneWay.java b/src/jalview/ws/EnfinEnvision2OneWay.java
index 0d5dfb3..d2e55c4 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.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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;
@@ -25,25 +28,15 @@ 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;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLEncoder;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
import java.util.Hashtable;
import java.util.Map;
import java.util.Vector;
@@ -57,9 +50,6 @@ import javax.swing.event.MenuListener;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.axis.utils.StringUtils;
-import org.apache.http.client.utils.URLEncodedUtils;
-import org.apache.http.entity.StringEntity;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -69,7 +59,10 @@ 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
@@ -342,12 +335,7 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements
{
dbname = "";
}
- item.setToolTipText(""
- + JvSwingUtils.wrapTooltip("Submit " + i + " " + dbname + " "
- + (seqsorids ? "sequence" : "sequence id")
- + (i > 1 ? "s" : "")
-
- + " to
" + descr) + "");
+ item.setToolTipText(JvSwingUtils.wrapTooltip(MessageManager.formatMessage("label.submit_sequence", new String[]{Integer.valueOf(i).toString(), dbname, (seqsorids ? "sequence" : "sequence id"), (i > 1 ? "s" : "")})));
item.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -449,7 +437,7 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements
// menu appears asap
// sequence only URLs
// ID/regex match URLs
- JMenu groupLinksMenu = new JMenu("Group Link");
+ JMenu groupLinksMenu = new JMenu(MessageManager.getString("action.group_link"));
String[][] idandseqs = GroupUrlLink.formStrings(seqs);
Hashtable commonDbrefs = new Hashtable();
for (int sq = 0; sq < seqs.length; sq++)
@@ -548,8 +536,8 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements
// three types of url that might be
// created.
wflinkMenus = new JMenu[]
- { null, new JMenu("IDS"), new JMenu("Sequences"),
- new JMenu("IDS and Sequences") };
+ { null, new JMenu(MessageManager.getString("action.ids")), new JMenu(MessageManager.getString("action.sequences")),
+ new JMenu(MessageManager.getString("action.ids_sequences")) };
gurlMenus.put(label, wflinkMenus);
}