Revision: 5130
Author:   hansonr
Date:     2006-05-17 06:23:48 -0700 (Wed, 17 May 2006)
ViewCVS:  http://svn.sourceforge.net/jmol/?rev=5130&view=rev

Log Message:
-----------
bob200603 fixes minor bug for scripts executed before any file is loaded

Modified Paths:
--------------
    branches/bob200603/Jmol/src/org/jmol/viewer/SelectionManager.java
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/SelectionManager.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/SelectionManager.java   
2006-05-17 13:22:16 UTC (rev 5129)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/SelectionManager.java   
2006-05-17 13:23:48 UTC (rev 5130)
@@ -134,7 +134,8 @@
 
   void setSelectionSet(BitSet set) {
     bsSelection.and(bsNull);
-    bsSelection.or(set);
+    if (set != null)
+      bsSelection.or(set);
     empty = UNKNOWN;
     selectionChanged();
   }
@@ -180,7 +181,7 @@
   }
 
   void excludeSelectionSet(BitSet setExclude) {
-    if (empty == TRUE)
+    if (setExclude == null || empty == TRUE)
       return;
     for (int i = viewer.getAtomCount(); --i >= 0; )
       if (setExclude.get(i))


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



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Jmol-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jmol-commits

Reply via email to