diff --git a/src/main/java/utils/DataManagerSerialiser.java b/src/main/java/utils/DataManagerSerialiser.java index b7be831..6705e64 100644 --- a/src/main/java/utils/DataManagerSerialiser.java +++ b/src/main/java/utils/DataManagerSerialiser.java @@ -140,8 +140,8 @@ public class DataManagerSerialiser extends Serialiser { trip.deserialise(); } - Reader reader5 = new InputStreamReader(getClass().getClassLoader().getResourceAsStream("serialisation/trips.json"), "UTF-8"); - ArrayList sharedTrips = gson.fromJson(reader4, new TypeToken>(){}.getType()); + Reader reader5 = new InputStreamReader(getClass().getClassLoader().getResourceAsStream("serialisation/sharedtrips.json"), "UTF-8"); + ArrayList sharedTrips = gson.fromJson(reader5, new TypeToken>(){}.getType()); reader5.close(); for (SharedTrip trip: sharedTrips){ diff --git a/target/classes/controllers/SharedTripsController.class b/target/classes/controllers/SharedTripsController.class index f4c7d52..58a1abb 100644 Binary files a/target/classes/controllers/SharedTripsController.class and b/target/classes/controllers/SharedTripsController.class differ diff --git a/target/classes/utils/DataManagerSerialiser.class b/target/classes/utils/DataManagerSerialiser.class index 3ebba75..6fb1dfc 100644 Binary files a/target/classes/utils/DataManagerSerialiser.class and b/target/classes/utils/DataManagerSerialiser.class differ