This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f899b96f14dcc3452417997278c9fec9db048b05 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 22 16:44:54 2015 +0200 on se base uniquement sur les topiaId des trip pour l'export des marées vers une base distante (refs #7041) --- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 48 +++++----------------- .../ird/observe/ui/admin/export/ExportModel.java | 4 +- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index ebbe452..23569e8 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -24,6 +24,7 @@ package fr.ird.observe.ui.admin; import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.ObserveTechnicalException; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceConfig; import fr.ird.observe.db.DataSourceException; @@ -31,8 +32,9 @@ import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.db.impl.H2DataSource; import fr.ird.observe.db.impl.PGDataSource; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.Trips; +import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.report.model.Report; import fr.ird.observe.ui.admin.consolidate.ConsolidateModel; import fr.ird.observe.ui.admin.export.ExportModel; @@ -377,24 +379,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { } } - public static String getTripKey(Trip trip) { - StringBuilder sb = new StringBuilder(); - sb.append(trip.getProgram().getTopiaId()).append("-"); - sb.append(trip.getStartDate()).append("-"); - sb.append(trip.getEndDate()).append("-"); - if (trip.getVessel() != null) { - sb.append(trip.getVessel().getTopiaId()).append("-"); - } else { - sb.append("vesselNull"); - } - if (trip.getOcean() != null) { - sb.append(trip.getOcean().getTopiaId()).append("-"); - } else { - sb.append("oceanNull"); - } - return sb.toString(); - } - public DataSelectionModel getSelectionDataModel() { return selectionDataModel; } @@ -1282,26 +1266,14 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { protected void computeExistingTrips(DataService dataService, DataSource source) { - DataSelectionModel selectionModel = new DataSelectionModel(); - selectionModel.setUseOpenData(true); - try { - DataSelectionModel.populate(selectionModel, dataService, source); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("could not populate selected model", e); - } - } - List<String> existingTripIds = new ArrayList<String>(); - - for (List<String> tripIds : selectionModel.getDatas().values()) { - - for (String tripId : tripIds) { - Trip trip = (Trip) selectionModel.getEntityCache(tripId); - String key = getTripKey(trip); - existingTripIds.add(key); - } - + try { + List<String> tripSeineIds = dataService.getEntityIds(source, TripSeine.class); + existingTripIds.addAll(tripSeineIds); + List<String> tripLonglineIds = dataService.getEntityIds(source, TripLongline.class); + existingTripIds.addAll(tripLonglineIds); + } catch (DataSourceException e) { + throw new ObserveTechnicalException("Coould not get trip ids",e); } getExportModel().setExistingTripIds(existingTripIds); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java index 97e2ca6..2283d7f 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java @@ -30,7 +30,6 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.ui.admin.AdminActionModel; import fr.ird.observe.ui.admin.AdminStep; -import fr.ird.observe.ui.admin.AdminUIModel; import org.apache.commons.collections4.CollectionUtils; import org.nuiton.decorator.Decorator; @@ -110,8 +109,7 @@ public class ExportModel extends AdminActionModel { Trip trip = (Trip) selectionModel.getEntityCache(tripId); - String tripKey = AdminUIModel.getTripKey(trip); - boolean exists = existingTripIds.contains(tripKey); + boolean exists = existingTripIds.contains(trip.getTopiaId()); TripEntry entry = new TripEntry(trip, exists); tripEntries.add(entry); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.