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-3070 pull up generic methods for an automatic alignment analysis web service...
[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
a2038f0
..
501e93d
100644
(file)
--- a/
src/jalview/ws/jws2/SequenceAnnotationWSClient.java
+++ b/
src/jalview/ws/jws2/SequenceAnnotationWSClient.java
@@
-26,8
+26,7
@@
import jalview.gui.Desktop;
import jalview.gui.JvSwingUtils;
import jalview.util.MessageManager;
import jalview.ws.api.ServiceWithParameters;
import jalview.gui.JvSwingUtils;
import jalview.util.MessageManager;
import jalview.ws.api.ServiceWithParameters;
-import jalview.ws.jws2.dm.AAConSettings;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.AutoCalcSetting;
import jalview.ws.params.WsParamSetI;
import jalview.ws.uimodel.AlignAnalysisUIText;
import jalview.ws.params.WsParamSetI;
import jalview.ws.uimodel.AlignAnalysisUIText;
@@
-153,7
+152,7
@@
public class SequenceAnnotationWSClient extends Jws2Client
}
}
}
}
- public SequenceAnnotationWSClient(AAConSettings fave,
+ public SequenceAnnotationWSClient(AutoCalcSetting fave,
AlignFrame alignFrame, boolean b)
{
super(alignFrame, fave.getPreset(), fave.getArgumentSet());
AlignFrame alignFrame, boolean b)
{
super(alignFrame, fave.getPreset(), fave.getArgumentSet());
@@
-172,8
+171,8
@@
public class SequenceAnnotationWSClient extends Jws2Client
final ServiceWithParameters service,
final AlignFrame alignFrame)
{
final ServiceWithParameters service,
final AlignFrame alignFrame)
{
- if (service instanceof Jws2Instance
- && Jws2ClientFactory.registerAAConWSInstance(wsmenu, (Jws2Instance) service, alignFrame))
+ if (Jws2ClientFactory.registerAAConWSInstance(wsmenu,
+ service, alignFrame))
{
// Alignment dependent analysis calculation WS gui
return;
{
// Alignment dependent analysis calculation WS gui
return;