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-3066 JAL-3070 pull up non-jabaws specific service descriptor components for annot...
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
jabaws2
/
JabawsAnnotationInstance.java
diff --git
a/src/jalview/ws/jws2/jabaws2/JabawsAnnotationInstance.java
b/src/jalview/ws/jws2/jabaws2/JabawsAnnotationInstance.java
index
8acf64f
..
e7f3022
100644
(file)
--- a/
src/jalview/ws/jws2/jabaws2/JabawsAnnotationInstance.java
+++ b/
src/jalview/ws/jws2/jabaws2/JabawsAnnotationInstance.java
@@
-8,9
+8,9
@@
import jalview.util.MessageManager;
import jalview.ws.api.JobId;
import jalview.ws.api.SequenceAnnotationServiceI;
import jalview.ws.gui.AnnotationWsJob;
import jalview.ws.api.JobId;
import jalview.ws.api.SequenceAnnotationServiceI;
import jalview.ws.gui.AnnotationWsJob;
-import jalview.ws.jws2.SeqAnnotationServiceCalcWorker;
import jalview.ws.jws2.JabaParamStore;
import jalview.ws.jws2.JabaPreset;
import jalview.ws.jws2.JabaParamStore;
import jalview.ws.jws2.JabaPreset;
+import jalview.ws.jws2.SeqAnnotationServiceCalcWorker;
import jalview.ws.params.ArgumentI;
import jalview.ws.params.WsParamSetI;
import jalview.ws.params.ArgumentI;
import jalview.ws.params.WsParamSetI;
@@
-50,7
+50,8
@@
public abstract class JabawsAnnotationInstance
*/
public String getCalcId()
{
*/
public String getCalcId()
{
- return our.aaui == null ? null : our.aaui.getCalcId();
+ return our.getAlignAnalysisUI() == null ? null
+ : our.getAlignAnalysisUI().getCalcId();
}
@Override
}
@Override