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
Update annotation operation WIP
[jalview.git]
/
src
/
jalview
/
ws2
/
operations
/
AnnotationOperation.java
diff --git
a/src/jalview/ws2/operations/AnnotationOperation.java
b/src/jalview/ws2/operations/AnnotationOperation.java
index
eeb51ef
..
6e887f9
100644
(file)
--- a/
src/jalview/ws2/operations/AnnotationOperation.java
+++ b/
src/jalview/ws2/operations/AnnotationOperation.java
@@
-11,6
+11,7
@@
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import jalview.bin.Cache;
import javax.swing.JMenuItem;
import jalview.bin.Cache;
+import jalview.datamodel.AlignmentAnnotation;
import jalview.gui.AlignFrame;
import jalview.gui.WsJobParameters;
import jalview.io.AnnotationFile;
import jalview.gui.AlignFrame;
import jalview.gui.WsJobParameters;
import jalview.io.AnnotationFile;
@@
-41,12
+42,12
@@
public class AnnotationOperation implements Operation
final String typeName;
final String typeName;
- final ResultSupplier<AnnotationFile> annotationSupplier;
+ final ResultSupplier<List<AlignmentAnnotation>> annotationSupplier;
final ResultSupplier<FeaturesFile> featuresSupplier;
public AnnotationOperation(WebServiceI service,
final ResultSupplier<FeaturesFile> featuresSupplier;
public AnnotationOperation(WebServiceI service,
- ResultSupplier<AnnotationFile> annotSupplier,
+ ResultSupplier<List<AlignmentAnnotation>> annotSupplier,
ResultSupplier<FeaturesFile> featSupplier, String operationName)
{
this.service = service;
ResultSupplier<FeaturesFile> featSupplier, String operationName)
{
this.service = service;