Pipeline.indexOf(Step) returns -1 if not present (#782)

Instead of throwing an exception. Threading stuff kills it.
Fixes #781

Author: SamCarlberg

core/src/main/java/edu/wpi/grip/core/Pipeline.java

@@ -30,7 +30,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -382,13 +381,7 @@ public synchronized void moveStep(Step step, int delta) {
   @Override
   public int indexOf(Step step) {
     checkNotNull(step, "step");
-    return readStepsSafely(steps -> {
-      int index = steps.indexOf(step);
-      if (index == -1) {
-        throw new NoSuchElementException("Step " + step + " is not in the pipeline");
-      }
-      return index;
-    });
+    return readStepsSafely(steps -> steps.indexOf(step));
   }
 
   @Subscribe

core/src/test/java/edu/wpi/grip/core/PipelineTest.java

@@ -26,12 +26,10 @@
 import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.NoSuchElementException;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 public class PipelineTest {
 
@@ -393,12 +391,7 @@ public void testIndexOf() {
     pipeline.addStep(step);
     assertEquals("Index of step was not zero", 0, pipeline.indexOf(step));
     pipeline.removeStep(step);
-    try {
-      pipeline.indexOf(step);
-      fail("NoSuchElementException should have been thrown");
-    } catch (NoSuchElementException expected) {
-      // This should happen
-    }
+    assertEquals("Index was not -1", -1, pipeline.indexOf(step));
   }
 
   @Test

ui/src/main/java/edu/wpi/grip/ui/analysis/AnalysisController.java

@@ -210,6 +210,7 @@ private void exportCsv() {
   private <E> Stream<Map.Entry<Step, E>> sortedStream(Map<Step, E> m) {
     return m.entrySet()
         .stream()
+        .filter(e -> stepIndexer.indexOf(e.getKey()) >= 0)
         .sorted((e1, e2) -> stepIndexer.compare(e1.getKey(), e2.getKey()));
   }