JAL-2890 renamed cipres job to query builder

diff --git a/src/jalview/ext/cipres/CipresJob.java b/src/jalview/ext/cipres/CipresQueryBuilder.java
similarity index 96%
rename from src/jalview/ext/cipres/CipresJob.java
rename to src/jalview/ext/cipres/CipresQueryBuilder.java
index 668a83c..baa36d9 100644 (file)
--- a/src/jalview/ext/cipres/CipresJob.java
+++ b/src/jalview/ext/cipres/CipresQueryBuilder.java
@@ -11,7 +11,7 @@ import org.ngbw.directclient.CiJob;
 import org.ngbw.restdatatypes.ErrorData;
 import org.ngbw.restdatatypes.ParamError;
 
-public class CipresJob
+public class CipresQueryBuilder
 {
 
   private final static CiApplication app = CiApplication.getInstance();
@@ -38,17 +38,17 @@ public class CipresJob
 
   private static CiClient userClient;
 
-  public CipresJob()
+  public CipresQueryBuilder()
   {
   }
 
-  public CipresJob(String alignmentFilePath)
+  public CipresQueryBuilder(String alignmentFilePath)
   {
     this();
     inputParams.put("infile_", alignmentFilePath);
   }
 
-  public CipresJob(String alignmentFilePath, String toolName)
+  public CipresQueryBuilder(String alignmentFilePath, String toolName)
   {
     this(alignmentFilePath);
     tool = toolName;

diff --git a/test/jalview/ext/cipres/CipresJobTest.java b/test/jalview/ext/cipres/CipresQueryBuilderTest.java
similarity index 83%
rename from test/jalview/ext/cipres/CipresJobTest.java
rename to test/jalview/ext/cipres/CipresQueryBuilderTest.java
index 8146607..20d7081 100644 (file)
--- a/test/jalview/ext/cipres/CipresJobTest.java
+++ b/test/jalview/ext/cipres/CipresQueryBuilderTest.java
@@ -11,7 +11,7 @@ import java.util.Arrays;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-public class CipresJobTest
+public class CipresQueryBuilderTest
 {
   @BeforeClass(
     alwaysRun = true
@@ -27,7 +27,7 @@ public class CipresJobTest
   )
   public void testSettingJobParameters()
   {
-    CipresJob testJob = new CipresJob("examples/plantfdx.fa");
+    CipresQueryBuilder testJob = new CipresQueryBuilder("examples/plantfdx.fa");
     testJob.addToolParameters("runtime_", Arrays.asList("0.3"));
     testJob.addInputParameter("test", "hoi");
     testJob.addMetadata("hennepin", "crawler");
@@ -45,7 +45,7 @@ public class CipresJobTest
   )
   public void testValidatingParameters()
   {
-    CipresJob testJob = new CipresJob("examples/plantfdx.fa", "CLUSTALW");
+    CipresQueryBuilder testJob = new CipresQueryBuilder("examples/plantfdx.fa", "CLUSTALW");
     testJob.addToolParameters("runtime_", Arrays.asList("0.2"));
     testJob.addMetadata("clientJobId", "101");
     testJob.validateJobParams();
@@ -59,7 +59,7 @@ public class CipresJobTest
   )
   public void testJobSubmission()
   {
-    CipresJob testJob = new CipresJob("examples/plantfdx.fa", "CLUSTALW");
+    CipresQueryBuilder testJob = new CipresQueryBuilder("examples/plantfdx.fa", "CLUSTALW");
     testJob.addToolParameters("runtime_", Arrays.asList("0.2"));
     testJob.addMetadata("clientJobId", "102");
     testJob.addMetadata("statusEmail", "false");