Prechádzať zdrojové kódy

another attempt to circumvent bad code

tsdedhar 6 rokov pred
rodič
commit
0a2a400733

BIN
assignments/a2/.gradle/4.7/fileHashes/fileHashes.bin


BIN
assignments/a2/.gradle/4.7/fileHashes/fileHashes.lock


BIN
assignments/a2/.gradle/4.7/taskHistory/taskHistory.bin


BIN
assignments/a2/.gradle/4.7/taskHistory/taskHistory.lock


BIN
assignments/a2/.gradle/buildOutputCleanup/buildOutputCleanup.lock


BIN
assignments/a2/build/classes/java/main/Model.class


BIN
assignments/a2/build/classes/java/main/Thingy.class


BIN
assignments/a2/build/libs/a2-1.0-SNAPSHOT.jar


+ 4 - 3
assignments/a2/src/main/java/Model.java

@@ -97,14 +97,15 @@ public class Model extends Observable
     }
     
     System.out.println("index is: " + index);
-    //System.out.println("curthing is: " + thingies.indexOf(curThingy));
-    curThingy = thingies.get(index);
+    if (Math.abs(index - thingies.indexOf(curThingy)) > 1) {}
+    else 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);
     if (curThingy.getVisibleLen() == curThingy.getPoints().size() && tempLen < x) curThingy = thingies.get(index + 1);
+    
     // now modify tempThingy
     // if we want to go back in time
-    if (tempLen > x && curThingy.getVisibleLen() != curThingy.getPoints().size())
+    if (tempLen > x)
     {
       curThingy.reduceLen();
       totalVisibleLen--;