resetting to 'working' version

assignments/a2/src/main/java/Controls.java

@@ -46,7 +46,7 @@ public class Controls extends JPanel implements Observer
     {
       public void stateChanged(ChangeEvent e)
       {
-        if (playback.getValue() != model.getTotalVisibleLen())
+        if (!playback.getSettingLen() && playback.getValue() != model.getTotalVisibleLen())
         {
           model.changeThingy(playback.getValue());
         }

assignments/a2/src/main/java/Model.java

@@ -90,14 +90,11 @@ public class Model extends Observable
     
     for (int i = 0; i < thingies.size() && tempLen <= x; i++)
     {
-      if (i == 0) System.out.println("first loop iteration");
-      System.out.println("vislen at " + i + " is : " + thingies.get(i).getVisibleLen());
       tempLen += thingies.get(i).getVisibleLen();
       index = i;
     }
     
-    System.out.println("index is: " + index);
-    if (Math.abs(index - thingies.indexOf(curThingy)) > 1 && index != (thingies.size() - 1)) index = thingies.indexOf(curThingy);
+    //if (Math.abs(index - thingies.indexOf(curThingy)) > 1 && index != (thingies.size() - 1)) index = thingies.indexOf(curThingy);
     curThingy = thingies.get(index);
     // off by one adjustments if we're at the end of a thingy
     if (index > 0 && curThingy.getVisibleLen() == 0 && tempLen > x) curThingy = thingies.get(index - 1);