From: <ha...@us...> - 2010-08-17 22:11:58
|
Revision: 14017 http://jmol.svn.sourceforge.net/jmol/?rev=14017&view=rev Author: hansonr Date: 2010-08-17 22:11:52 +0000 (Tue, 17 Aug 2010) Log Message: ----------- version=12.0.7_dev # bug fix: associative arrays as ScriptVariables must be checked for type Modified Paths: -------------- branches/v12_0/Jmol/src/org/jmol/script/ScriptVariable.java branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v12_0/Jmol/src/org/jmol/script/ScriptVariable.java =================================================================== --- branches/v12_0/Jmol/src/org/jmol/script/ScriptVariable.java 2010-08-17 22:07:21 UTC (rev 14016) +++ branches/v12_0/Jmol/src/org/jmol/script/ScriptVariable.java 2010-08-17 22:11:52 UTC (rev 14017) @@ -224,8 +224,23 @@ return new ScriptVariable(list, x); if (x instanceof Float[]) return new ScriptVariable(listf, x); - if (x instanceof Hashtable) + if (x instanceof Hashtable) { + Hashtable ht = (Hashtable) x; + Enumeration e = ht.keys(); + while (e.hasMoreElements()) { + if (!(ht.get(e.nextElement()) instanceof ScriptVariable)) { + Hashtable x2 = new Hashtable(); + e = ht.keys(); + while (e.hasMoreElements()) { + String key = (String) e.nextElement(); + x2.put(key, ScriptVariable.getVariable(ht.get(key))); + } + x = x2; + break; + } + } return new ScriptVariable(hash, x); + } // all the rest are stored as list Modified: branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2010-08-17 22:07:21 UTC (rev 14016) +++ branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2010-08-17 22:11:52 UTC (rev 14017) @@ -4,6 +4,7 @@ version=12.0.7_dev +# bug fix: associative arrays as ScriptVariables must be checked for type # bug fix: isosurface color range should not carry over to general "color property" # bug fix: isosurface colorscheme TRANSLUCENT "xxx" fillTriangle error # bug fix: should not allow isosurface ... map colorscheme "xxx" TRANSLUCENT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |