git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
todo and ensure old annotation/groups are removed before new ones loaded back
[jalview.git]
/
src
/
jalview
/
ws
/
EnfinEnvision2OneWay.java
diff --git
a/src/jalview/ws/EnfinEnvision2OneWay.java
b/src/jalview/ws/EnfinEnvision2OneWay.java
index
3cb62c1
..
6a9371b
100644
(file)
--- 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.
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
@@
-284,7
+284,8
@@
public class EnfinEnvision2OneWay extends DefaultHandler implements
* Object array returned from the makeUrlStubs function.
*/
private void addshowLink(JMenu linkMenu, String label, String descr,
* Object array returned from the makeUrlStubs function.
*/
private void addshowLink(JMenu linkMenu, String label, String descr,
- String dbname, final GroupUrlLink urlgenerator, final Object[] urlstub)
+ String dbname, final GroupUrlLink urlgenerator,
+ final Object[] urlstub)
{
Component[] jmi = linkMenu.getMenuComponents();
for (int i = 0; i < jmi.length; i++)
{
Component[] jmi = linkMenu.getMenuComponents();
for (int i = 0; i < jmi.length; i++)
@@
-299,17
+300,17
@@
public class EnfinEnvision2OneWay extends DefaultHandler implements
boolean seqsorids = (urlgenerator.getGroupURLType() & urlgenerator.SEQUENCEIDS) == 0;
int i = urlgenerator.getNumberInvolved(urlstub);
JMenuItem item = new JMenuItem(label);
boolean seqsorids = (urlgenerator.getGroupURLType() & urlgenerator.SEQUENCEIDS) == 0;
int i = urlgenerator.getNumberInvolved(urlstub);
JMenuItem item = new JMenuItem(label);
- //
- if (dbname==null || dbname.trim().length()==0)
+ //
+ if (dbname == null || dbname.trim().length() == 0)
{
dbname = "";
}
item.setToolTipText("<html>"
{
dbname = "";
}
item.setToolTipText("<html>"
- + JvSwingUtils.wrapTooltip("Submit " + i + " " +
- dbname +" "
- + (seqsorids ? "sequence" : "sequence id") + (i > 1 ? "s" : "")
-
- + " to<br/>" + descr) + "</html>");
+ + JvSwingUtils.wrapTooltip("Submit " + i + " " + dbname + " "
+ + (seqsorids ? "sequence" : "sequence id")
+ + (i > 1 ? "s" : "")
+
+ + " to<br/>" + descr) + "</html>");
item.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
item.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@
-319,7
+320,8
@@
public class EnfinEnvision2OneWay extends DefaultHandler implements
public void run()
{
public void run()
{
- try {
+ try
+ {
showLink(urlgenerator.constructFrom(urlstub));
} catch (UrlStringTooLongException ex)
{
showLink(urlgenerator.constructFrom(urlstub));
} catch (UrlStringTooLongException ex)
{
@@
-404,7
+406,8
@@
public class EnfinEnvision2OneWay extends DefaultHandler implements
*/
private JMenu buildGroupURLMenu(SequenceI[] seqs, SequenceGroup sg)
{
*/
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
// TODO: usability: thread off the generation of group url content so root
// menu appears asap
// sequence only URLs
@@
-475,11
+478,12
@@
public class EnfinEnvision2OneWay extends DefaultHandler implements
/**
* last number of sequences where URL generation failed
*/
/**
* last number of sequences where URL generation failed
*/
- int[] nsqtype = new int[] { 0,0,0,0,0,0,0,0,0,0};
+ int[] nsqtype = new int[]
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
for (int i = 0; i < groupURLLinks.size(); i++)
{
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);
// boolean specialCase =
// additionalPar.elementAt(i).toString().equals(BACKGROUND);
@@
-526,7
+530,8
@@
public class EnfinEnvision2OneWay extends DefaultHandler implements
String[] allids = ((String[]) idset[1]);
seqstr = new String[numinput];
ids = new String[numinput];
String[] allids = ((String[]) idset[1]);
seqstr = new String[numinput];
ids = new String[numinput];
- if (nsqtype[urlLink.getGroupURLType()]>0 && numinput>=nsqtype[urlLink.getGroupURLType()])
+ if (nsqtype[urlLink.getGroupURLType()] > 0
+ && numinput >= nsqtype[urlLink.getGroupURLType()])
{
continue;
}
{
continue;
}
@@
-538,8
+543,10
@@
public class EnfinEnvision2OneWay extends DefaultHandler implements
seqstr[idcount++] = idandseqs[1][sq];
}
}
seqstr[idcount++] = idandseqs[1][sq];
}
}
- try {createAndAddLinks(wflinkMenus, false, urlLink, ltarget, null,
- descr, ids, seqstr);
+ try
+ {
+ createAndAddLinks(wflinkMenus, false, urlLink, ltarget, null,
+ descr, ids, seqstr);
} catch (UrlStringTooLongException ex)
{
nsqtype[urlLink.getGroupURLType()] = numinput;
} catch (UrlStringTooLongException ex)
{
nsqtype[urlLink.getGroupURLType()] = numinput;
@@
-549,14
+556,17
@@
public class EnfinEnvision2OneWay extends DefaultHandler implements
// also do names only.
seqstr = idandseqs[1];
ids = idandseqs[0];
// also do names only.
seqstr = idandseqs[1];
ids = idandseqs[0];
- if (nsqtype[urlLink.getGroupURLType()]>0 && idandseqs[0].length>=nsqtype[urlLink.getGroupURLType()])
+ if (nsqtype[urlLink.getGroupURLType()] > 0
+ && idandseqs[0].length >= nsqtype[urlLink.getGroupURLType()])
{
continue;
}
{
continue;
}
-
- try {createAndAddLinks(wflinkMenus, true, urlLink, "Any", null, descr,
- ids, seqstr);
- }catch (UrlStringTooLongException ex)
+
+ try
+ {
+ createAndAddLinks(wflinkMenus, true, urlLink, "Any", null, descr,
+ ids, seqstr);
+ } catch (UrlStringTooLongException ex)
{
nsqtype[urlLink.getGroupURLType()] = idandseqs[0].length;
}
{
nsqtype[urlLink.getGroupURLType()] = idandseqs[0].length;
}
@@
-589,7
+599,7
@@
public class EnfinEnvision2OneWay extends DefaultHandler implements
GroupUrlLink urlLink, String label, String ltarget, String descr,
String[] ids, String[] seqstr) throws UrlStringTooLongException
{
GroupUrlLink urlLink, String label, String ltarget, String descr,
String[] ids, String[] seqstr) throws UrlStringTooLongException
{
- Object[] urlset= urlLink.makeUrlStubs(ids, seqstr, "FromJalview"
+ Object[] urlset = urlLink.makeUrlStubs(ids, seqstr, "FromJalview"
+ System.currentTimeMillis(), false);
if (urlset != null)
+ System.currentTimeMillis(), false);
if (urlset != null)
@@
-614,6
+624,7
@@
public class EnfinEnvision2OneWay extends DefaultHandler implements
}
return false;
}
}
return false;
}
+
// / end of stuff copied from popupmenu
public void attachWSMenuEntry(final JMenu wsmenu,
final AlignFrame alignFrame)
// / end of stuff copied from popupmenu
public void attachWSMenuEntry(final JMenu wsmenu,
final AlignFrame alignFrame)
@@
-640,21
+651,24
@@
public class EnfinEnvision2OneWay extends DefaultHandler implements
public void menuSelected(MenuEvent e)
{
public void menuSelected(MenuEvent e)
{
- if (refresh)
+ if (refresh && !isRunning())
{
{
- new Thread(new Runnable() {
- public void run() {
- try
- {
- buildGroupLinkMenu(enfinServiceMenu, alignFrame);
- } catch (OutOfMemoryError ex)
+ new Thread(new Runnable()
{
{
- Cache.log.error(
- "Out of memory when calculating the Envision2 links.",
- ex);
- enfinServiceMenu.setEnabled(false);
- }
- }}).start();
+ public void run()
+ {
+ try
+ {
+ buildGroupLinkMenu(enfinServiceMenu, alignFrame);
+ } catch (OutOfMemoryError ex)
+ {
+ Cache.log
+ .error("Out of memory when calculating the Envision2 links.",
+ ex);
+ enfinServiceMenu.setEnabled(false);
+ }
+ }
+ }).start();
refresh = false;
}
}
refresh = false;
}
}