[Jmol-commits] SF.net SVN: jmol:[15047] branches/v12_0/Jmol/src/org/jmol

[<ha...@us...>]

Revision: 15047
          http://jmol.svn.sourceforge.net/jmol/?rev=15047&view=rev
Author:   hansonr
Date:     2011-01-26 20:38:21 +0000 (Wed, 26 Jan 2011)

Log Message:
-----------
version=12.0.29_dev # bug fix: a = {} initialized as bitset, not associative array

Modified Paths:
--------------
    branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java
    branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java	2011-01-26 20:37:46 UTC (rev 15046)
+++ branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java	2011-01-26 20:38:21 UTC (rev 15047)
@@ -832,7 +832,7 @@
         break;
       case Token.expressionBegin:
         if (tokAt(i + 1) == Token.expressionEnd) {
-          v = new BitSet();
+          v = new Hashtable();
           i++;
           break;
         } else if (tokAt(i + 1) == Token.all

Modified: branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties	2011-01-26 20:37:46 UTC (rev 15046)
+++ branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties	2011-01-26 20:38:21 UTC (rev 15047)
@@ -4,6 +4,7 @@
 
 version=12.0.29_dev
 
+# bug fix: a = {} initialized as bitset, not associative array
 # bug fix: <bitset> | <integer> should set bit <integer>
 # bug fix: <bitset> | <array> should set bits indicated in <array>
 # bug fix: <bitset> & <integer> should return true if bit <integer> is set


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