Author: tchemit Date: 2012-08-23 17:27:10 +0200 (Thu, 23 Aug 2012) New Revision: 466 Url: http://forge.codelutin.com/repositories/revision/sammoa/466 Log: refs #1201: Export format application (fix delete of ObserverPosition) Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Routes.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java 2012-08-23 15:24:42 UTC (rev 465) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java 2012-08-23 15:27:10 UTC (rev 466) @@ -339,12 +339,13 @@ Set<ObserverPosition> positions = Sets.newHashSet(); + // keep observerPositions to delete from transectFlights + positions.addAll(TransectFlights.toObserverPositions(flight.getTransectFlight())); + // delete routes List<Route> routes = getRoutes(tx, flight); // keep observerPositions to delete from routes positions.addAll(Routes.toObserverPositions(routes)); - // keep observerPositions to delete from transectFlights - positions.addAll(TransectFlights.toObserverPositions(Routes.toTransectFlights(routes))); RouteDAO routeDAO = SammoaDAOHelper.getRouteDAO(tx); routeDAO.deleteAll(routes); Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Routes.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Routes.java 2012-08-23 15:24:42 UTC (rev 465) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Routes.java 2012-08-23 15:27:10 UTC (rev 466) @@ -61,9 +61,9 @@ return Iterables.transform(routes, TO_DATE_FUNCTION); } - public static Iterable<TransectFlight> toTransectFlights(Iterable<Route> routes) { - return Iterables.transform(routes, TO_TRANSECT_FLIGHT_FUNCTION); - } +// public static Iterable<TransectFlight> toTransectFlights(Iterable<Route> routes) { +// return Iterables.transform(routes, TO_TRANSECT_FLIGHT_FUNCTION); +// } public static Set<ObserverPosition> toObserverPositions(Iterable<Route> routes) { Set<ObserverPosition> result = Sets.newHashSet(); @@ -193,14 +193,14 @@ } }; - private static Function<Route, TransectFlight> TO_TRANSECT_FLIGHT_FUNCTION = new Function<Route, TransectFlight>() { +// private static Function<Route, TransectFlight> TO_TRANSECT_FLIGHT_FUNCTION = new Function<Route, TransectFlight>() { +// +// @Override +// public TransectFlight apply(Route input) { +// return input.getTransectFlight(); +// } +// }; - @Override - public TransectFlight apply(Route input) { - return input.getTransectFlight(); - } - }; - private static <T> T getNext(Iterable<T> elements, final T element, final Comparator<T> comparator) {