X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2Fpacked%2FParsePackedSet.java;h=ef231e5a4c0584e9b5bddd7b251a58c599ad30c8;hb=eb3e681d6e82ccdd5d312d1981dfb306e7f479f0;hp=71999f0639459e665854c9e77cf887e79935ffae;hpb=bf0d052fef43e9809b7170dbfd372b3ea116391b;p=jalview.git

diff --git a/src/jalview/io/packed/ParsePackedSet.java b/src/jalview/io/packed/ParsePackedSet.java
index 71999f0..ef231e5 100644
--- a/src/jalview/io/packed/ParsePackedSet.java
+++ b/src/jalview/io/packed/ParsePackedSet.java
@@ -20,9 +20,12 @@
  */
 package jalview.io.packed;
 
+import java.util.Locale;
+
 import jalview.api.FeatureColourI;
 import jalview.datamodel.AlignmentI;
 import jalview.io.AppletFormatAdapter;
+import jalview.io.FileFormatI;
 import jalview.io.FileParse;
 import jalview.io.FormatAdapter;
 import jalview.io.IdentifyFile;
@@ -51,7 +54,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();
@@ -64,7 +67,7 @@ public class ParsePackedSet
       FileParse src = dta.getDataSource();
       if (dta.getType().equals(DataProvider.JvDataType.ALIGNMENT))
       {
-        String fmt = null;
+        FileFormatI fmt = null;
         try
         {
           fmt = new IdentifyFile().identify(src, false);
@@ -76,32 +79,24 @@ public class ParsePackedSet
 
         if (fmt != null)
         {
-          if (!FormatAdapter.isValidIOFormat(fmt, false))
+          // parse the alignment
+          AlignmentI al = null;
+          try
+          {
+            al = new FormatAdapter().readFromFile(src, fmt);
+          } catch (Exception e)
           {
-            errmsg = fmt;
-            exerror = null;
+            errmsg = "Failed to parse alignment from result set";
+            exerror = e;
           }
-          else
+          if (al != null)
           {
-            // parse the alignment
-            AlignmentI al = null;
-            try
-            {
-              al = new FormatAdapter().readFromFile(src, fmt);
-            } catch (Exception e)
-            {
-              errmsg = "Failed to parse alignment from result set";
-              exerror = e;
-            }
-            if (al != null)
-            {
-              // deuniquify and construct/merge additional dataset entries if
-              // necessary.
-              context.addAlignment(al);
-              context.updateSetModified(true);
-              rslt.add(al);
-              deuniquify = true;
-            }
+            // deuniquify and construct/merge additional dataset entries if
+            // necessary.
+            context.addAlignment(al);
+            context.updateSetModified(true);
+            rslt.add(al);
+            deuniquify = true;
           }
         }
       }
@@ -158,13 +153,14 @@ public class ParsePackedSet
         // if not, create one.
         if (context.featureColours == null)
         {
-          context.featureColours = new HashMap<String, FeatureColourI>();
+          context.featureColours = new HashMap<>();
         }
         try
         {
           jalview.io.FeaturesFile ff = new jalview.io.FeaturesFile(src);
           context.updateSetModified(ff.parse(context.getLastAlignment(),
-                  context.featureColours, false, context.relaxedIdMatching));
+                  context.featureColours, false,
+                  context.relaxedIdMatching));
         } catch (Exception e)
         {
           errmsg = ("Failed to parse the Features file associated with the alignment.");
@@ -229,18 +225,19 @@ 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++];
       final String file = args[i++];
-      final JvDataType jtype = DataProvider.JvDataType.valueOf(type
-              .toUpperCase());
+      final JvDataType jtype = DataProvider.JvDataType
+              .valueOf(type.toUpperCase(Locale.ROOT));
       if (jtype != null)
       {
         final FileParse fp;
@@ -249,8 +246,9 @@ public class ParsePackedSet
           fp = new FileParse(file, AppletFormatAdapter.checkProtocol(file));
         } catch (Exception e)
         {
-          System.err.println("Couldn't handle datasource of type " + jtype
-                  + " using URI " + file);
+          jalview.bin.Console
+                  .errPrintln("Couldn't handle datasource of type " + jtype
+                          + " using URI " + file);
           e.printStackTrace();
           return;
         }
@@ -258,8 +256,8 @@ public class ParsePackedSet
       }
       else
       {
-        System.out.println("Couldn't parse source type token '"
-                + type.toUpperCase() + "'");
+        jalview.bin.Console.outPrintln("Couldn't parse source type token '"
+                + type.toUpperCase(Locale.ROOT) + "'");
       }
     }
     if (i < args.length)
@@ -272,17 +270,17 @@ public class ParsePackedSet
       System.out.print("\n");
 
     }
-    System.out.println("Now trying to parse set:");
+    jalview.bin.Console.outPrintln("Now trying to parse set:");
     JalviewDataset context;
     Object[] newdm;
     ParsePackedSet pps;
     try
     {
-      newdm = (pps = new ParsePackedSet()).getAlignment(
-              context = new JalviewDataset(), dp);
+      newdm = (pps = new ParsePackedSet())
+              .getAlignment(context = new JalviewDataset(), dp);
     } catch (Exception e)
     {
-      System.out.println("Test failed for these arguments.\n");
+      jalview.bin.Console.outPrintln("Test failed for these arguments.\n");
       e.printStackTrace(System.out);
       return;
     }
@@ -290,7 +288,8 @@ public class ParsePackedSet
     {
       for (Object o : newdm)
       {
-        System.out.println("Will need to create an " + o.getClass());
+        jalview.bin.Console
+                .outPrintln("Will need to create an " + o.getClass());
       }
 
       // now test uniquify/deuniquify stuff
@@ -303,8 +302,8 @@ public class ParsePackedSet
     {
       if (context.getLastAlignmentSet().isModified())
       {
-        System.err
-                .println("Initial alignment set was modified and any associated views should be updated.");
+        jalview.bin.Console.errPrintln(
+                "Initial alignment set was modified and any associated views should be updated.");
       }
     }
   }