Fixed merge-related bugs

2017-09-13 13:12:26 +12:00
parent 59bd22c2aa 0f846f31c3
commit 70bbc89239
24 changed files with 802 additions and 102 deletions
@@ -42,12 +42,14 @@ public class SourceIdAllocator {
        }

        List<Integer> allocatedIDs = mockRace.getRaceDataSource().getParticipants();
-
+        System.out.println(allocatedIDs);
        List<Integer> allIDs = new ArrayList<>(mockRace.getBoatDataSource().getBoats().keySet());
+        System.out.println(allIDs);

        //Get list of unallocated ids.
        List<Integer> unallocatedIDs = new ArrayList<>(allIDs);
        unallocatedIDs.removeAll(allocatedIDs);
+        System.out.println(unallocatedIDs.isEmpty());


        if (!unallocatedIDs.isEmpty()) {