JAL-1807 explicit imports (jalview.ws.*)
[jalview.git] / src / jalview / ws / rest / params / Alignment.java
index 28f2628..626005a 100644 (file)
@@ -21,6 +21,7 @@
 package jalview.ws.rest.params;
 
 import jalview.datamodel.AlignmentI;
+import jalview.io.FormatAdapter;
 import jalview.ws.params.OptionI;
 import jalview.ws.params.simple.BooleanOption;
 import jalview.ws.params.simple.Option;
@@ -80,7 +81,7 @@ public class Alignment extends InputType
         PrintWriter pw = new PrintWriter(
                 new OutputStreamWriter(new BufferedOutputStream(
                         new FileOutputStream(fa)), "UTF-8"));
-        pw.append(new jalview.io.FormatAdapter().formatSequences(format,
+        pw.append(new FormatAdapter().formatSequences(format,
                 alignment, jvsuffix));
         pw.close();
         return new FileBody(fa, "text/plain");
@@ -92,7 +93,7 @@ public class Alignment extends InputType
     }
     else
     {
-      jalview.io.FormatAdapter fa = new jalview.io.FormatAdapter();
+      FormatAdapter fa = new FormatAdapter();
       fa.setNewlineString("\r\n");
       return new StringBody(
               (fa.formatSequences(format, alignment, jvsuffix)));
@@ -148,7 +149,7 @@ public class Alignment extends InputType
 
     if (tok.startsWith("format"))
     {
-      for (String fmt : jalview.io.FormatAdapter.WRITEABLE_FORMATS)
+      for (String fmt : FormatAdapter.WRITEABLE_FORMATS)
       {
         if (val.equalsIgnoreCase(fmt))
         {
@@ -158,7 +159,7 @@ public class Alignment extends InputType
       }
       warnings.append("Invalid alignment format '" + val
               + "'. Must be one of (");
-      for (String fmt : jalview.io.FormatAdapter.WRITEABLE_FORMATS)
+      for (String fmt : FormatAdapter.WRITEABLE_FORMATS)
       {
         warnings.append(" " + fmt);
       }
@@ -197,7 +198,7 @@ public class Alignment extends InputType
 
     lst.add(new Option("format", "Alignment upload format", true, "FASTA",
             format, Arrays
-                    .asList(jalview.io.FormatAdapter.WRITEABLE_FORMATS),
+                    .asList(FormatAdapter.WRITEABLE_FORMATS),
             null));
     lst.add(createMolTypeOption("type", "Sequence type", false, type, null));