From: <ha...@us...> - 2006-09-25 04:04:54
|
Revision: 5710 http://svn.sourceforge.net/jmol/?rev=5710&view=rev Author: hansonr Date: 2006-09-24 21:04:50 -0700 (Sun, 24 Sep 2006) Log Message: ----------- load issue resolved Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Compiler.java Modified: trunk/Jmol/src/org/jmol/viewer/Compiler.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Compiler.java 2006-09-25 03:25:20 UTC (rev 5709) +++ trunk/Jmol/src/org/jmol/viewer/Compiler.java 2006-09-25 04:04:50 UTC (rev 5710) @@ -164,15 +164,12 @@ continue; } if (!iHaveQuotedString && lookingAtSpecialString()) { - int pt = script.indexOf(" ", ichToken); - int pt1 = script.indexOf("{", ichToken); - if (pt < ichToken && pt1 < ichToken) - pt = ichToken + cchToken; - else if (pt > 0 && (pt1 < 0 || pt < pt1)) - cchToken = pt - ichToken; - else - cchToken = pt1 - ichToken; - String str = script.substring(ichToken, pt).trim(); + String str = script.substring(ichToken, ichToken + cchToken).trim(); + int pt = str.indexOf(" "); + if (pt > 0) { + cchToken = pt; + str = str.substring(0, pt); + } ltoken.addElement(new Token(Token.string, str)); iHaveQuotedString = true; continue; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |