JAL-3878 Move WebServiceJob class to jalview.ws2.api package

diff --git a/src/jalview/ws2/actions/api/TaskEventListener.java b/src/jalview/ws2/actions/api/TaskEventListener.java
index f7bee07..3dda2a4 100644 (file)
--- a/src/jalview/ws2/actions/api/TaskEventListener.java
+++ b/src/jalview/ws2/actions/api/TaskEventListener.java
@@ -3,7 +3,7 @@ package jalview.ws2.actions.api;
 import java.util.List;
 
 import jalview.ws2.api.JobStatus;
-import jalview.ws2.client.api.WebServiceJob;
+import jalview.ws2.api.WebServiceJob;
 
 /**
  * The listener interface for receiving relevant job progress and state change

diff --git a/src/jalview/ws2/actions/api/TaskI.java b/src/jalview/ws2/actions/api/TaskI.java
index 3a3fcbb..cd83604 100644 (file)
--- a/src/jalview/ws2/actions/api/TaskI.java
+++ b/src/jalview/ws2/actions/api/TaskI.java
@@ -4,7 +4,7 @@ import java.util.List;
 
 import jalview.viewmodel.AlignmentViewport;
 import jalview.ws2.api.JobStatus;
-import jalview.ws2.client.api.WebServiceJob;
+import jalview.ws2.api.WebServiceJob;
 
 /**
  * {@code TaskI} objects represent running services. Tasks are created by

diff --git a/src/jalview/ws2/client/api/WebServiceJob.java b/src/jalview/ws2/api/WebServiceJob.java
similarity index 98%
rename from src/jalview/ws2/client/api/WebServiceJob.java
rename to src/jalview/ws2/api/WebServiceJob.java
index 32fccec..79fda55 100644 (file)
--- a/src/jalview/ws2/client/api/WebServiceJob.java
+++ b/src/jalview/ws2/api/WebServiceJob.java
@@ -1,11 +1,10 @@
-package jalview.ws2.client.api;
+package jalview.ws2.api;
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.util.Date;
 
 import jalview.util.MathUtils;
-import jalview.ws2.api.JobStatus;
 
 /**
  * {@code WebServiceJob} represents a job running on a remote server. The object

diff --git a/src/jalview/ws2/client/api/WebServiceClientI.java b/src/jalview/ws2/client/api/WebServiceClientI.java
index ffc51e6..f788442 100644 (file)
--- a/src/jalview/ws2/client/api/WebServiceClientI.java
+++ b/src/jalview/ws2/client/api/WebServiceClientI.java
@@ -6,6 +6,7 @@ import java.util.List;
 import jalview.datamodel.SequenceI;
 import jalview.ws.params.ArgumentI;
 import jalview.ws2.api.Credentials;
+import jalview.ws2.api.WebServiceJob;
 
 public interface WebServiceClientI
 {