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

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

diff --git a/src/jalview/ws/rest/RestServiceDescription.java b/src/jalview/ws/rest/RestServiceDescription.java
index e7c861f..896a230 100644 (file)
--- a/src/jalview/ws/rest/RestServiceDescription.java
+++ b/src/jalview/ws/rest/RestServiceDescription.java
@@ -20,6 +20,16 @@
  */
 package jalview.ws.rest;
 
+import jalview.datamodel.SequenceI;
+import jalview.io.packed.DataProvider.JvDataType;
+import jalview.util.StringUtils;
+import jalview.ws.rest.params.Alignment;
+import jalview.ws.rest.params.AnnotationFile;
+import jalview.ws.rest.params.SeqGroupIndexVector;
+import jalview.ws.rest.params.SeqIdVector;
+import jalview.ws.rest.params.SeqVector;
+import jalview.ws.rest.params.Tree;
+
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,13 +41,6 @@ import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jalview.datamodel.SequenceI;
-import jalview.io.packed.DataProvider.JvDataType;
-import jalview.util.StringUtils;
-import jalview.ws.rest.params.Alignment;
-import jalview.ws.rest.params.AnnotationFile;
-import jalview.ws.rest.params.SeqGroupIndexVector;
-
 public class RestServiceDescription
 {
   private static final Pattern PARAM_ENCODED_URL_PATTERN = Pattern.compile("([?&])([A-Za-z0-9_]+)=\\$([^$]+)\\$");
@@ -705,12 +708,9 @@ public class RestServiceDescription
   {
     // TODO - find a better way of maintaining this classlist
     return new Class[]
-    { jalview.ws.rest.params.Alignment.class,
-        jalview.ws.rest.params.AnnotationFile.class,
+    { Alignment.class, AnnotationFile.class,
         SeqGroupIndexVector.class,
-        jalview.ws.rest.params.SeqIdVector.class,
-        jalview.ws.rest.params.SeqVector.class,
-        jalview.ws.rest.params.Tree.class };
+        SeqIdVector.class, SeqVector.class, Tree.class };
   }
 
   public static boolean parseTypeString(String fullstring, String tok,