Revert "Merge branch 'bug/JAL-3807_jpred-with-slivka' into alpha/JAL-3066_Jalview_212...

[jalview.git] / src / jalview / io / packed / ParsePackedSet.java

diff --git a/src/jalview/io/packed/ParsePackedSet.java b/src/jalview/io/packed/ParsePackedSet.java
index 1635682..2b95081 100644 (file)
--- a/src/jalview/io/packed/ParsePackedSet.java
+++ b/src/jalview/io/packed/ParsePackedSet.java
@@ -20,7 +20,12 @@
  */
 package jalview.io.packed;
 
-import jalview.api.FeatureColourI;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 import jalview.datamodel.AlignmentI;
 import jalview.io.AppletFormatAdapter;
 import jalview.io.FileFormatI;
@@ -29,12 +34,6 @@ import jalview.io.FormatAdapter;
 import jalview.io.IdentifyFile;
 import jalview.io.packed.DataProvider.JvDataType;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
 public class ParsePackedSet
 {
 
@@ -52,7 +51,7 @@ public class ParsePackedSet
   public Object[] getAlignment(JalviewDataset context,
           Iterable<DataProvider> files) throws Exception
   {
-    List<Object> rslt = new ArrayList<Object>();
+    List<Object> rslt = new ArrayList<>();
     if (context == null)
     {
       context = new JalviewDataset();
@@ -151,7 +150,7 @@ public class ParsePackedSet
         // if not, create one.
         if (context.featureColours == null)
         {
-          context.featureColours = new HashMap<String, FeatureColourI>();
+          context.featureColours = new HashMap<>();
         }
         try
         {
@@ -223,12 +222,13 @@ public class ParsePackedSet
    * would be created.
    * 
    * @param args
+   * @j2sIgnore
    */
   public static void main(String args[])
   {
     // make data providers from the set of keys/files
     int i = 0;
-    List<DataProvider> dp = new ArrayList<DataProvider>();
+    List<DataProvider> dp = new ArrayList<>();
     while ((i + 1) < args.length)
     {
       String type = args[i++];