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
Jalview 2.6 source licence
[jalview.git]
/
src
/
jalview
/
ws
/
EnfinEnvision2OneWay.java
diff --git
a/src/jalview/ws/EnfinEnvision2OneWay.java
b/src/jalview/ws/EnfinEnvision2OneWay.java
index
b36956c
..
f40831c
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.
@@
-366,6
+366,10
@@
public class EnfinEnvision2OneWay extends DefaultHandler implements
private void buildGroupLinkMenu(JMenu enfinServiceMenu,
AlignFrame alignFrame)
{
private void buildGroupLinkMenu(JMenu enfinServiceMenu,
AlignFrame alignFrame)
{
+ if (running || !started)
+ {
+ return;
+ }
SequenceI[] seqs = alignFrame.getViewport().getSelectionAsNewSequence();
SequenceGroup sg = alignFrame.getViewport().getSelectionGroup();
if (sg == null)
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)
{
*/
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
@@
-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++)
{
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);
// boolean specialCase =
// additionalPar.elementAt(i).toString().equals(BACKGROUND);
@@
-636,7
+641,7
@@
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() {
{
new Thread(new Runnable() {
public void run() {