JAL-1641 cherry-picked changes into develop compatible branch

[jalview.git] / src / jalview / io / FileLoader.java

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 3322689..cd9258c 100755 (executable)
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -30,7 +30,6 @@ import jalview.gui.Jalview2XML;
 import jalview.structure.StructureSelectionManager;
 import jalview.util.MessageManager;
 
-import java.util.List;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
@@ -323,7 +322,7 @@ public class FileLoader implements Runnable
             }
             if (sq.getPDBId() != null)
             {
-              for (PDBEntry pdbe : (List<PDBEntry>) sq.getPDBId())
+              for (PDBEntry pdbe : sq.getPDBId())
               {
                 StructureSelectionManager.getStructureSelectionManager(
                         Desktop.instance).registerPDBEntry(pdbe);
@@ -350,8 +349,12 @@ public class FileLoader implements Runnable
             if (source instanceof HtmlFile)
             {
               ((HtmlFile) source).LoadAlignmentFeatures(alignFrame);
-
             }
+            else if (source instanceof JSONFile)
+            {
+              ((JSONFile) source).LoadAlignmentFeatures(alignFrame);
+            }
+
             if (raiseGUI)
             {
               // add the window to the GUI