Revision: 5202
Author:   hansonr
Date:     2006-06-05 19:32:31 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/jmol/?rev=5202&view=rev

Log Message:
-----------
bob200603 appletInline()

Oops -- had forgotten to remove the comments on this. Can't remember why I did 
that....

Modified Paths:
--------------
    branches/bob200603/Jmol/src/org/jmol/applet/Jmol.java
Modified: branches/bob200603/Jmol/src/org/jmol/applet/Jmol.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/applet/Jmol.java       2006-06-05 
18:10:37 UTC (rev 5201)
+++ branches/bob200603/Jmol/src/org/jmol/applet/Jmol.java       2006-06-06 
02:32:31 UTC (rev 5202)
@@ -294,6 +294,8 @@
       String loadParam = getValue("load", null);
       if (loadParam != null)
         scriptParam = "load " + loadParam + ";" + scriptParam;
+      else
+        loadInline(getValue("loadInline", null));
       script(scriptParam);
     }
     viewer.popHoldRepaint();
@@ -565,6 +567,8 @@
   }
 
   public void loadInline(String strModel) {
+    if (strModel == null)
+      return;
     viewer.loadInline(strModel);
   }
   


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Jmol-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jmol-commits

Reply via email to