[Jmol-commits] SF.net SVN: jmol:[17070] trunk/Jmol/src/org/jmol/adapter/smarter/ SmarterJmolAdapter.java

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

Revision: 17070
          http://jmol.svn.sourceforge.net/jmol/?rev=17070&view=rev
Author:   hansonr
Date:     2012-05-01 13:56:04 +0000 (Tue, 01 May 2012)
Log Message:
-----------
oops!

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java

Modified: trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java	2012-05-01 12:26:32 UTC (rev 17069)
+++ trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java	2012-05-01 13:56:04 UTC (rev 17070)
@@ -651,24 +651,24 @@
    * **************************************************************/
   class AtomIterator extends JmolAdapter.AtomIterator {
     private int iatom;
+    private int nAtoms;
     private Atom atom;
     private int atomCount;
     private Atom[] atoms;
     private BitSet bsAtoms;
-    private int ptLast;
 
     AtomIterator(AtomSetCollection atomSetCollection) {
       atomCount = atomSetCollection.getAtomCount();
       atoms = atomSetCollection.getAtoms();
       bsAtoms = atomSetCollection.bsAtoms;
-      ptLast = (bsAtoms == null ? atomCount - 1 : Math.min(bsAtoms.length(), atoms.length));
+      iatom = 0;
     }
     @Override
     public boolean hasNext() {
-      if (iatom == ptLast)
+      if (nAtoms == atomCount)
         return false;
       while ((atom = atoms[iatom++]) == null || (bsAtoms != null && !bsAtoms.get(atom.atomIndex)))
-        if (iatom == ptLast)
+        if (++nAtoms == atomCount)
           return false;
       atoms[iatom - 1] = null; // single pass
       return true;

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