git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4988ed1
)
JAL-1601 Rename task class to SecStructPredMsaTask
author
Mateusz Warowny
<mmzwarowny@dundee.ac.uk>
Wed, 18 Oct 2023 12:02:01 +0000
(14:02 +0200)
committer
Mateusz Warowny
<mmzwarowny@dundee.ac.uk>
Wed, 18 Oct 2023 12:02:01 +0000
(14:02 +0200)
src/jalview/ws2/actions/secstructpred/SecStructPredAction.java
patch
|
blob
|
history
src/jalview/ws2/actions/secstructpred/SecStructPredMsaTask.java
[moved from
src/jalview/ws2/actions/secstructpred/SecStructPredTask.java
with 96% similarity]
patch
|
blob
|
history
test/jalview/ws2/actions/secstructpred/SecStructPredTaskTest.java
patch
|
blob
|
history
diff --git
a/src/jalview/ws2/actions/secstructpred/SecStructPredAction.java
b/src/jalview/ws2/actions/secstructpred/SecStructPredAction.java
index
a74965e
..
f625f79
100644
(file)
--- a/
src/jalview/ws2/actions/secstructpred/SecStructPredAction.java
+++ b/
src/jalview/ws2/actions/secstructpred/SecStructPredAction.java
@@
-44,10
+44,10
@@
public class SecStructPredAction extends BaseAction<AlignmentI>
client = builder.client;
}
client = builder.client;
}
- public SecStructPredTask createTask(AlignViewportI viewport,
+ public SecStructPredMsaTask createTask(AlignViewportI viewport,
List<ArgumentI> args, Credentials credentials)
{
List<ArgumentI> args, Credentials credentials)
{
- return new SecStructPredTask(client, args, credentials, viewport);
+ return new SecStructPredMsaTask(client, args, credentials, viewport);
}
@Override
}
@Override
diff --git
a/src/jalview/ws2/actions/secstructpred/SecStructPredTask.java
b/src/jalview/ws2/actions/secstructpred/SecStructPredMsaTask.java
similarity index 96%
rename from
src/jalview/ws2/actions/secstructpred/SecStructPredTask.java
rename to
src/jalview/ws2/actions/secstructpred/SecStructPredMsaTask.java
index
fb904a8
..
5067ff7
100644
(file)
--- a/
src/jalview/ws2/actions/secstructpred/SecStructPredTask.java
+++ b/
src/jalview/ws2/actions/secstructpred/SecStructPredMsaTask.java
@@
-28,8
+28,8
@@
import jalview.ws2.api.Credentials;
import jalview.ws2.api.JobStatus;
import jalview.ws2.client.api.SecStructPredWebServiceClientI;
import jalview.ws2.api.JobStatus;
import jalview.ws2.client.api.SecStructPredWebServiceClientI;
-public class SecStructPredTask
- extends BaseTask<SecStructPredTask.SecStructPredJob, AlignmentI>
+public class SecStructPredMsaTask
+ extends BaseTask<SecStructPredMsaTask.SecStructPredJob, AlignmentI>
{
private final SecStructPredWebServiceClientI client;
{
private final SecStructPredWebServiceClientI client;
@@
-39,7
+39,7
@@
public class SecStructPredTask
private final char gapChar;
private final char gapChar;
- SecStructPredTask(SecStructPredWebServiceClientI client,
+ SecStructPredMsaTask(SecStructPredWebServiceClientI client,
List<ArgumentI> args, Credentials credentials,
AlignViewportI viewport)
{
List<ArgumentI> args, Credentials credentials,
AlignViewportI viewport)
{
diff --git
a/test/jalview/ws2/actions/secstructpred/SecStructPredTaskTest.java
b/test/jalview/ws2/actions/secstructpred/SecStructPredTaskTest.java
index
f46fae2
..
3a79cd4
100644
(file)
--- a/
test/jalview/ws2/actions/secstructpred/SecStructPredTaskTest.java
+++ b/
test/jalview/ws2/actions/secstructpred/SecStructPredTaskTest.java
@@
-107,7
+107,7
@@
public class SecStructPredTaskTest
public void testPrepareJobs_checkInputSequences(AlignViewport viewport,
List<String> expectedInput) throws Exception
{
public void testPrepareJobs_checkInputSequences(AlignViewport viewport,
List<String> expectedInput) throws Exception
{
- var task = new SecStructPredTask(mockClient, List.of(), Credentials.empty(),
+ var task = new SecStructPredMsaTask(mockClient, List.of(), Credentials.empty(),
viewport);
var jobs = task.prepareJobs();
List<Matcher<? super SequenceI>> seqMatchers = new ArrayList<>(
viewport);
var jobs = task.prepareJobs();
List<Matcher<? super SequenceI>> seqMatchers = new ArrayList<>(