[Jmol-commits] SF.net SVN: jmol: [9152] trunk/Jmol/src/org/jmol/modelset/ModelSet.java

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

Revision: 9152
          http://jmol.svn.sourceforge.net/jmol/?rev=9152&view=rev
Author:   hansonr
Date:     2008-03-17 22:07:19 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
11.5.18 VERSION  (coding)

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/modelset/ModelSet.java

Modified: trunk/Jmol/src/org/jmol/modelset/ModelSet.java
===================================================================
--- trunk/Jmol/src/org/jmol/modelset/ModelSet.java	2008-03-18 05:00:42 UTC (rev 9151)
+++ trunk/Jmol/src/org/jmol/modelset/ModelSet.java	2008-03-18 05:07:19 UTC (rev 9152)
@@ -633,18 +633,18 @@
     if (!fullModels) {
       return null;
     }
-    BitSet bs = BitSetUtil.copy(bsAtoms);
-    BitSet bsModels = getModelBitSet(bs);
+    BitSet bsModels = getModelBitSet(bsAtoms);
     includeAllRelatedFrames(bsModels);
     int nAtomsDeleted = 0;
     
     int nModelsDeleted = BitSetUtil.cardinalityOf(bsModels);
     if (nModelsDeleted == 0)
       return null;
+    BitSet bsDeleted;
     if (nModelsDeleted == modelCount) {
-      bs = getModelAtomBitSet(-1, true);
+      bsDeleted = getModelAtomBitSet(-1, true);
       viewer.zap(true);
-      return bs;
+      return bsDeleted;
     }
     
     // zero out reproducible arrays
@@ -655,7 +655,7 @@
     //   and pre-calculate Model.bsAtoms and Model.atomCount
     Model[] newModels = new Model[modelCount - nModelsDeleted];
     Model[] oldModels = models;
-    BitSet bsDeleted = new BitSet();
+    bsDeleted = new BitSet();
     for (int i = 0, mpt = 0; i < modelCount; i++)
       if (bsModels.get(i)) { // get a good count now
         getAtomCountInModel(i);
@@ -680,7 +680,7 @@
       if (nAtoms == 0)
         continue;
       nAtomsDeleted += nAtoms;
-      bs = oldModels[i].bsAtoms;
+      BitSet bs = oldModels[i].bsAtoms;
       int firstAtomIndex = oldModels[i].firstAtomIndex;
 
       // delete from symmetry set


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