Revision: 21056
          http://sourceforge.net/p/jmol/code/21056
Author:   hansonr
Date:     2016-04-19 19:52:17 +0000 (Tue, 19 Apr 2016)
Log Message:
-----------
allows load xxx + yyy as well as load FILES  xxx  + yyy

Modified Paths:
--------------
    branches/v14_4/Jmol/src/org/jmol/script/ScriptEval.java

Modified: branches/v14_4/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/script/ScriptEval.java     2016-04-19 
19:51:08 UTC (rev 21055)
+++ branches/v14_4/Jmol/src/org/jmol/script/ScriptEval.java     2016-04-19 
19:52:17 UTC (rev 21056)
@@ -4494,7 +4494,11 @@
     } else {
       Lst<String> fNames = new Lst<String>();
       if (i == 1) {
-        i++;
+        if (tokAt(i + 1) == T.plus) {
+          modelName = "files";
+        } else {
+          i++;
+        }
         loadScript.append(" " + modelName);
       }
       filter = getLoadFilesList(i, loadScript, sOptions, htParams, fNames);

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


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits

Reply via email to