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-98 simplified repeat() method
[jalview.git]
/
src
/
jalview
/
ws
/
jws1
/
SeqSearchWSClient.java
diff --git
a/src/jalview/ws/jws1/SeqSearchWSClient.java
b/src/jalview/ws/jws1/SeqSearchWSClient.java
index
9fd2be0
..
7665fec
100644
(file)
--- a/
src/jalview/ws/jws1/SeqSearchWSClient.java
+++ b/
src/jalview/ws/jws1/SeqSearchWSClient.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * 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.
*
@@
-20,7
+20,7
@@
*/
package jalview.ws.jws1;
*/
package jalview.ws.jws1;
-import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentI;
import jalview.datamodel.AlignmentView;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
import jalview.datamodel.AlignmentView;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
@@
-39,7
+39,6
@@
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
-import ext.vamsas.SeqSearchI;
import ext.vamsas.SeqSearchServiceLocator;
import ext.vamsas.SeqSearchServiceSoapBindingStub;
import ext.vamsas.ServiceHandle;
import ext.vamsas.SeqSearchServiceLocator;
import ext.vamsas.SeqSearchServiceSoapBindingStub;
import ext.vamsas.ServiceHandle;
@@
-77,7
+76,7
@@
public class SeqSearchWSClient extends WS1Client
public SeqSearchWSClient(ext.vamsas.ServiceHandle sh, String altitle,
jalview.datamodel.AlignmentView msa, String db,
public SeqSearchWSClient(ext.vamsas.ServiceHandle sh, String altitle,
jalview.datamodel.AlignmentView msa, String db,
- Alignment seqdataset, AlignFrame _alignFrame)
+ AlignmentI seqdataset, AlignFrame _alignFrame)
{
super();
alignFrame = _alignFrame;
{
super();
alignFrame = _alignFrame;
@@
-128,7
+127,7
@@
public class SeqSearchWSClient extends WS1Client
}
private void startSeqSearchClient(String altitle, AlignmentView msa,
}
private void startSeqSearchClient(String altitle, AlignmentView msa,
- String db, Alignment seqdataset)
+ String db, AlignmentI seqdataset)
{
if (!locateWebService())
{
{
if (!locateWebService())
{
@@
-173,8
+172,7
@@
public class SeqSearchWSClient extends WS1Client
try
{
try
{
- this.server = (SeqSearchI) loc.getSeqSearchService(new java.net.URL(
- WsURL));
+ this.server = loc.getSeqSearchService(new java.net.URL(WsURL));
((SeqSearchServiceSoapBindingStub) this.server).setTimeout(60000); // One
// minute
// timeout
((SeqSearchServiceSoapBindingStub) this.server).setTimeout(60000); // One
// minute
// timeout
@@
-241,6
+239,7
@@
public class SeqSearchWSClient extends WS1Client
return dbs;
}
return dbs;
}
+ @Override
public void attachWSMenuEntry(JMenu wsmenu, final ServiceHandle sh,
final AlignFrame af)
{
public void attachWSMenuEntry(JMenu wsmenu, final ServiceHandle sh,
final AlignFrame af)
{
@@
-281,6
+280,7
@@
public class SeqSearchWSClient extends WS1Client
method.setToolTipText(sh.getEndpointURL());
method.addActionListener(new ActionListener()
{
method.setToolTipText(sh.getEndpointURL());
method.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
// use same input gatherer as for secondary structure prediction
public void actionPerformed(ActionEvent e)
{
// use same input gatherer as for secondary structure prediction
@@
-305,6
+305,7
@@
public class SeqSearchWSClient extends WS1Client
final String searchdb = dbs[db];
method.addActionListener(new ActionListener()
{
final String searchdb = dbs[db];
method.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
AlignmentView msa = af.gatherSeqOrMsaForSecStrPrediction();
public void actionPerformed(ActionEvent e)
{
AlignmentView msa = af.gatherSeqOrMsaForSecStrPrediction();