From fe415104adab0df59212ad96547513be98d2ee3b Mon Sep 17 00:00:00 2001
From: Mateusz Warowny <mmzwarowny@dundee.ac.uk>
Date: Fri, 12 Feb 2021 12:26:20 +0100
Subject: [PATCH] JAL-3807 - Move new JPred client to the jws2 package.

---
 src/jalview/ws/api/ServiceWithParameters.java |    2 +-
 src/jalview/ws/{ => jws2}/JPredClient.java    |    4 +++-
 src/jalview/ws/{ => jws2}/JPredThread.java    |    6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)
 rename src/jalview/ws/{ => jws2}/JPredClient.java (95%)
 rename src/jalview/ws/{ => jws2}/JPredThread.java (98%)

diff --git a/src/jalview/ws/api/ServiceWithParameters.java b/src/jalview/ws/api/ServiceWithParameters.java
index d875fd7..4239afb 100644
--- a/src/jalview/ws/api/ServiceWithParameters.java
+++ b/src/jalview/ws/api/ServiceWithParameters.java
@@ -2,7 +2,7 @@ package jalview.ws.api;
 
 import jalview.bin.Cache;
 import jalview.gui.AlignFrame;
-import jalview.ws.JPredClient;
+import jalview.ws.jws2.JPredClient;
 import jalview.ws.jws2.MsaWSClient;
 import jalview.ws.jws2.SequenceAnnotationWSClient;
 import jalview.ws.params.ParamManager;
diff --git a/src/jalview/ws/JPredClient.java b/src/jalview/ws/jws2/JPredClient.java
similarity index 95%
rename from src/jalview/ws/JPredClient.java
rename to src/jalview/ws/jws2/JPredClient.java
index f431a0c..68bcb6c 100644
--- a/src/jalview/ws/JPredClient.java
+++ b/src/jalview/ws/jws2/JPredClient.java
@@ -1,4 +1,4 @@
-package jalview.ws;
+package jalview.ws.jws2;
 
 import javax.swing.JMenuItem;
 
@@ -7,6 +7,8 @@ import jalview.bin.Cache;
 import jalview.datamodel.AlignmentView;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
+import jalview.ws.WSClient;
+import jalview.ws.WSMenuEntryProviderI;
 import jalview.ws.api.JPredMutlipleAlignmentServiceI;
 import jalview.ws.api.ServiceWithParameters;
 
diff --git a/src/jalview/ws/JPredThread.java b/src/jalview/ws/jws2/JPredThread.java
similarity index 98%
rename from src/jalview/ws/JPredThread.java
rename to src/jalview/ws/jws2/JPredThread.java
index 215ae4d..087e9d4 100644
--- a/src/jalview/ws/JPredThread.java
+++ b/src/jalview/ws/jws2/JPredThread.java
@@ -1,4 +1,4 @@
-package jalview.ws;
+package jalview.ws.jws2;
 
 import static java.lang.String.format;
 
@@ -19,6 +19,10 @@ import jalview.gui.WebserviceInfo;
 import jalview.io.JPredFile;
 import jalview.io.JnetAnnotationMaker;
 import jalview.util.MessageManager;
+import jalview.ws.AWSThread;
+import jalview.ws.AWsJob;
+import jalview.ws.JobStateSummary;
+import jalview.ws.WSClientI;
 import jalview.ws.api.CancellableI;
 import jalview.ws.api.JPredMutlipleAlignmentServiceI;
 import jalview.ws.gui.WsJob;
-- 
1.7.10.2