Jalview-JS/JAL-3253 applet param PDBFILE

[jalview.git] / src / jalview / bin / JalviewAppLoader.java

diff --git a/src/jalview/bin/JalviewAppLoader.java b/src/jalview/bin/JalviewAppLoader.java
index 4ac4ffd..0bf922c 100644 (file)
--- a/src/jalview/bin/JalviewAppLoader.java
+++ b/src/jalview/bin/JalviewAppLoader.java
@@ -65,6 +65,7 @@ public class JalviewAppLoader
     loadAnnotations();
     loadJnetFile();
     loadPdbFiles();
+    callInitCallback();
   }
 
   /**
@@ -93,7 +94,6 @@ public class JalviewAppLoader
      * <param name="PDBfile3" value="1q0o Q45135_9MICO">
      */
 
-    int pdbFileCount = 0;
     // Accumulate pdbs here if they are heading for the same view (if
     // alignPdbStructures is true)
     Vector<Object[]> pdbs = new Vector<>();
@@ -105,6 +105,7 @@ public class JalviewAppLoader
                                     .getSequencesArray())
                     : null;
 
+    int pdbFileCount = 0;
     String param;
     do
     {
@@ -167,9 +168,9 @@ public class JalviewAppLoader
             chains = tmp2.toArray(new String[tmp2.size()]);
           }
         }
+        pdb.setId(param);
         ret[0] = param;
-        DataSourceType protocol = resolveFileProtocol(app,
-                ret);
+        DataSourceType protocol = resolveFileProtocol(app, ret);
         // TODO check JAL-357 for files in a jar (CLASSLOADER)
         pdb.setFile(ret[0]);
 
@@ -650,4 +651,18 @@ public class JalviewAppLoader
     }
   }
 
+  public void callInitCallback()
+  {
+    String initjscallback = app.getParameter("oninit");
+    if (initjscallback == null)
+    {
+      return;
+    }
+    initjscallback = initjscallback.trim();
+    if (initjscallback.length() > 0)
+    {
+      // TODO
+    }
+  }
+
 }