JAL-1807 explicit imports (jalview.ws.*)

[jalview.git] / src / jalview / ws / rest / RestJobThread.java

diff --git a/src/jalview/ws/rest/RestJobThread.java b/src/jalview/ws/rest/RestJobThread.java
index ee971f5..42f6922 100644 (file)
--- a/src/jalview/ws/rest/RestJobThread.java
+++ b/src/jalview/ws/rest/RestJobThread.java
@@ -30,6 +30,7 @@ import jalview.datamodel.ColumnSelection;
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
+import jalview.gui.AlignmentPanel;
 import jalview.gui.Desktop;
 import jalview.gui.PaintRefresher;
 import jalview.gui.WebserviceInfo;
@@ -174,9 +175,13 @@ public class RestJobThread extends AWSThread
   private String getStage(Stage stg)
   {
     if (stg == Stage.SUBMIT)
+    {
       return "submitting ";
+    }
     if (stg == Stage.POLL)
+    {
       return "checking status of ";
+    }
 
     return (" being confused about ");
   }
@@ -585,7 +590,7 @@ public class RestJobThread extends AWSThread
     /**
      * alignment panels derived from each alignment set returned by service.
      */
-    ArrayList<jalview.gui.AlignmentPanel> destPanels = new ArrayList<jalview.gui.AlignmentPanel>();
+    ArrayList<AlignmentPanel> destPanels = new ArrayList<AlignmentPanel>();
     /**
      * list of instructions for how to process each distinct alignment set
      * returned by the job set
@@ -610,7 +615,7 @@ public class RestJobThread extends AWSThread
     // total number of distinct alignment sets generated by job set.
     int numAlSets = 0, als = 0;
     List<AlignmentI> destAls = new ArrayList<AlignmentI>();
-    List<jalview.datamodel.ColumnSelection> destColsel = new ArrayList<jalview.datamodel.ColumnSelection>();
+    List<ColumnSelection> destColsel = new ArrayList<ColumnSelection>();
     List<List<NewickFile>> trees = new ArrayList<List<NewickFile>>();
 
     do
@@ -716,7 +721,7 @@ public class RestJobThread extends AWSThread
           RestJob rj = (RestJob) jobs[nrj];
           int contigs[] = input.getVisibleContigs();
           AlignmentI destAl = null;
-          jalview.datamodel.ColumnSelection destCs = null;
+          ColumnSelection destCs = null;
           // Resolve destAl for this data.
           if (als == 0 && rj.isInputContextModified())
           {
@@ -1035,8 +1040,7 @@ public class RestJobThread extends AWSThread
     /**
      * current pane being worked with
      */
-    jalview.gui.AlignmentPanel destPanel = restClient
-            .recoverAlignPanelForView();
+    AlignmentPanel destPanel = restClient.recoverAlignPanelForView();
     als = 0;
     for (AddDataTo action : resultDest)
     {