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
JAL-2136 JAL-2137 Modified STRUCTMODEL annotation format and added implementation...
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
SequenceAnnotationWSClient.java
diff --git
a/src/jalview/ws/jws2/SequenceAnnotationWSClient.java
b/src/jalview/ws/jws2/SequenceAnnotationWSClient.java
index
75cb678
..
4702686
100644
(file)
--- a/
src/jalview/ws/jws2/SequenceAnnotationWSClient.java
+++ b/
src/jalview/ws/jws2/SequenceAnnotationWSClient.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-67,9
+67,9
@@
public class SequenceAnnotationWSClient extends Jws2Client
// dan changed! dan test. comment out if conditional
// if (alignFrame.getViewport().getAlignment().isNucleotide())
// {
// dan changed! dan test. comment out if conditional
// if (alignFrame.getViewport().getAlignment().isNucleotide())
// {
- // JOptionPane.showMessageDialog(Desktop.desktop, sh.serviceType
+ // JvOptionPane.showMessageDialog(Desktop.desktop, sh.serviceType
// + " can only be used\nfor amino acid alignments.",
// + " can only be used\nfor amino acid alignments.",
- // "Wrong type of sequences!", JOptionPane.WARNING_MESSAGE);
+ // "Wrong type of sequences!", JvOptionPane.WARNING_MESSAGE);
// return;
//
// }
// return;
//
// }
@@
-122,7
+122,7
@@
public class SequenceAnnotationWSClient extends Jws2Client
}
// reinstate worker if it was blacklisted (might have happened due to
// invalid parameters)
}
// reinstate worker if it was blacklisted (might have happened due to
// invalid parameters)
- alignFrame.getViewport().getCalcManager().workerMayRun(worker);
+ alignFrame.getViewport().getCalcManager().enableWorker(worker);
worker.updateParameters(this.preset, paramset);
}
}
worker.updateParameters(this.preset, paramset);
}
}