From 37240f53a6a08896010f3da739ed6b1f5ecccb3e Mon Sep 17 00:00:00 2001 From: kjvdheide Date: Thu, 1 Feb 2018 17:16:01 +0000 Subject: [PATCH] JAL-2890 made CiClient static (as it should be) and added dummy umbrella clients --- src/jalview/ext/cipres/TreeJob.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/jalview/ext/cipres/TreeJob.java b/src/jalview/ext/cipres/TreeJob.java index 5977a67..345279b 100644 --- a/src/jalview/ext/cipres/TreeJob.java +++ b/src/jalview/ext/cipres/TreeJob.java @@ -14,9 +14,12 @@ import org.ngbw.restdatatypes.ParamError; public class TreeJob { - private final CiClient cipresClient; + private final static CiApplication app = CiApplication.getInstance(); - private final CiApplication app = CiApplication.getInstance(); + private final static CiClient cipresClient = new CiClient( + app.getAppKey(), app.getUsername(), app.getPassword(), + app.getRestUrl() + ); private CiJob submittedJob; @@ -30,13 +33,13 @@ public class TreeJob private boolean paramsValidated = false; + // Clients for umbrella application, not currently in use. + private static CiClient adminClient; + + private CiClient userClient; + public TreeJob() { - cipresClient = new CiClient( - app.getAppKey(), app.getUsername(), app.getPassword(), - app.getRestUrl() - ); - } public TreeJob(String alignmentFilePath) -- 1.7.10.2