May 2014 - Sammoa-commits - mailman.cloud.codelutin.com

r666 - trunk/sammoa-persistence/src/main/xmi
by athimel＠users.forge.codelutin.com 16 May '14

16 May '14

Author: athimel Date: 2014-05-16 11:30:31 +0200 (Fri, 16 May 2014) New Revision: 666 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/666 Log: Let entities be contextable Modified: trunk/sammoa-persistence/src/main/xmi/sammoa.properties Modified: trunk/sammoa-persistence/src/main/xmi/sammoa.properties =================================================================== --- trunk/sammoa-persistence/src/main/xmi/sammoa.properties 2014-05-16 08:16:53 UTC (rev 665) +++ trunk/sammoa-persistence/src/main/xmi/sammoa.properties 2014-05-16 09:30:31 UTC (rev 666) @@ -29,6 +29,7 @@ model.tagvalue.indexForeignKeys=true model.tagValue.generateOperatorForDAOHelper=true model.tagValue.generateStandaloneEnumForDAOHelper=true +model.tagValue.contextable=true #model.tagvalue.java.lang.String=text

1 0

r665 - in trunk: sammoa-application sammoa-application/src/main/java/fr/ulr/sammoa/application sammoa-application/src/main/java/fr/ulr/sammoa/application/device sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController sammoa-application/src/main/java/fr/ulr/sammoa/application/io sammoa-application/src/main/java/fr/ulr/sammoa/applica
by athimel＠users.forge.codelutin.com 16 May '14

16 May '14

Author: athimel Date: 2014-05-16 10:16:53 +0200 (Fri, 16 May 2014) New Revision: 665 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/665 Log: Update version Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointTopiaDao.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationTopiaDao.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteTopiaDao.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateTopiaDao.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightTopiaDao.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectTopiaDao.java Removed: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightDAOImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointDAOImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationDAOImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteDAOImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateDAOImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectDAOImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightDAOImpl.java Modified: trunk/sammoa-application/pom.xml trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/DecoratorService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaApplicationConfigProvider.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaServiceSupport.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ValidationService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceManagerProvider.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioConfig.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsConfig.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/BaseFlightController.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/CampaignStorage.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/FlightStorage.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/ImportApplicationService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/SammoaImportModelFactory.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/DataImportStrategy.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/ReferentialImportStrategy.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ObserverImportModel.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/SpeciesImportModel.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/DbfImport.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/DoubleToIntegerValueParser.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ImportMapService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ShpImporter.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/StrateImportModel.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/StrateTypeValueParser.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/ExportApplicationService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/SammoaPrepareDataForExport.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaConfigMock.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvServiceTest.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java trunk/sammoa-application/src/test/resources/sammoa-test.properties trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/AutoSaveListener.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/HasTopiaIdPredicate.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/PersistenceException.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Position.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistenceHelper.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Validables.java trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/DataAutoSaveListenerTest.java trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java trunk/sammoa-persistence/src/test/resources/sammoa-test.properties Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/pom.xml 2014-05-16 08:16:53 UTC (rev 665) @@ -63,6 +63,11 @@ </dependency> <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-csv</artifactId> + </dependency> + + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> @@ -97,6 +102,16 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + + <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> </dependency> @@ -130,6 +145,11 @@ <artifactId>h2</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>3.0-SNAPSHOT</version> + </dependency> </dependencies> Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/DecoratorService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/DecoratorService.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/DecoratorService.java 2014-05-16 08:16:53 UTC (rev 665) @@ -36,12 +36,12 @@ import fr.ulr.sammoa.persistence.Strate; import fr.ulr.sammoa.persistence.StringRef; import fr.ulr.sammoa.persistence.Transect; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.DecoratorProvider; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.DecoratorProvider; import java.text.SimpleDateFormat; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Sammoa decorator service. @@ -52,7 +52,7 @@ public class DecoratorService extends SammoaServiceSupport { protected SimpleDateFormat dateFormat = - new SimpleDateFormat(_("sammoa.dateTimePattern")); + new SimpleDateFormat(t("sammoa.dateTimePattern")); /** Delegate decorator provider. */ protected DecoratorProvider decoratorProvider; @@ -115,22 +115,22 @@ String result; if (flight == null) { - result = _("sammoa.flight.decorator.newFlight"); + result = t("sammoa.flight.decorator.newFlight"); } else { - result = _("sammoa.flight.decorator.flight", flight.getFlightNumber()); + result = t("sammoa.flight.decorator.flight", flight.getFlightNumber()); if (flight.getBeginDate() != null) { result += " - " + dateFormat.format(flight.getBeginDate()); if (flight.getEndDate() != null) { result += " - " + dateFormat.format(flight.getEndDate()); } else { - result += " - " + _("sammoa.flight.decorator.notEnded"); + result += " - " + t("sammoa.flight.decorator.notEnded"); } } else { - result += " - " + _("sammoa.flight.decorator.notStarted"); + result += " - " + t("sammoa.flight.decorator.notStarted"); } } return result; @@ -142,7 +142,7 @@ @Override public String toString(Object bean) { Position position = (Position) bean; - return _(position.getLabel()); + return t(position.getLabel()); } }); } 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 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java 2014-05-16 08:16:53 UTC (rev 665) @@ -32,44 +32,12 @@ import com.google.common.collect.Sets; import fr.ulr.sammoa.application.io.CampaignStorage; import fr.ulr.sammoa.application.io.SammoaStorages; -import fr.ulr.sammoa.persistence.AutoSaveListener; -import fr.ulr.sammoa.persistence.Campaign; -import fr.ulr.sammoa.persistence.Dates; -import fr.ulr.sammoa.persistence.Flight; -import fr.ulr.sammoa.persistence.FlightDAO; -import fr.ulr.sammoa.persistence.Flights; -import fr.ulr.sammoa.persistence.GeoPoint; -import fr.ulr.sammoa.persistence.GeoPointDAO; -import fr.ulr.sammoa.persistence.GeoPointImpl; -import fr.ulr.sammoa.persistence.GeoPoints; -import fr.ulr.sammoa.persistence.Observation; -import fr.ulr.sammoa.persistence.ObservationDAO; -import fr.ulr.sammoa.persistence.ObservationStatus; -import fr.ulr.sammoa.persistence.Observer; -import fr.ulr.sammoa.persistence.ObserverPosition; -import fr.ulr.sammoa.persistence.ObserverPositionDAO; -import fr.ulr.sammoa.persistence.ObserverPositions; -import fr.ulr.sammoa.persistence.Observers; -import fr.ulr.sammoa.persistence.PlatformType; -import fr.ulr.sammoa.persistence.Position; -import fr.ulr.sammoa.persistence.Route; -import fr.ulr.sammoa.persistence.RouteDAO; -import fr.ulr.sammoa.persistence.RouteType; -import fr.ulr.sammoa.persistence.Routes; -import fr.ulr.sammoa.persistence.SammoaDAOHelper; -import fr.ulr.sammoa.persistence.Transect; -import fr.ulr.sammoa.persistence.TransectDAO; -import fr.ulr.sammoa.persistence.TransectFlight; -import fr.ulr.sammoa.persistence.TransectFlightDAO; -import fr.ulr.sammoa.persistence.TransectFlights; -import org.apache.commons.collections.CollectionUtils; +import fr.ulr.sammoa.persistence.*; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; import org.joda.time.Interval; import org.joda.time.Seconds; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.TimeLog; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -104,7 +72,7 @@ Preconditions.checkNotNull(campaign); - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { List<Flight> result = getFlights(transaction, campaign); @@ -114,32 +82,27 @@ } } - public List<Flight> getFlights(TopiaContext transaction, Campaign campaign) { + public List<Flight> getFlights(SammoaTopiaPersistenceContext transaction, Campaign campaign) { Preconditions.checkNotNull(campaign); long start = TimeLog.getTime(); - try { - FlightDAO dao = SammoaDAOHelper.getFlightDAO(transaction); + FlightTopiaDao dao = transaction.getFlightDao(); - List<Flight> result = dao.findAllByCampaign(campaign); + List<Flight> result = dao.forCampaignEquals(campaign).findAll(); - Collections.sort(result, Flights.orderByDate()); + Collections.sort(result, Flights.orderByDate()); - timeLog.log(start, "getFlights(" + campaign.getCode() + ")"); - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + timeLog.log(start, "getFlights(" + campaign.getCode() + ")"); + return result; +} - } - } - public Iterable<Flight> getFlights(Campaign campaign, Date beginDate, Date endDate) { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { Iterable<Flight> result = getFlights(transaction, @@ -153,7 +116,7 @@ } - public Iterable<Flight> getFlights(TopiaContext transaction, + public Iterable<Flight> getFlights(SammoaTopiaPersistenceContext transaction, Campaign campaign, Date beginDate, Date endDate) { @@ -165,18 +128,12 @@ long start = TimeLog.getTime(); List<Flight> campaignFlights; - try { - FlightDAO dao = SammoaDAOHelper.getFlightDAO(transaction); + FlightTopiaDao dao = transaction.getFlightDao(); - campaignFlights = dao.findAllByCampaign(campaign); - Collections.sort(campaignFlights, Flights.orderByDate()); + campaignFlights = dao.forCampaignEquals(campaign).findAll(); + Collections.sort(campaignFlights, Flights.orderByDate()); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - - } - // Filter on period final Interval interval = Dates.toInterval(beginDate, endDate); Iterable<Flight> result = Iterables.filter(campaignFlights, new Predicate<Flight>() { @@ -196,7 +153,7 @@ Preconditions.checkNotNull(flightId); - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { Flight result = getFlight(transaction, flightId); return result; @@ -205,34 +162,30 @@ } } - public Flight getFlight(TopiaContext transaction, String flightId) { + public Flight getFlight(SammoaTopiaPersistenceContext transaction, String flightId) { Preconditions.checkNotNull(flightId); + + long start = TimeLog.getTime(); + FlightTopiaDao dao = transaction.getFlightDao(); - try { - long start = TimeLog.getTime(); - FlightDAO dao = SammoaDAOHelper.getFlightDAO(transaction); + Flight result = (Flight) dao.forTopiaIdEquals(flightId).findUniqueOrNull(); + Preconditions.checkNotNull( + result, String.format("%s doesn't exist", flightId)); - Flight result = dao.findByTopiaId(flightId); - Preconditions.checkNotNull( - result, String.format("%s doesn't exist", flightId)); + if (logger.isInfoEnabled()) { + logger.info("Loading flight {} [{}]", + result.getFlightNumber(), + result.getTopiaId() + ); + } - if (logger.isInfoEnabled()) { - logger.info("Loading flight {} [{}]", - result.getFlightNumber(), - result.getTopiaId() - ); - } + result.sizeObserver(); + result.sizeTransectFlight(); - result.sizeObserver(); - result.sizeTransectFlight(); + timeLog.log(start, "getFlight(" + flightId + ")"); - timeLog.log(start, "getFlight(" + flightId + ")"); - - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + return result; } /** @@ -247,9 +200,9 @@ */ public Flight createFlight(Campaign campaign, int flightNumber) { - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { - FlightDAO dao = SammoaDAOHelper.getFlightDAO(tx); + FlightTopiaDao dao = tx.getFlightDao(); int nextFlightNumber = getNextFlightNumber(tx); Preconditions.checkArgument(flightNumber >= nextFlightNumber); @@ -268,7 +221,7 @@ ); } - tx.commitTransaction(); + tx.commit(); // Update flightNumber in config config.setFlightNumber(flightNumber); @@ -283,7 +236,7 @@ return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(tx); } @@ -297,13 +250,14 @@ */ public int getNextFlightNumber() { - TopiaContext tx = persistence.beginTransaction(); + + SammoaTopiaPersistenceContext tx = persistence.beginTransaction(); try { int result = getNextFlightNumber(tx); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(tx); } @@ -312,33 +266,33 @@ public void deleteTransectFlight(Flight flight, TransectFlight transectFlight) { - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { deleteTransectFlight(tx, flight, transectFlight); - tx.commitTransaction(); + tx.commit(); } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); + throw new TopiaException(ex); } finally { endTransaction(tx); } } - protected void deleteTransectFlight(TopiaContext tx, + protected void deleteTransectFlight(SammoaTopiaPersistenceContext tx, Flight flight, - TransectFlight transectFlight) - throws TopiaException { + TransectFlight transectFlight) { - SammoaDAOHelper.getObserverPositionDAO(tx).deleteAll( - transectFlight.getObserverPosition()); + ObserverPositionTopiaDao observerPositionDao = tx.getObserverPositionDao(); + observerPositionDao.deleteAll(transectFlight.getObserverPosition()); + flight.removeTransectFlight(transectFlight); - SammoaDAOHelper.getTransectFlightDAO(tx).delete(transectFlight); + tx.getTransectFlightDao().delete(transectFlight); - SammoaDAOHelper.getFlightDAO(tx).update(flight); + tx.getFlightDao().update(flight); } /** @@ -351,14 +305,14 @@ Preconditions.checkArgument(StringUtils.isNotBlank(campaignId)); Preconditions.checkArgument(StringUtils.isNotBlank(flightId)); - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { // send delete queries to db deleteFlightInDb(tx, flightId); // commit db - tx.commitTransaction(); + tx.commit(); } catch (TopiaException e) { throw new SammoaTechnicalException(e); @@ -379,22 +333,20 @@ * @param flightId the flight id to remove * @since 0.6 */ - public void deleteFlightInDb(TopiaContext tx, String flightId) { + public void deleteFlightInDb(SammoaTopiaPersistenceContext tx, String flightId) { if (logger.isInfoEnabled()) { logger.info("Delete flight {}", flightId); } try { - FlightDAO dao = SammoaDAOHelper.getFlightDAO(tx); + FlightTopiaDao dao = tx.getFlightDao(); - Flight flight = dao.findByTopiaId(flightId); + Flight flight = (Flight) dao.forTopiaIdEquals(flightId).findUnique(); - Preconditions.checkNotNull(flight); - // delete geoPoints List<GeoPoint> geoPoints = getFlightGeoPoints(tx, flight); - GeoPointDAO geoPointDAO = SammoaDAOHelper.getGeoPointDAO(tx); - geoPointDAO.deleteAll(geoPoints); + GeoPointTopiaDao geoPointDao = tx.getGeoPointDao(); + geoPointDao.deleteAll(geoPoints); Set<ObserverPosition> positions = Sets.newHashSet(); @@ -402,12 +354,12 @@ List<Route> routes = getRoutes(tx, flight); // keep observerPositions to delete from routes positions.addAll(Routes.toObserverPositions(routes)); - RouteDAO routeDAO = SammoaDAOHelper.getRouteDAO(tx); + RouteTopiaDao routeDAO = tx.getRouteDao(); routeDAO.deleteAll(routes); // delete observations List<Observation> observations = getObservations(tx, flight); - ObservationDAO observationDAO = SammoaDAOHelper.getObservationDAO(tx); + ObservationTopiaDao observationDAO = tx.getObservationDao(); observationDAO.deleteAll(observations); // keep observerPositions to delete from transectFlights @@ -417,7 +369,7 @@ dao.delete(flight); // delete observerPositions - ObserverPositionDAO observerPositionDAO = SammoaDAOHelper.getObserverPositionDAO(tx); + ObserverPositionTopiaDao observerPositionDAO = tx.getObserverPositionDao(); observerPositionDAO.deleteAll(positions); } catch (TopiaException e) { @@ -455,7 +407,7 @@ public GeoPoint getGeoPoint(Flight flight, Date date) { - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { List<GeoPoint> geoPoints = getFlightGeoPoints(tx, flight); @@ -464,13 +416,13 @@ return result; } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); + throw new TopiaException(ex); } finally { endTransaction(tx); } } - public GeoPoint getGeoPoint(TopiaContext tx, + public GeoPoint getGeoPoint(SammoaTopiaPersistenceContext tx, Flight flight, List<GeoPoint> geoPoints, Date date) throws TopiaException { @@ -503,7 +455,7 @@ result.setFlight(flight); result.setRecordTime(newTime.toDate()); - SammoaDAOHelper.getGeoPointDAO(tx).create(result); + tx.getGeoPointDao().create(result); geoPoints.add(result); if (logger.isDebugEnabled()) { @@ -518,7 +470,7 @@ public List<GeoPoint> getFlightGeoPoints(Flight flight) { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { List<GeoPoint> result = getFlightGeoPoints(transaction, flight); return result; @@ -527,16 +479,16 @@ } } - public List<GeoPoint> getFlightGeoPoints(TopiaContext transaction, + public List<GeoPoint> getFlightGeoPoints(SammoaTopiaPersistenceContext transaction, Flight flight) { try { - GeoPointDAO dao = SammoaDAOHelper.getGeoPointDAO(transaction); + GeoPointTopiaDao dao = transaction.getGeoPointDao(); List<GeoPoint> result = dao.findAllByFlightOrderedByRecordTime(flight); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } } @@ -594,10 +546,10 @@ List<TransectFlight> result = Lists.newArrayList(); - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - FlightDAO flightDAO = SammoaDAOHelper.getFlightDAO(transaction); + FlightTopiaDao flightDAO = transaction.getFlightDao(); // Reverse the list to always use the same fromIndex using // with List.add method @@ -612,18 +564,15 @@ transaction, transect, flight); logger.debug("Add transect {} to the flight {}", - transect.getName(), flight.getFlightNumber()); + transect.getName(), flight.getFlightNumber()); result.add(transectFlight); flight.addTransectFlight(fromIndex, transectFlight); } flightDAO.update(flight); - transaction.commitTransaction(); + transaction.commit(); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } finally { endTransaction(transaction); } @@ -637,23 +586,14 @@ public Map<Transect, Long> getTransectRealNbTimes(Collection<Transect> transects) { - - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - TransectFlightDAO dao = - SammoaDAOHelper.getTransectFlightDAO(transaction); + TransectFlightTopiaDao dao = transaction.getTransectFlightDao(); Map<Transect, Long> result; - if (CollectionUtils.isEmpty(transects)) { - result = dao.countAllByTransect(); - } else { - result = dao.countAllByTransects(transects); - } + result = dao.countAllByTransect(transects); return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } finally { endTransaction(transaction); } @@ -667,7 +607,7 @@ */ public List<Route> getRoutes(Flight flight) { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { List<Route> result = getRoutes(transaction, flight); return result; @@ -682,16 +622,12 @@ * @param flight Flight * @return the List of Route matching the {@code flight} */ - public List<Route> getRoutes(TopiaContext transaction, Flight flight) { + public List<Route> getRoutes(SammoaTopiaPersistenceContext transaction, Flight flight) { - try { - RouteDAO dao = SammoaDAOHelper.getRouteDAO(transaction); - List<Route> result = dao.findAllByFlightOrderedByBeginTime(flight); - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + RouteTopiaDao dao = transaction.getRouteDao(); + List<Route> result = dao.findAllByFlightOrderedByBeginTime(flight); + return result; } /** @@ -703,11 +639,11 @@ */ public Route getLastUnfinishedRoute(Flight flight) { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { Route result; if (flight.getEndDate() == null) { - RouteDAO dao = SammoaDAOHelper.getRouteDAO(transaction); + RouteTopiaDao dao = transaction.getRouteDao(); result = dao.findLastByFlight(flight); } else { @@ -715,7 +651,7 @@ } return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); @@ -724,14 +660,14 @@ public Route getPreviousRoute(Route route) { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - RouteDAO dao = SammoaDAOHelper.getRouteDAO(transaction); + RouteTopiaDao dao = transaction.getRouteDao(); Route result = dao.findPreviousRoute(route); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); @@ -745,14 +681,14 @@ result = previousRoute.getTransectFlight(); } else { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - RouteDAO dao = SammoaDAOHelper.getRouteDAO(transaction); + RouteTopiaDao dao = transaction.getRouteDao(); Route previousLEG = dao.findPreviousLEG(previousRoute); result = previousLEG == null ? null : previousLEG.getTransectFlight(); } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); @@ -761,7 +697,7 @@ return result; } - protected TransectFlight getPreviousTransect(TopiaContext tx, + protected TransectFlight getPreviousTransect(SammoaTopiaPersistenceContext tx, Route previousRoute) throws TopiaException { @@ -771,7 +707,7 @@ } else { - RouteDAO dao = SammoaDAOHelper.getRouteDAO(tx); + RouteTopiaDao dao = tx.getRouteDao(); Route previousLEG = dao.findPreviousLEG(previousRoute); result = previousLEG == null ? null : previousLEG.getTransectFlight(); } @@ -780,7 +716,7 @@ public List<Observation> getObservations(Flight flight) { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { List<Observation> result = getObservations(transaction, flight); return result; @@ -789,17 +725,17 @@ } } - public List<Observation> getObservations(TopiaContext transaction, + public List<Observation> getObservations(SammoaTopiaPersistenceContext transaction, Flight flight) { try { - ObservationDAO dao = SammoaDAOHelper.getObservationDAO(transaction); + ObservationTopiaDao dao = transaction.getObservationDao(); List<Observation> result = dao.findAllByFlightOrderedByObservationTime(flight); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } } @@ -808,13 +744,12 @@ Observer observer, Position position) { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { Collection<ObserverPosition> observerPositions = route.getObserverPosition(); - ObserverPositionDAO observerPositionDAO = - SammoaDAOHelper.getObserverPositionDAO(transaction); + ObserverPositionTopiaDao observerPositionDAO = transaction.getObserverPositionDao(); ObserverPosition observerPosition = Iterables.find(observerPositions, @@ -850,33 +785,32 @@ debugObserverPositions("Update", observerPositions); - transaction.commitTransaction(); + transaction.commit(); } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); } } - protected TransectFlight createTransectFlight(TopiaContext transaction, + protected TransectFlight createTransectFlight(SammoaTopiaPersistenceContext transaction, Transect transect, Flight flight) throws TopiaException { - TransectFlightDAO transectFlightDAO = - SammoaDAOHelper.getTransectFlightDAO(transaction); + TransectFlightTopiaDao transectFlightDAO = transaction.getTransectFlightDao(); int crossingNumber = transectFlightDAO.getMaxCrossingNumberByTransect(transect) + 1; - TransectFlight result = transectFlightDAO.create(); + TransectFlight result = (TransectFlight)transectFlightDAO.create(); result.setTransect(transect); result.setCrossingNumber(crossingNumber); // Update transect for nbTimes - TransectDAO transectDAO = SammoaDAOHelper.getTransectDAO(transaction); + TransectTopiaDao transectDAO = transaction.getTransectDao(); transectDAO.update(transect); logger.debug("Transect {} saved with nbTimes = {}", transect.getName(), crossingNumber); @@ -888,7 +822,7 @@ return result; } - public Observation createObservation(TopiaContext transaction, + public Observation createObservation(SammoaTopiaPersistenceContext transaction, Flight flight, Date beginTime, Position position) @@ -896,7 +830,7 @@ Observation result; - ObservationDAO dao = SammoaDAOHelper.getObservationDAO(transaction); + ObservationTopiaDao dao = transaction.getObservationDao(); int number = dao.findLastObservationNumber(flight); @@ -908,7 +842,7 @@ return result; } - public Route createTransit(TopiaContext transaction, + public Route createTransit(SammoaTopiaPersistenceContext transaction, Flight flight, Date beginTime, Route previousRoute) @@ -923,7 +857,7 @@ return result; } - public Route createLeg(TopiaContext transaction, + public Route createLeg(SammoaTopiaPersistenceContext transaction, Flight flight, Date beginTime, Route previousRoute, @@ -941,7 +875,7 @@ previousRoute, transectFlight); - RouteDAO dao = SammoaDAOHelper.getRouteDAO(transaction); + RouteTopiaDao dao = transaction.getRouteDao(); result.setTransectFlight(transectFlight); @@ -951,7 +885,7 @@ return result; } - public Route createCircleBack(TopiaContext transaction, + public Route createCircleBack(SammoaTopiaPersistenceContext transaction, Flight flight, Date beginTime, Route previousRoute, @@ -974,7 +908,7 @@ return result; } - protected Route createRoute(TopiaContext transaction, + protected Route createRoute(SammoaTopiaPersistenceContext transaction, Flight flight, Date beginTime, RouteType type, @@ -982,10 +916,10 @@ TransectFlight transectFlight) throws TopiaException { - RouteDAO dao = SammoaDAOHelper.getRouteDAO(transaction); + RouteTopiaDao dao = transaction.getRouteDao(); // Create the new Route - Route result = dao.create(); + Route result = (Route) dao.create(); result.setBeginTime(beginTime); result.setRouteType(type); result.setFlight(flight); @@ -1023,7 +957,7 @@ return result; } - protected Collection<ObserverPosition> createRouteObserverPositions(TopiaContext transaction, + protected Collection<ObserverPosition> createRouteObserverPositions(SammoaTopiaPersistenceContext transaction, Route previousRoute, TransectFlight transectFlight, Flight flight) @@ -1064,14 +998,13 @@ return result; } - protected Collection<ObserverPosition> createObserverPositions(TopiaContext transaction, + protected Collection<ObserverPosition> createObserverPositions(SammoaTopiaPersistenceContext transaction, Flight flight) throws TopiaException { Collection<ObserverPosition> result = Lists.newArrayList(); - ObserverPositionDAO observerPositionDAO = - SammoaDAOHelper.getObserverPositionDAO(transaction); + ObserverPositionTopiaDao observerPositionDAO = transaction.getObserverPositionDao(); // Prepare positions // TODO-fdesbois-2012-06-13 : make positions depends on platformType @@ -1106,7 +1039,7 @@ return result; } - protected Collection<ObserverPosition> copyObserverPositions(TopiaContext transaction, + protected Collection<ObserverPosition> copyObserverPositions(SammoaTopiaPersistenceContext transaction, Collection<ObserverPosition> observerPositions) throws TopiaException { @@ -1114,8 +1047,7 @@ debugObserverPositions("Copy", observerPositions); - ObserverPositionDAO observerPositionDAO = - SammoaDAOHelper.getObserverPositionDAO(transaction); + ObserverPositionTopiaDao observerPositionDAO = transaction.getObserverPositionDao(); for (ObserverPosition source : observerPositions) { @@ -1146,9 +1078,9 @@ } } - protected int getNextFlightNumber(TopiaContext tx) throws TopiaException { + protected int getNextFlightNumber(SammoaTopiaPersistenceContext tx) throws TopiaException { - FlightDAO dao = SammoaDAOHelper.getFlightDAO(tx); + FlightTopiaDao dao = tx.getFlightDao(); int confNumber = config.getFlightNumber(); Integer dbNumber = dao.findLastFlightNumber(); @@ -1162,18 +1094,18 @@ public TransectFlight getNextTransectFlightFrom(TransectFlight transectFlight, Flight flight, Date beforeTime) { - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { TransectFlight result = getNextTransectFlightFrom(tx, transectFlight, flight, beforeTime); return result; } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); + throw new TopiaException(ex); } finally { endTransaction(tx); } } - public TransectFlight getNextTransectFlightFrom(TopiaContext tx, + public TransectFlight getNextTransectFlightFrom(SammoaTopiaPersistenceContext tx, TransectFlight transectFlight, Flight flight, Date beforeTime) @@ -1181,7 +1113,7 @@ // Note that this may not reflect the real next transect if exists in routes - RouteDAO routeDAO = SammoaDAOHelper.getRouteDAO(tx); + RouteTopiaDao routeDAO = tx.getRouteDao(); // Skip previous elements int numberToSkip; @@ -1206,10 +1138,10 @@ } public Flight getFlightByNaturalId(Map<String, Object> naturalId) { - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { - FlightDAO dao = SammoaDAOHelper.getFlightDAO(tx); - Flight result = dao.findByProperties(naturalId); + FlightTopiaDao dao = tx.getFlightDao(); + Flight result = (Flight)dao.forProperties(naturalId).findAnyOrNull(); return result; } catch (TopiaException e) { throw new SammoaTechnicalException(e); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2014-05-16 08:16:53 UTC (rev 665) @@ -29,27 +29,25 @@ import fr.ulr.sammoa.application.io.CampaignStorage; import fr.ulr.sammoa.application.io.SammoaStorages; import fr.ulr.sammoa.persistence.Campaign; -import fr.ulr.sammoa.persistence.CampaignDAO; +import fr.ulr.sammoa.persistence.CampaignTopiaDao; import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.Observer; -import fr.ulr.sammoa.persistence.ObserverDAO; import fr.ulr.sammoa.persistence.ObserverPosition; -import fr.ulr.sammoa.persistence.ObserverPositionDAO; +import fr.ulr.sammoa.persistence.ObserverPositionTopiaDao; +import fr.ulr.sammoa.persistence.ObserverTopiaDao; import fr.ulr.sammoa.persistence.Observers; import fr.ulr.sammoa.persistence.Region; -import fr.ulr.sammoa.persistence.RegionDAO; -import fr.ulr.sammoa.persistence.SammoaDAOHelper; +import fr.ulr.sammoa.persistence.RegionTopiaDao; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.Sector; -import fr.ulr.sammoa.persistence.SectorDAO; +import fr.ulr.sammoa.persistence.SectorTopiaDao; import fr.ulr.sammoa.persistence.Species; -import fr.ulr.sammoa.persistence.SpeciesDAO; +import fr.ulr.sammoa.persistence.SpeciesTopiaDao; import fr.ulr.sammoa.persistence.Strate; -import fr.ulr.sammoa.persistence.StrateDAO; +import fr.ulr.sammoa.persistence.StrateTopiaDao; import fr.ulr.sammoa.persistence.Transect; -import fr.ulr.sammoa.persistence.TransectDAO; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; +import fr.ulr.sammoa.persistence.TransectTopiaDao; +import org.nuiton.topia.persistence.TopiaException; import java.io.File; import java.io.IOException; @@ -72,23 +70,23 @@ public List<Region> getRegions() { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - RegionDAO dao = SammoaDAOHelper.getRegionDAO(transaction); + RegionTopiaDao dao = transaction.getRegionDao(); List<Region> result = dao.findAll(); if (result.isEmpty()) { Region region = dao.createByNaturalId("FR-METRO"); - transaction.commitTransaction(); + transaction.commit(); result = Lists.newArrayList(region); } return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); } @@ -99,10 +97,10 @@ Preconditions.checkNotNull(region); Preconditions.checkNotNull(region.getCode()); - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - RegionDAO dao = SammoaDAOHelper.getRegionDAO(transaction); + RegionTopiaDao dao = transaction.getRegionDao(); String result; if (region.getTopiaId() == null) { @@ -124,11 +122,11 @@ dao.update(existRegion); } - transaction.commitTransaction(); + transaction.commit(); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); } @@ -141,14 +139,12 @@ public List<Species> getAllSpecies(Campaign campaign) { Preconditions.checkNotNull(campaign); - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - SpeciesDAO dao = SammoaDAOHelper.getSpeciesDAO(transaction); - List<Species> result = dao.findAllByRegion(campaign.getRegion()); + SpeciesTopiaDao dao = transaction.getSpeciesDao(); + List<Species> result = dao.forRegionEquals(campaign.getRegion()).findAll(); return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); } finally { endTransaction(transaction); } @@ -156,14 +152,12 @@ public Collection<Species> getAllValidSpecies() { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - SpeciesDAO dao = SammoaDAOHelper.getSpeciesDAO(transaction); - Collection<Species> result = dao.findAllByLocalCreation(false); + SpeciesTopiaDao dao = transaction.getSpeciesDao(); + Collection<Species> result = dao.forLocalCreationEquals(false).findAll(); return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); } finally { endTransaction(transaction); } @@ -175,25 +169,23 @@ public List<Campaign> getCampaigns() { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - CampaignDAO dao = SammoaDAOHelper.getCampaignDAO(transaction); + CampaignTopiaDao dao = transaction.getCampaignDao(); List<Campaign> result = - dao.findAllWithOrder(Campaign.PROPERTY_BEGIN_DATE + " DESC"); + dao.forAll().setOrderByArguments(Campaign.PROPERTY_BEGIN_DATE + " DESC").findAll(); return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); } finally { endTransaction(transaction); } } public Campaign getCampaignByNaturalId(Map<String, Object> naturalId) { - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { - CampaignDAO dao = SammoaDAOHelper.getCampaignDAO(tx); - Campaign result = dao.findByProperties(naturalId); + CampaignTopiaDao dao = tx.getCampaignDao(); + Campaign result = dao.forProperties(naturalId).findAnyOrNull(); return result; } catch (TopiaException e) { throw new SammoaTechnicalException(e); @@ -205,13 +197,13 @@ public Campaign getCampaign(String topiaId) { Preconditions.checkNotNull(topiaId); - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - CampaignDAO dao = SammoaDAOHelper.getCampaignDAO(transaction); + CampaignTopiaDao dao = transaction.getCampaignDao(); Campaign result = dao.findByTopiaId(topiaId); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); } @@ -226,10 +218,10 @@ Preconditions.checkNotNull(campaign.getCode()); Preconditions.checkNotNull(campaign.getRegion()); - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - CampaignDAO dao = SammoaDAOHelper.getCampaignDAO(transaction); + CampaignTopiaDao dao = transaction.getCampaignDao(); String result; @@ -261,7 +253,7 @@ dao.update(existCampaign); } - transaction.commitTransaction(); + transaction.commit(); if (createCampaign) { @@ -275,7 +267,7 @@ return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); } @@ -284,9 +276,9 @@ public void deleteCampaign(String campaignId) { Preconditions.checkNotNull(campaignId); - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { - CampaignDAO dao = SammoaDAOHelper.getCampaignDAO(tx); + CampaignTopiaDao dao = tx.getCampaignDao(); Campaign campaign = dao.findByTopiaId(campaignId); @@ -302,37 +294,36 @@ } // delete observers and observerPositions - ObserverDAO observerDAO = SammoaDAOHelper.getObserverDAO(tx); - List<Observer> observers = observerDAO.findAllByCampaign(campaign); - ObserverPositionDAO observerPositionDAO = - SammoaDAOHelper.getObserverPositionDAO(tx); + ObserverTopiaDao observerDAO = tx.getObserverDao(); + List<Observer> observers = observerDAO.forCampaignEquals(campaign).findAll(); + ObserverPositionTopiaDao observerPositionDAO = tx.getObserverPositionDao(); Set<ObserverPosition> positions = Sets.newHashSet(); for (Observer observer : observers) { - positions.addAll(observerPositionDAO.findAllByObserver(observer)); + positions.addAll(observerPositionDAO.forObserverEquals(observer).findAll()); } observerDAO.deleteAll(observers); observerPositionDAO.deleteAll(positions); // delete transects List<Transect> transects = getAllTransects(tx, campaign); - TransectDAO transectDAO = SammoaDAOHelper.getTransectDAO(tx); + TransectTopiaDao transectDAO = tx.getTransectDao(); transectDAO.deleteAll(transects); // delete strates List<Strate> strates = getAllStrates(tx, campaign); - StrateDAO strateDAO = SammoaDAOHelper.getStrateDAO(tx); + StrateTopiaDao strateDAO = tx.getStrateDao(); strateDAO.deleteAll(strates); // delete sectors - SectorDAO sectorDAO = SammoaDAOHelper.getSectorDAO(tx); - List<Sector> sectors = sectorDAO.findAllByCampaign(campaign); + SectorTopiaDao sectorDAO = tx.getSectorDao(); + List<Sector> sectors = sectorDAO.forCampaignEquals(campaign).findAll(); sectorDAO.deleteAll(sectors); // delete campaign dao.delete(campaign); // commit - tx.commitTransaction(); + tx.commit(); } catch (TopiaException e) { throw new SammoaTechnicalException(e); @@ -351,7 +342,7 @@ public List<Transect> getAllTransects(Campaign campaign) { Preconditions.checkNotNull(campaign); - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { List<Transect> result = getAllTransects(transaction, campaign); @@ -361,31 +352,31 @@ } } - public List<Transect> getAllTransects(TopiaContext tx, Campaign campaign) { + public List<Transect> getAllTransects(SammoaTopiaPersistenceContext tx, Campaign campaign) { Preconditions.checkNotNull(tx); Preconditions.checkNotNull(campaign); try { - TransectDAO dao = SammoaDAOHelper.getTransectDAO(tx); + TransectTopiaDao dao = tx.getTransectDao(); List<Transect> result = dao.findAllByCampaignOrderedByName(campaign); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } } public Transect getTransect(String transectId) { Preconditions.checkNotNull(transectId); - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - TransectDAO dao = SammoaDAOHelper.getTransectDAO(transaction); - Transect result = dao.findByTopiaId(transectId); + TransectTopiaDao dao = transaction.getTransectDao(); + Transect result = (Transect) dao.forTopiaIdEquals(transectId).findUniqueOrNull(); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); @@ -398,10 +389,10 @@ Preconditions.checkNotNull(transect.getName()); Preconditions.checkNotNull(transect.getStrate()); - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - TransectDAO dao = SammoaDAOHelper.getTransectDAO(transaction); + TransectTopiaDao dao = transaction.getTransectDao(); Transect existTransect = dao.findByNaturalId(transect.getName(), transect.getStrate()); @@ -411,12 +402,12 @@ transect.getStrate()); newTransect.setLocalCreation(true); - transaction.commitTransaction(); + transaction.commit(); String result = newTransect.getTopiaId(); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); } @@ -429,7 +420,7 @@ public List<Strate> getAllStrates(Campaign campaign) { Preconditions.checkNotNull(campaign); - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { List<Strate> result = getAllStrates(transaction, campaign); return result; @@ -439,16 +430,16 @@ } } - public List<Strate> getAllStrates(TopiaContext tx, Campaign campaign) { + public List<Strate> getAllStrates(SammoaTopiaPersistenceContext tx, Campaign campaign) { Preconditions.checkNotNull(tx); Preconditions.checkNotNull(campaign); try { - StrateDAO dao = SammoaDAOHelper.getStrateDAO(tx); + StrateTopiaDao dao = tx.getStrateDao(); List<Strate> result = dao.findAllByCampaignOrderedByCode(campaign); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } } @@ -459,19 +450,19 @@ public List<Observer> getAllObservers(Campaign campaign) { Preconditions.checkNotNull(campaign); - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - ObserverDAO dao = SammoaDAOHelper.getObserverDAO(transaction); - List<Observer> result = dao.findAllByCampaign(campaign); + ObserverTopiaDao dao = transaction.getObserverDao(); + List<Observer> result = dao.forCampaignEquals(campaign).findAll(); Collections.sort(result, Observers.onInitials()); // realy creating observers - transaction.commitTransaction(); + transaction.commit(); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); } @@ -481,9 +472,9 @@ public void deleteAllData() { Iterable<String> campaignIds; - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { - CampaignDAO dao = SammoaDAOHelper.getCampaignDAO(tx); + CampaignTopiaDao dao = tx.getCampaignDao(); campaignIds = dao.findAllIds(); } catch (TopiaException e) { throw new SammoaTechnicalException(e); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaApplicationConfigProvider.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaApplicationConfigProvider.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaApplicationConfigProvider.java 2014-05-16 08:16:53 UTC (rev 665) @@ -24,13 +24,16 @@ * #L% */ -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ApplicationConfigProvider; +import org.nuiton.config.ApplicationConfigProvider; +import org.nuiton.config.ConfigActionDef; +import org.nuiton.config.ConfigOptionDef; + import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; + /** * Application config provider (for site generation). * @@ -46,16 +49,16 @@ @Override public String getDescription(Locale locale) { - return l_(locale, "sammoa.application.config"); + return l(locale, "sammoa.application.config"); } @Override - public ApplicationConfig.OptionDef[] getOptions() { + public ConfigOptionDef[] getOptions() { return SammoaConfig.SammoaConfigOption.values(); } @Override - public ApplicationConfig.ActionDef[] getActions() { - return new ApplicationConfig.ActionDef[0]; + public ConfigActionDef[] getActions() { + return new ConfigActionDef[0]; } } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2014-05-16 08:16:53 UTC (rev 665) @@ -32,18 +32,19 @@ import fr.ulr.sammoa.persistence.AutoSaveListener; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; +import org.nuiton.config.ConfigOptionDef; import org.nuiton.util.Version; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.KeyStroke; +import javax.swing.*; import java.io.File; import java.io.IOException; import java.net.URL; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Sammoa application config @@ -295,52 +296,52 @@ * @author sletellier <letellier(a)codelutin.com> * @author fdesbois <fdesbois(a)codelutin.com> */ - public enum SammoaConfigOption implements ApplicationConfig.OptionDef { + public enum SammoaConfigOption implements ConfigOptionDef { /** Main directory where to put sammoa data (logs, and others...). */ DATA_DIRECTORY("sammoa.data.directory", - n_("sammoa.config.data.directory"), + n("sammoa.config.data.directory"), "${user.home}/.sammoa", File.class ), TMP_DIRECTORY("sammoa.tmp.directory", - n_("sammoa.config.tmp.directory"), + n("sammoa.config.tmp.directory"), "${java.io.tmpdir}/sammoa", File.class ), LOG_FILE("sammoa.logFile", - n_("sammoa.config.log.file"), + n("sammoa.config.log.file"), "${sammoa.data.directory}/log/sammoa.log", File.class ), UI_CONFIG_FILE("sammoa.ui.config", - n_("sammoa.config.ui.config"), + n("sammoa.config.ui.config"), "${sammoa.data.directory}/sammoaUI.xml", File.class ), VERSION("sammoa.version", - n_("sammoa.config.application.version"), + n("sammoa.config.application.version"), "", Version.class, false, true ), SITE_URL("sammoa.url", - n_("sammoa.config.application.site.url"), + n("sammoa.config.application.site.url"), "http://forge.codelutin.com/projects/sammoa", URL.class, false, true ), ORGANIZATION_NAME("sammoa.organizationName", - n_("sammoa.config.license.organizationName"), + n("sammoa.config.license.organizationName"), "", String.class, false, true ), INCEPTION_YEAR("sammoa.inceptionYear", - n_("sammoa.config.license.organizationName"), + n("sammoa.config.license.organizationName"), "2012", Integer.class, false, @@ -348,134 +349,134 @@ ), /** The id/name of the current system/computer */ SYSTEM_ID("sammoa.systemId", - n_("sammoa.config.system.id"), + n("sammoa.config.system.id"), "A", String.class ), /** The starting value to increment flight number */ FLIGHT_NUMBER("sammoa.flightNumber", - n_("sammoa.config.flight.number"), + n("sammoa.config.flight.number"), "0", Integer.class ), /** The backgroud shape file to display the world */ BACKGROUND_SHAPE_FILE("sammoa.backgroundShapeFile", - n_("sammoa.config.background.shape.file"), + n("sammoa.config.background.shape.file"), "shape/vmap_area_thin.shp", File.class ), /** The auto commit delay for {@link AutoSaveListener} */ AUTO_COMMIT_DELAY("sammoa.autoCommitDelay", - n_("sammoa.config.autoCommitDelay"), + n("sammoa.config.autoCommitDelay"), "30000", Long.class ), CAMPAIGN_ID("sammoa.campaignId", - n_("sammoa.config.campaign.id"), + n("sammoa.config.campaign.id"), null, Integer.class ), KEY_START("sammoa.ui." + PROPERTY_START, - n_("sammoa.config.ui.start"), + n("sammoa.config.ui.start"), "ctrl pressed B", KeyStroke.class, false, false), KEY_STOP("sammoa.ui." + PROPERTY_STOP, - n_("sammoa.config.ui.stop"), + n("sammoa.config.ui.stop"), "ctrl pressed E", KeyStroke.class, false, false), KEY_BEGIN("sammoa.ui." + PROPERTY_BEGIN, - n_("sammoa.config.ui.begin"), + n("sammoa.config.ui.begin"), "pressed F5", KeyStroke.class, false, false), KEY_END("sammoa.ui." + PROPERTY_END, - n_("sammoa.config.ui.end"), + n("sammoa.config.ui.end"), "pressed F9", KeyStroke.class, false, false), KEY_NEXT("sammoa.ui." + PROPERTY_NEXT, - n_("sammoa.config.ui.next"), + n("sammoa.config.ui.next"), "pressed F10", KeyStroke.class, false, false), KEY_ADD("sammoa.ui." + PROPERTY_ADD, - n_("sammoa.config.ui.add"), + n("sammoa.config.ui.add"), "pressed F7", KeyStroke.class, false, false), KEY_LEFT_OBSERVATION("sammoa.ui." + PROPERTY_LEFT_OBSERVATION, - n_("sammoa.config.ui.leftObservation"), + n("sammoa.config.ui.leftObservation"), "pressed F1", KeyStroke.class, false, false), KEY_CENTER_OBSERVATION("sammoa.ui." + PROPERTY_CENTER_OBSERVATION, - n_("sammoa.config.ui.centerObservation"), + n("sammoa.config.ui.centerObservation"), "pressed F3", KeyStroke.class, false, false), KEY_RIGHT_OBSERVATION("sammoa.ui." + PROPERTY_RIGHT_OBSERVATION, - n_("sammoa.config.ui.rightObservation"), + n("sammoa.config.ui.rightObservation"), "pressed F12", KeyStroke.class, false, false), KEY_CIRCLE_BACK("sammoa.ui." + PROPERTY_CIRCLE_BACK, - n_("sammoa.config.ui.circleBack"), + n("sammoa.config.ui.circleBack"), "pressed F11", KeyStroke.class, false, false), KEY_VALID_FLIGHT("sammoa.ui." + PROPERTY_VALID_FLIGHT, - n_("sammoa.config.ui.validFlight"), + n("sammoa.config.ui.validFlight"), "alt pressed F", KeyStroke.class, false, false), KEY_VALID_TRANSECT("sammoa.ui." + PROPERTY_VALID_TRANSECT, - n_("sammoa.config.ui.validTransect"), + n("sammoa.config.ui.validTransect"), "alt pressed T", KeyStroke.class, false, false), KEY_VALID_ROUTE("sammoa.ui." + PROPERTY_VALID_ROUTE, - n_("sammoa.config.ui.validRoute"), + n("sammoa.config.ui.validRoute"), "alt pressed R", KeyStroke.class, false, false), KEY_VALID_OBSERVATION("sammoa.ui." + PROPERTY_VALID_OBSERVATION, - n_("sammoa.config.ui.validObservation"), + n("sammoa.config.ui.validObservation"), "alt pressed O", KeyStroke.class, false, false), CSV_SEPARATOR("sammoa.csvSeparator", - n_("sammoa.config.csv.separator"), + n("sammoa.config.csv.separator"), ";", char.class); /** Configuration key. */ Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaServiceSupport.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaServiceSupport.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaServiceSupport.java 2014-05-16 08:16:53 UTC (rev 665) @@ -26,8 +26,8 @@ import fr.ulr.sammoa.application.io.CampaignStorage; import fr.ulr.sammoa.application.io.SammoaStorages; import fr.ulr.sammoa.persistence.SammoaPersistence; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import org.apache.commons.io.FileUtils; -import org.nuiton.topia.TopiaContext; import org.nuiton.util.ZipUtil; import java.io.File; @@ -72,12 +72,12 @@ return campaignStorage; } - protected TopiaContext beginTransaction() { - TopiaContext tx = persistence.beginTransaction(); - return tx; + protected SammoaTopiaPersistenceContext beginTransaction() { + SammoaTopiaPersistenceContext sammoaTopiaPersistenceContext = persistence.beginTransaction(); + return sammoaTopiaPersistenceContext; } - protected void endTransaction(TopiaContext tx) { + protected void endTransaction(SammoaTopiaPersistenceContext tx) { persistence.endTransaction(tx); } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ValidationService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ValidationService.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ValidationService.java 2014-05-16 08:16:53 UTC (rev 665) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -26,18 +26,16 @@ import com.google.common.collect.ImmutableList; import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.Observation; -import fr.ulr.sammoa.persistence.ObservationDAO; +import fr.ulr.sammoa.persistence.ObservationTopiaDao; import fr.ulr.sammoa.persistence.Observations; -import fr.ulr.sammoa.persistence.ObserverPositionDAO; +import fr.ulr.sammoa.persistence.ObserverPositionTopiaDao; import fr.ulr.sammoa.persistence.Route; -import fr.ulr.sammoa.persistence.RouteDAO; +import fr.ulr.sammoa.persistence.RouteTopiaDao; import fr.ulr.sammoa.persistence.Routes; -import fr.ulr.sammoa.persistence.SammoaDAOHelper; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.TransectFlight; -import fr.ulr.sammoa.persistence.TransectFlightDAO; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; +import fr.ulr.sammoa.persistence.TransectFlightTopiaDao; +import org.nuiton.topia.persistence.TopiaException; import java.util.List; @@ -52,10 +50,10 @@ List<Route> routes, boolean valid) { - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { - TransectFlightDAO transectFlightDAO = SammoaDAOHelper.getTransectFlightDAO(tx); + TransectFlightTopiaDao transectFlightDAO = tx.getTransectFlightDao(); // Valid all transectFlights List<TransectFlight> transectFlights = ImmutableList.copyOf(flight.getTransectFlight()); @@ -68,7 +66,7 @@ flight.getTransectFlight().set(i, transectFlight); } - RouteDAO routeDAO = SammoaDAOHelper.getRouteDAO(tx); + RouteTopiaDao routeDAO = tx.getRouteDao(); Iterable<Route> otherRoutes = Routes.filterWithNoTransectFlight(routes); for (Route otherRoute : otherRoutes) { @@ -76,10 +74,10 @@ validateRoute(tx, route, valid); } - tx.commitTransaction(); + tx.commit(); } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); + throw new TopiaException(ex); } finally { endTransaction(tx); } @@ -88,23 +86,23 @@ public TransectFlight validateTransectFlight(Flight flight, TransectFlight transectFlight) { - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { - TransectFlightDAO transectFlightDAO = SammoaDAOHelper.getTransectFlightDAO(tx); + TransectFlightTopiaDao transectFlightDAO = tx.getTransectFlightDao(); TransectFlight result = transectFlightDAO.findByTopiaId(transectFlight.getTopiaId()); boolean valid = !transectFlight.isValid(); validateTransectFlight(tx, flight, result, valid); - tx.commitTransaction(); + tx.commit(); transectFlight.setValid(valid); return result; } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); + throw new TopiaException(ex); } finally { endTransaction(tx); } @@ -112,23 +110,23 @@ public Route validateRoute(Route route) { - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { - RouteDAO routeDAO = SammoaDAOHelper.getRouteDAO(tx); + RouteTopiaDao routeDAO = tx.getRouteDao(); Route result = routeDAO.findByTopiaId(route.getTopiaId()); boolean valid = !route.isValid(); validateRoute(tx, result, valid); - tx.commitTransaction(); + tx.commit(); route.setValid(valid); return result; } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); + throw new TopiaException(ex); } finally { endTransaction(tx); } @@ -136,10 +134,10 @@ public Observation validateObservation(Observation observation) { - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { - ObservationDAO dao = SammoaDAOHelper.getObservationDAO(tx); + ObservationTopiaDao dao = tx.getObservationDao(); Observation result = dao.findByTopiaId(observation.getTopiaId()); @@ -147,19 +145,19 @@ validateObservation(tx, result, valid); - tx.commitTransaction(); + tx.commit(); observation.setValid(valid); return result; } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); + throw new TopiaException(ex); } finally { endTransaction(tx); } } - protected void validateTransectFlight(TopiaContext tx, + protected void validateTransectFlight(SammoaTopiaPersistenceContext tx, Flight flight, TransectFlight transectFlight, boolean valid) @@ -172,10 +170,10 @@ } else { - TransectFlightDAO transectFlightDAO = SammoaDAOHelper.getTransectFlightDAO(tx); + TransectFlightTopiaDao transectFlightDAO = tx.getTransectFlightDao(); - RouteDAO routeDAO = SammoaDAOHelper.getRouteDAO(tx); - List<Route> routes = routeDAO.findAllByTransectFlight(transectFlight); + RouteTopiaDao routeDAO = tx.getRouteDao(); + List<Route> routes = routeDAO.forTransectFlightEquals(transectFlight).findAll(); for (Route route : routes) { validateRoute(tx, route, valid); @@ -186,16 +184,16 @@ } } - protected void validateRoute(TopiaContext tx, + protected void validateRoute(SammoaTopiaPersistenceContext tx, Route route, boolean valid) throws TopiaException { - RouteDAO routeDAO = SammoaDAOHelper.getRouteDAO(tx); + RouteTopiaDao routeDAO = tx.getRouteDao(); if (route.isDeleted()) { - ObserverPositionDAO observerPositionDAO = SammoaDAOHelper.getObserverPositionDAO(tx); + ObserverPositionTopiaDao observerPositionDAO = tx.getObserverPositionDao(); observerPositionDAO.deleteAll(route.getObserverPosition()); routeDAO.delete(route); @@ -204,10 +202,10 @@ Flight flight = route.getFlight(); - List<Route> routes = routeDAO.findAllByFlight(flight); + List<Route> routes = routeDAO.forFlightEquals(flight).findAll(); - ObservationDAO observationDAO = SammoaDAOHelper.getObservationDAO(tx); - List<Observation> observations = observationDAO.findAllByFlight(flight); + ObservationTopiaDao observationDAO = tx.getObservationDao(); + List<Observation> observations = observationDAO.forFlightEquals(flight).findAll(); Iterable<Observation> routeObservations = Observations.filterInRoute(observations, route, routes, true); @@ -221,12 +219,12 @@ } } - protected void validateObservation(TopiaContext tx, + protected void validateObservation(SammoaTopiaPersistenceContext tx, Observation observation, boolean valid) throws TopiaException { - ObservationDAO dao = SammoaDAOHelper.getObservationDAO(tx); + ObservationTopiaDao dao = tx.getObservationDao(); if (observation.isDeleted()) { Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceManagerProvider.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceManagerProvider.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceManagerProvider.java 2014-05-16 08:16:53 UTC (rev 665) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioConfig.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioConfig.java 2014-05-16 08:16:53 UTC (rev 665) @@ -24,9 +24,10 @@ */ -import org.nuiton.util.ApplicationConfig; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ConfigOptionDef; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Created: 18/06/12 @@ -66,33 +67,33 @@ return result; } - public enum AudioConfigOption implements ApplicationConfig.OptionDef { + public enum AudioConfigOption implements ConfigOptionDef { /** Sampel rate to record audio */ COMPRESSION( "sammoa.audio.compression", - n_("sammoa.config.audio.compression"), + n("sammoa.config.audio.compression"), "ULAW", String.class ), /** Sampel rate to record audio */ SAMPLE_RATE( "sammoa.audio.sampleRate", - n_("sammoa.config.audio.sampleRate"), + n("sammoa.config.audio.sampleRate"), "8000", Float.class ), /** Period time in seconds for each check of the gps to update location */ SAMPLE_SIZE_IN_BITS( "sammoa.audio.sampleSizeInBits", - n_("sammoa.config.audio.sampleSizeInBits"), + n("sammoa.config.audio.sampleSizeInBits"), "16", Integer.class ), /** Time in seconds between each record, this will record in multiple files */ RECORD_DELAY_IN_SECONDS( "sammoa.audio.recordDelayInSeconds", - n_("sammoa.config.audio.recordDelayInSeconds"), + n("sammoa.config.audio.recordDelayInSeconds"), "0", Integer.class ); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java 2014-05-16 08:16:53 UTC (rev 665) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java 2014-05-16 08:16:53 UTC (rev 665) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GPSNRSerialDevice.java 2014-05-16 08:16:53 UTC (rev 665) @@ -3,8 +3,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsConfig.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsConfig.java 2014-05-16 08:16:53 UTC (rev 665) @@ -25,9 +25,10 @@ import com.google.common.base.Preconditions; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ConfigOptionDef; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Created: 18/06/12 @@ -87,35 +88,35 @@ return result; } - public enum GpsConfigOption implements ApplicationConfig.OptionDef { + public enum GpsConfigOption implements ConfigOptionDef { /** Implementation class for GpsHandler */ GPS_HANDLER("sammoa.gps.handler", - n_("sammoa.config.gps.handler"), + n("sammoa.config.gps.handler"), GpsHandlerGpsylon.class.getName(), Class.class ), /** Period time in seconds for each check of the gps to update location */ GPS_CHECK_PERIOD("sammoa.gps.checkPeriod", - n_("sammoa.config.gps.check.period"), + n("sammoa.config.gps.check.period"), "2", Integer.class ), /** Time in seconds before timeout (ERROR, UNAVAILABLE) */ GPS_TIMEOUT("sammoa.gps.timeout", - n_("sammoa.config.gps.timeout"), + n("sammoa.config.gps.timeout"), "10", Integer.class ), /** GPS Device name ex: /dev/ttyUSB0 or /dev/ttyS1 or COM5 */ GPS_DEVICE("sammoa.gps.device", - n_("sammoa.config.gps.device"), + n("sammoa.config.gps.device"), "COM1", String.class ), /** GPS data speed */ GPS_SPEED("sammoa.gps.speed", - n_("sammoa.config.gps.speed"), + n("sammoa.config.gps.speed"), "4800", Integer.class ); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/BaseFlightController.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/BaseFlightController.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/BaseFlightController.java 2014-05-16 08:16:53 UTC (rev 665) @@ -34,20 +34,18 @@ import fr.ulr.sammoa.application.io.FlightStorage; import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; -import fr.ulr.sammoa.persistence.FlightDAO; +import fr.ulr.sammoa.persistence.FlightTopiaDao; import fr.ulr.sammoa.persistence.GeoPoint; import fr.ulr.sammoa.persistence.Observation; -import fr.ulr.sammoa.persistence.ObservationDAO; import fr.ulr.sammoa.persistence.ObservationStatus; +import fr.ulr.sammoa.persistence.ObservationTopiaDao; import fr.ulr.sammoa.persistence.Position; import fr.ulr.sammoa.persistence.Route; import fr.ulr.sammoa.persistence.RouteType; import fr.ulr.sammoa.persistence.Routes; -import fr.ulr.sammoa.persistence.SammoaDAOHelper; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.TransectFlight; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.TimeLog; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,7 +88,7 @@ listeners = Sets.newHashSet(); } - protected abstract GeoPoint getLocation(TopiaContext tx) throws TopiaException; + protected abstract GeoPoint getLocation(SammoaTopiaPersistenceContext tx) throws TopiaException; @Override public void addFlightControllerListener(FlightControllerListener listener) { @@ -203,7 +201,7 @@ Preconditions.checkState( isWaiting(), "You can call start() only if flight is waiting (not started, not ended)"); - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { GeoPoint geoPoint = getLocation(tx); @@ -228,7 +226,7 @@ state = FlightState.OFF_EFFORT; - tx.commitTransaction(); + tx.commit(); startTime = timeLog.log(startTime, "start()", "Commited"); @@ -240,7 +238,7 @@ timeLog.log(startTime, "start()", "Fired"); } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(tx); @@ -360,7 +358,7 @@ "You can't call begin() if no transect is selected or if it is " + "deleted. Call setNextTransect() method first"); - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { GeoPoint geoPoint = getLocation(tx); @@ -383,7 +381,7 @@ state = FlightState.ON_EFFORT; - tx.commitTransaction(); + tx.commit(); startTime = timeLog.log(startTime, "begin()", "Commited"); @@ -396,7 +394,7 @@ timeLog.log(startTime, "begin()", "Fired"); } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(tx); @@ -417,7 +415,7 @@ "You can't call circleBack() during TRANSIT"); - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { GeoPoint geoPoint = getLocation(tx); @@ -437,7 +435,7 @@ state = FlightState.OFF_EFFORT; - tx.commitTransaction(); + tx.commit(); startTime = timeLog.log(startTime, "circleBack()", "Commited"); @@ -449,7 +447,7 @@ timeLog.log(startTime, "circleBack()", "Fired"); } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(tx); @@ -467,7 +465,7 @@ Preconditions.checkState( isOnEffort(), "You can call add() only if flight is on effort (started, not ended, on effort)"); - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { GeoPoint geoPoint = getLocation(tx); @@ -481,7 +479,7 @@ Route previousRoute = currentRoute; currentRoute = service.createLeg(tx, flight, currentDate, previousRoute, currentTransect); - tx.commitTransaction(); + tx.commit(); startTime = timeLog.log(startTime, "add()", "Commited"); @@ -491,7 +489,7 @@ timeLog.log(startTime, "add()", "Fired"); } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(tx); @@ -523,7 +521,7 @@ Preconditions.checkState( isRunning(), "You can call observation() only if flight is running (started, not ended)"); - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { GeoPoint geoPoint = getLocation(tx); @@ -538,7 +536,7 @@ } Observation observation = service.createObservation(tx, flight, currentDate, position); - tx.commitTransaction(); + tx.commit(); startTime = timeLog.log(startTime, "observation()", "Commited"); @@ -546,9 +544,6 @@ timeLog.log(startTime, "observation()", "Fired"); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } finally { endTransaction(tx); } @@ -565,7 +560,7 @@ Preconditions.checkState( isOnEffort(), "You can call end() only if flight is on effort (started, not ended, on effort)"); - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { GeoPoint geoPoint = getLocation(tx); @@ -584,7 +579,7 @@ state = FlightState.OFF_EFFORT; - tx.commitTransaction(); + tx.commit(); // Fire events after commit onRouteAdded(previousRoute, currentRoute); @@ -593,7 +588,7 @@ onStateChanged(state); } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(tx); @@ -613,7 +608,7 @@ Preconditions.checkState( isOffEffort() && flight.getEndDate() == null, "You can call stop() only if flight is running (started, not ended, not on effort)"); - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { GeoPoint geoPoint = getLocation(tx); @@ -634,7 +629,7 @@ state = FlightState.ENDED; - tx.commitTransaction(); + tx.commit(); startTime = timeLog.log(startTime, "stop()", "Commited"); @@ -646,7 +641,7 @@ timeLog.log(startTime, "stop()", "Fired"); } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(tx); @@ -659,33 +654,32 @@ persistence.stopAutoSaveListener(); } - protected void setFlightBeginDate(TopiaContext tx, + protected void setFlightBeginDate(SammoaTopiaPersistenceContext tx, Flight flight, Date beginDate) throws TopiaException { - FlightDAO flightDAO = SammoaDAOHelper.getFlightDAO(tx); + FlightTopiaDao flightDAO = tx.getFlightDao(); flight.setBeginDate(beginDate); flightDAO.update(flight); } - protected void setFlightEndDate(TopiaContext tx, + protected void setFlightEndDate(SammoaTopiaPersistenceContext tx, Flight flight, Date endDate) throws TopiaException { - FlightDAO flightDAO = SammoaDAOHelper.getFlightDAO(tx); + FlightTopiaDao flightDAO = tx.getFlightDao(); flight.setEndDate(endDate); flightDAO.update(flight); } - protected void setObservationStatus(TopiaContext tx, + protected void setObservationStatus(SammoaTopiaPersistenceContext tx, Observation observation, ObservationStatus status) throws TopiaException { - ObservationDAO observationDAO = - SammoaDAOHelper.getObservationDAO(tx); + ObservationTopiaDao observationDAO = tx.getObservationDao(); observation.setObservationStatus(status); observationDAO.update(observation); } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java 2014-05-16 08:16:53 UTC (rev 665) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -35,10 +35,9 @@ import fr.ulr.sammoa.persistence.GeoPoint; import fr.ulr.sammoa.persistence.GeoPoints; import fr.ulr.sammoa.persistence.RouteType; -import fr.ulr.sammoa.persistence.SammoaDAOHelper; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.TransectFlight; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -131,7 +130,7 @@ } @Override - protected GeoPoint getLocation(TopiaContext tx) throws TopiaException { + protected GeoPoint getLocation(SammoaTopiaPersistenceContext tx) throws TopiaException { GeoPoint gpsLocation = getGpsHandler().getCurrentLocation(); GeoPoint result = geoPoints.get(gpsLocation.getRecordTime()); if (result == null) { @@ -139,7 +138,7 @@ if (logger.isDebugEnabled()) { logger.debug("Create a GeoPoint {}", gpsLocation); } - result = SammoaDAOHelper.getGeoPointDAO(tx).create(gpsLocation); + result = tx.getGeoPointDao().create(gpsLocation); geoPoints.put(result.getRecordTime(), result); } return result; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java 2014-05-16 08:16:53 UTC (rev 665) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -32,11 +32,11 @@ import fr.ulr.sammoa.persistence.GeoPoint; import fr.ulr.sammoa.persistence.Route; import fr.ulr.sammoa.persistence.Routes; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.TransectFlight; import fr.ulr.sammoa.persistence.TransectFlights; import org.joda.time.DateTime; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,7 +77,7 @@ } @Override - protected GeoPoint getLocation(TopiaContext tx) throws TopiaException { + protected GeoPoint getLocation(SammoaTopiaPersistenceContext tx) throws TopiaException { Preconditions.checkNotNull(currentRoute, "You must set the current route to retrieve location"); Preconditions.checkState(!geoPoints.isEmpty(), "No geoPoints available"); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/CampaignStorage.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/CampaignStorage.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/CampaignStorage.java 2014-05-16 08:16:53 UTC (rev 665) @@ -36,7 +36,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.DirectoryFileFilter; import org.apache.commons.lang3.builder.ToStringBuilder; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/FlightStorage.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/FlightStorage.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/FlightStorage.java 2014-05-16 08:16:53 UTC (rev 665) @@ -31,7 +31,7 @@ import fr.ulr.sammoa.persistence.Region; import fr.ulr.sammoa.persistence.TransectFlight; import org.apache.commons.lang3.builder.ToStringBuilder; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import java.io.File; import java.util.Map; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/ImportApplicationService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/ImportApplicationService.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/ImportApplicationService.java 2014-05-16 08:16:53 UTC (rev 665) @@ -41,15 +41,15 @@ import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.SammoaDbMeta; import fr.ulr.sammoa.persistence.SammoaEntityEnum; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import org.apache.commons.io.Charsets; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.DirectoryFileFilter; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.csv.in.TopiaCsvImports; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.MetaFilenameAware; import org.nuiton.topia.persistence.metadata.TableMeta; +import org.nuiton.topia.service.csv.in.TopiaCsvImports; import org.nuiton.util.TimeLog; import org.nuiton.util.ZipUtil; import org.slf4j.Logger; @@ -138,7 +138,7 @@ protected void importDb(ImportApplicationModel model) { - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext sammoaTopiaPersistenceContext = beginTransaction(); try { @@ -152,11 +152,11 @@ Iterable<String> flightToRemoveIds = model.getFlightToRemoveIds(); for (String flightId : flightToRemoveIds) { - flightService.deleteFlightInDb(tx, flightId); + flightService.deleteFlightInDb(sammoaTopiaPersistenceContext, flightId); } } - persistence.flushTransaction(tx); + persistence.flushTransaction(sammoaTopiaPersistenceContext); startTime = timeLog.log(startTime, "importDb", "after flights delete"); @@ -176,23 +176,23 @@ SammoaImportModelFactory modelFactory = new SammoaImportModelFactory(config.getCsvSeparator(), - tx, + sammoaTopiaPersistenceContext, dbMetas); try { - importReferentials(tx, modelFactory, tableMap); + importReferentials(sammoaTopiaPersistenceContext, modelFactory, tableMap); startTime = timeLog.log(startTime, "importDb", "after referential import"); DataImportStrategy strategy = new DataImportStrategy( - modelFactory, tx, persistence.getPersistenceHelper() + modelFactory, sammoaTopiaPersistenceContext, persistence.getPersistenceHelper() ); for (String flightId : model.getFlightIds()) { FlightStorage flightStorage = storage.getFlightStorage(flightId); - importFlight(tx, + importFlight(sammoaTopiaPersistenceContext, dbMetas, strategy, flightStorage); @@ -201,7 +201,7 @@ modelFactory.close(); } - tx.commitTransaction(); + sammoaTopiaPersistenceContext.commit(); timeLog.log(startTime, "importDb", "after data import"); @@ -210,11 +210,11 @@ } catch (IOException e) { throw new SammoaTechnicalException("Could not import", e); } finally { - endTransaction(tx); + endTransaction(sammoaTopiaPersistenceContext); } } - private void importFlight(TopiaContext tx, + private void importFlight(SammoaTopiaPersistenceContext tx, SammoaDbMeta dbMetas, DataImportStrategy strategy, FlightStorage storage) throws IOException, TopiaException { @@ -256,7 +256,7 @@ } } - private void importReferentials(TopiaContext tx, + private void importReferentials(SammoaTopiaPersistenceContext tx, SammoaImportModelFactory modelFactory, Map<TableMeta<SammoaEntityEnum>, File> tableMap) throws IOException, TopiaException { Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/SammoaImportModelFactory.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/SammoaImportModelFactory.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/SammoaImportModelFactory.java 2014-05-16 08:16:53 UTC (rev 665) @@ -26,19 +26,18 @@ import com.google.common.collect.Maps; import fr.ulr.sammoa.persistence.SammoaDbMeta; import fr.ulr.sammoa.persistence.SammoaEntityEnum; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportModel; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.csv.EntityCsvModel; -import org.nuiton.topia.persistence.csv.TopiaCsvCommons; -import org.nuiton.topia.persistence.csv.in.EntityAssociationImportModel; -import org.nuiton.topia.persistence.csv.in.ImportModelFactory; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.ColumnMeta; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportModel; +import org.nuiton.topia.service.csv.EntityCsvModel; +import org.nuiton.topia.service.csv.TopiaCsvCommons; +import org.nuiton.topia.service.csv.in.EntityAssociationImportModel; +import org.nuiton.topia.service.csv.in.ImportModelFactory; import java.io.Reader; import java.util.Date; @@ -57,12 +56,12 @@ private final Map<SammoaEntityEnum, Map<String, TopiaEntity>> universe; - private final TopiaContext tx; + private final SammoaTopiaPersistenceContext tx; private final SammoaDbMeta dbMetas; SammoaImportModelFactory(char csvSeparator, - TopiaContext tx, + SammoaTopiaPersistenceContext tx, SammoaDbMeta dbMetas) { this.dbMetas = dbMetas; this.universe = Maps.newTreeMap(); @@ -86,7 +85,7 @@ EntityCsvModel<SammoaEntityEnum, E> model = EntityCsvModel.newModel( csvSeparator, meta, - TopiaEntity.TOPIA_ID + TopiaEntity.PROPERTY_TOPIA_ID ); for (ColumnMeta columnMeta : meta) { @@ -115,10 +114,10 @@ // foreign keys on data are always coming from db try { - List<TopiaEntity> entities = dbMetas.getPersistenceHelper().getDAO(tx, entityType).findAll(); + List<TopiaEntity> entities = tx.getDao(entityType).findAll(); model.addForeignKeyForImport(propertyName, entityType, entities); } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } } } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java 2014-05-16 08:16:53 UTC (rev 665) @@ -26,16 +26,16 @@ import fr.ulr.sammoa.application.io.input.application.SammoaImportModelFactory; import fr.ulr.sammoa.persistence.SammoaEntityEnum; import fr.ulr.sammoa.persistence.SammoaPersistenceHelper; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportToMap; +import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.csv.in.CsvImportResult; -import org.nuiton.topia.persistence.csv.in.ImportStrategy; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportToMap; +import org.nuiton.topia.service.csv.in.CsvImportResult; +import org.nuiton.topia.service.csv.in.ImportStrategy; /** * Base import stragey for sammo application import. @@ -45,14 +45,14 @@ */ abstract class AbstractImportStrategy implements ImportStrategy<SammoaEntityEnum> { - private final TopiaContext tx; + private final SammoaTopiaPersistenceContext tx; private final SammoaPersistenceHelper persistenceHelper; private final SammoaImportModelFactory modelFactory; AbstractImportStrategy(SammoaImportModelFactory modelFactory, - TopiaContext tx, + SammoaTopiaPersistenceContext tx, SammoaPersistenceHelper persistenceHelper) { this.tx = tx; this.persistenceHelper = persistenceHelper; @@ -84,16 +84,16 @@ throw new UnsupportedOperationException(); } - protected TopiaContext getTx() { + protected SammoaTopiaPersistenceContext getTx() { return tx; } - protected <E extends TopiaEntity> TopiaDAO<E> getDAO(SammoaEntityEnum type) { - return persistenceHelper.getDAO(tx, type); + protected <E extends TopiaEntity> TopiaDao<? extends TopiaEntity> getDAO(SammoaEntityEnum type) { + return tx.getDao(type.getContract()); } protected void flushTransaction() throws TopiaException { - persistenceHelper.flushTransaction(tx); + tx.getHibernateSupport().getHibernateSession().flush();; } } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/DataImportStrategy.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/DataImportStrategy.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/DataImportStrategy.java 2014-05-16 08:16:53 UTC (rev 665) @@ -24,21 +24,20 @@ */ import fr.ulr.sammoa.application.io.input.application.SammoaImportModelFactory; -import fr.ulr.sammoa.persistence.SammoaDAOHelper; import fr.ulr.sammoa.persistence.SammoaEntityEnum; import fr.ulr.sammoa.persistence.SammoaPersistenceHelper; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.TransectFlight; -import fr.ulr.sammoa.persistence.TransectFlightDAO; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; +import fr.ulr.sammoa.persistence.TransectFlightTopiaDao; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportToMap; +import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.csv.in.CsvImportResult; -import org.nuiton.topia.persistence.csv.in.TopiaCsvImports; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportToMap; +import org.nuiton.topia.service.csv.in.CsvImportResult; +import org.nuiton.topia.service.csv.in.TopiaCsvImports; import java.util.Map; @@ -51,7 +50,7 @@ public class DataImportStrategy extends AbstractImportStrategy { public DataImportStrategy(SammoaImportModelFactory modelFactory, - TopiaContext tx, + SammoaTopiaPersistenceContext tx, SammoaPersistenceHelper persistenceHelper) { super(modelFactory, tx, persistenceHelper); } @@ -62,11 +61,11 @@ if (meta.getSource() != SammoaEntityEnum.TransectFlight) { - TopiaDAO<E> dao = getDAO(meta.getSource()); + TopiaDao dao = getDAO(meta.getSource()); TopiaCsvImports.importAllEntities(dao, meta, importer, csvResult); } else { - TransectFlightDAO dao = SammoaDAOHelper.getTransectFlightDAO(getTx()); + TransectFlightTopiaDao dao = getTx().getTransectFlightDao(); // import transect flights Iterable<TransectFlight> transectFlights = @@ -99,14 +98,14 @@ getModelFactory().getUniverse().get(target); if (nmAssociationMeta) { - TopiaCsvImports.importNMAssociation(getTx(), + TopiaCsvImports.importNMAssociation(getTx().getSqlSupport(), meta, targetUniverse, importer, csvResult, 1000); } else { - TopiaCsvImports.importAssociation(getTx(), + TopiaCsvImports.importAssociation(getTx().getSqlSupport(), meta, targetUniverse, importer, @@ -117,13 +116,13 @@ } else { if (nmAssociationMeta) { - TopiaCsvImports.importNMAssociation(getTx(), + TopiaCsvImports.importNMAssociation(getTx().getSqlSupport(), meta, importer, csvResult, 1000); } else { - TopiaCsvImports.importAssociation(getTx(), + TopiaCsvImports.importAssociation(getTx().getSqlSupport(), meta, importer, csvResult, Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/ReferentialImportStrategy.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/ReferentialImportStrategy.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/ReferentialImportStrategy.java 2014-05-16 08:16:53 UTC (rev 665) @@ -27,14 +27,14 @@ import fr.ulr.sammoa.application.io.input.application.SammoaImportModelFactory; import fr.ulr.sammoa.persistence.SammoaEntityEnum; import fr.ulr.sammoa.persistence.SammoaPersistenceHelper; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; +import org.nuiton.csv.Import; +import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.csv.in.CsvImportResult; -import org.nuiton.topia.persistence.csv.in.TopiaCsvImports; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.Import; +import org.nuiton.topia.service.csv.in.CsvImportResult; +import org.nuiton.topia.service.csv.in.TopiaCsvImports; import java.util.Map; @@ -50,7 +50,7 @@ public class ReferentialImportStrategy extends AbstractImportStrategy { public ReferentialImportStrategy(SammoaImportModelFactory modelFactory, - TopiaContext tx, + SammoaTopiaPersistenceContext tx, SammoaPersistenceHelper persistenceHelper) { super(modelFactory, tx, persistenceHelper); } @@ -58,7 +58,7 @@ @Override public <E extends TopiaEntity> void importTable(TableMeta<SammoaEntityEnum> meta, Import<E> importer, CsvImportResult<SammoaEntityEnum> csvResult) throws TopiaException { - TopiaDAO<E> dao = getDAO(meta.getSource()); + TopiaDao dao = getDAO(meta.getSource()); SammoaEntityEnum entityEnum = meta.getSource(); @@ -69,10 +69,10 @@ getModelFactory().getUniverse().put(entityEnum, universe); TopiaCsvImports.importNotExistingEntities(dao, - meta, - universe, - importer, - csvResult); + meta, + universe, + importer, + csvResult); } } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java 2014-05-16 08:16:53 UTC (rev 665) @@ -27,20 +27,18 @@ import com.google.common.io.Files; import fr.ulr.sammoa.application.SammoaServiceSupport; import fr.ulr.sammoa.persistence.Campaign; -import fr.ulr.sammoa.persistence.CampaignDAO; +import fr.ulr.sammoa.persistence.CampaignTopiaDao; import fr.ulr.sammoa.persistence.Observer; -import fr.ulr.sammoa.persistence.ObserverDAO; +import fr.ulr.sammoa.persistence.ObserverTopiaDao; import fr.ulr.sammoa.persistence.Region; -import fr.ulr.sammoa.persistence.RegionDAO; -import fr.ulr.sammoa.persistence.SammoaDAOHelper; +import fr.ulr.sammoa.persistence.RegionTopiaDao; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.Species; -import fr.ulr.sammoa.persistence.SpeciesDAO; +import fr.ulr.sammoa.persistence.SpeciesTopiaDao; import org.apache.commons.io.Charsets; import org.apache.commons.io.IOUtils; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.util.csv.Import; +import org.nuiton.csv.Import; +import org.nuiton.topia.persistence.TopiaException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,15 +63,15 @@ try { int result = 0; - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - RegionDAO regionDAO = SammoaDAOHelper.getRegionDAO(transaction); + RegionTopiaDao regionDAO = transaction.getRegionDao(); Region region = regionDAO.findByTopiaId(regionId); Preconditions.checkNotNull(region); String regionCode = region.getCode(); - SpeciesDAO dao = SammoaDAOHelper.getSpeciesDAO(transaction); + SpeciesTopiaDao dao = transaction.getSpeciesDao(); SpeciesImportModel model = new SpeciesImportModel(region); @@ -88,10 +86,10 @@ } } - transaction.commitTransaction(); + transaction.commit(); } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); @@ -109,15 +107,15 @@ try { int result = 0; - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - CampaignDAO campaignDAO = SammoaDAOHelper.getCampaignDAO(transaction); + CampaignTopiaDao campaignDAO = transaction.getCampaignDao(); Campaign campaign = campaignDAO.findByTopiaId(campaignId); Preconditions.checkNotNull(campaign); String campaignCode = campaign.getCode(); - ObserverDAO dao = SammoaDAOHelper.getObserverDAO(transaction); + ObserverTopiaDao dao = transaction.getObserverDao(); ObserverImportModel model = new ObserverImportModel(campaign); @@ -132,10 +130,10 @@ } } - transaction.commitTransaction(); + transaction.commit(); } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); @@ -147,7 +145,7 @@ } } - protected boolean importSpecies(SpeciesDAO dao, + protected boolean importSpecies(SpeciesTopiaDao dao, Species species, String regionCode) throws TopiaException { // while importing a species, it does become valid @@ -189,7 +187,7 @@ return newSpecies; } - protected boolean importObserver(ObserverDAO dao, + protected boolean importObserver(ObserverTopiaDao dao, Observer observer, String campaignCode) throws TopiaException { boolean newEntity = false; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ObserverImportModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ObserverImportModel.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ObserverImportModel.java 2014-05-16 08:16:53 UTC (rev 665) @@ -27,9 +27,9 @@ import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Observer; import fr.ulr.sammoa.persistence.ObserverImpl; -import org.nuiton.util.csv.Common; -import org.nuiton.util.csv.ValueParser; -import org.nuiton.util.csv.ext.AbstractImportModel; +import org.nuiton.csv.Common; +import org.nuiton.csv.ValueParser; +import org.nuiton.csv.ext.AbstractImportModel; import java.text.ParseException; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/SpeciesImportModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/SpeciesImportModel.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/SpeciesImportModel.java 2014-05-16 08:16:53 UTC (rev 665) @@ -27,8 +27,8 @@ import fr.ulr.sammoa.persistence.Region; import fr.ulr.sammoa.persistence.Species; import fr.ulr.sammoa.persistence.SpeciesImpl; -import org.nuiton.util.csv.ValueParser; -import org.nuiton.util.csv.ext.AbstractImportModel; +import org.nuiton.csv.ValueParser; +import org.nuiton.csv.ext.AbstractImportModel; import java.text.ParseException; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/DbfImport.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/DbfImport.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/DbfImport.java 2014-05-16 08:16:53 UTC (rev 665) @@ -26,10 +26,10 @@ import com.bbn.openmap.dataAccess.shape.DbfTableModel; import com.google.common.base.Throwables; import com.google.common.collect.Lists; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportRuntimeException; -import org.nuiton.util.csv.ImportableColumn; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportModel; +import org.nuiton.csv.ImportRuntimeException; +import org.nuiton.csv.ImportableColumn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +39,7 @@ import java.util.Iterator; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 25/07/12 @@ -92,7 +92,7 @@ } catch (Exception e) { throw new ImportRuntimeException( - _("sammoa.dbf.import.error.unableToReadField", + t("sammoa.dbf.import.error.unableToReadField", field.getHeaderName(), lineNumber), e); } } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/DoubleToIntegerValueParser.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/DoubleToIntegerValueParser.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/DoubleToIntegerValueParser.java 2014-05-16 08:16:53 UTC (rev 665) @@ -23,8 +23,9 @@ * #L% */ -import org.nuiton.util.csv.ValueParser; +import org.nuiton.csv.ValueParser; + import java.text.ParseException; /** Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ImportMapService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ImportMapService.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ImportMapService.java 2014-05-16 08:16:53 UTC (rev 665) @@ -27,21 +27,19 @@ import com.google.common.collect.Maps; import fr.ulr.sammoa.application.SammoaServiceSupport; import fr.ulr.sammoa.persistence.Campaign; -import fr.ulr.sammoa.persistence.CampaignDAO; -import fr.ulr.sammoa.persistence.SammoaDAOHelper; +import fr.ulr.sammoa.persistence.CampaignTopiaDao; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.Sector; -import fr.ulr.sammoa.persistence.SectorDAO; +import fr.ulr.sammoa.persistence.SectorTopiaDao; import fr.ulr.sammoa.persistence.Sectors; import fr.ulr.sammoa.persistence.Strate; -import fr.ulr.sammoa.persistence.StrateDAO; +import fr.ulr.sammoa.persistence.StrateTopiaDao; import fr.ulr.sammoa.persistence.StrateType; import fr.ulr.sammoa.persistence.Strates; import fr.ulr.sammoa.persistence.Transect; -import fr.ulr.sammoa.persistence.TransectDAO; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.util.csv.ImportRuntimeException; +import fr.ulr.sammoa.persistence.TransectTopiaDao; +import org.nuiton.csv.ImportRuntimeException; +import org.nuiton.topia.persistence.TopiaException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,19 +60,18 @@ public int importTransects(String campaignId, Iterable<Transect> transects) { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - CampaignDAO campaignDAO = - SammoaDAOHelper.getCampaignDAO(transaction); + CampaignTopiaDao campaignDAO = transaction.getCampaignDao(); Campaign campaign = campaignDAO.findByTopiaId(campaignId); Preconditions.checkArgument(campaign != null, "The topiaId : " + campaignId + " doesn't match any existing campaign"); - StrateDAO strateDAO = SammoaDAOHelper.getStrateDAO(transaction); - TransectDAO transectDAO = SammoaDAOHelper.getTransectDAO(transaction); + StrateTopiaDao strateDAO = transaction.getStrateDao(); + TransectTopiaDao transectDAO = transaction.getTransectDao(); // Retrieve directly all strates to avoid multiple select queries to find strates List<Strate> strates = strateDAO.findAllByCampaignOrderedByCode(campaign); @@ -94,11 +91,11 @@ index++; } - transaction.commitTransaction(); + transaction.commit(); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); @@ -107,22 +104,21 @@ public int importStrates(String campaignId, Iterable<Strate> strates) { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); try { - CampaignDAO campaignDAO = - SammoaDAOHelper.getCampaignDAO(transaction); + CampaignTopiaDao campaignDAO = transaction.getCampaignDao(); Campaign campaign = campaignDAO.findByTopiaId(campaignId); Preconditions.checkArgument(campaign != null, "The topiaId : " + campaignId + " doesn't match any existing campaign"); - StrateDAO strateDAO = SammoaDAOHelper.getStrateDAO(transaction); - SectorDAO sectorDAO = SammoaDAOHelper.getSectorDAO(transaction); + StrateTopiaDao strateDAO = transaction.getStrateDao(); + SectorTopiaDao sectorDAO = transaction.getSectorDao(); // Retrieve directly all sectors to avoid multiple select queries to find sectors - List<Sector> sectors = sectorDAO.findAllByCampaign(campaign); + List<Sector> sectors = sectorDAO.forCampaignEquals(campaign).findAll(); Map<Integer, Sector> sectorMap = Maps.newHashMap(Maps.uniqueIndex(sectors, Sectors.toSectorNumber())); @@ -137,18 +133,18 @@ } } - transaction.commitTransaction(); + transaction.commit(); return result; } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } finally { endTransaction(transaction); } } - protected boolean importTransect(TransectDAO dao, + protected boolean importTransect(TransectTopiaDao dao, Transect transect, Map<String, Strate> strates, int rowIndex) throws TopiaException { @@ -213,8 +209,8 @@ return result; } - protected boolean importStrate(StrateDAO strateDAO, - SectorDAO sectorDAO, + protected boolean importStrate(StrateTopiaDao strateDAO, + SectorTopiaDao sectorDAO, Strate strate, Map<Integer, Sector> sectors, Campaign campaign) throws TopiaException { Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ShpImporter.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ShpImporter.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ShpImporter.java 2014-05-16 08:16:53 UTC (rev 665) @@ -26,7 +26,7 @@ import com.google.common.io.Files; import fr.ulr.sammoa.application.io.CampaignStorage; import org.apache.commons.io.FileUtils; -import org.nuiton.util.csv.ImportModel; +import org.nuiton.csv.ImportModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/StrateImportModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/StrateImportModel.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/StrateImportModel.java 2014-05-16 08:16:53 UTC (rev 665) @@ -27,7 +27,7 @@ import fr.ulr.sammoa.persistence.SectorImpl; import fr.ulr.sammoa.persistence.Strate; import fr.ulr.sammoa.persistence.StrateImpl; -import org.nuiton.util.csv.ext.AbstractImportModel; +import org.nuiton.csv.ext.AbstractImportModel; /** * <pre> Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/StrateTypeValueParser.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/StrateTypeValueParser.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/StrateTypeValueParser.java 2014-05-16 08:16:53 UTC (rev 665) @@ -24,7 +24,7 @@ */ import fr.ulr.sammoa.persistence.StrateType; -import org.nuiton.util.csv.ValueParser; +import org.nuiton.csv.ValueParser; import java.text.ParseException; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java 2014-05-16 08:16:53 UTC (rev 665) @@ -29,8 +29,8 @@ import fr.ulr.sammoa.persistence.StrateImpl; import fr.ulr.sammoa.persistence.Transect; import fr.ulr.sammoa.persistence.TransectImpl; -import org.nuiton.util.csv.Common; -import org.nuiton.util.csv.ext.AbstractImportModel; +import org.nuiton.csv.Common; +import org.nuiton.csv.ext.AbstractImportModel; /** * <pre> Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/ExportApplicationService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/ExportApplicationService.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/ExportApplicationService.java 2014-05-16 08:16:53 UTC (rev 665) @@ -32,34 +32,31 @@ import fr.ulr.sammoa.application.io.FlightStorage; import fr.ulr.sammoa.application.io.SammoaStorages; import fr.ulr.sammoa.persistence.Campaign; -import fr.ulr.sammoa.persistence.CampaignDAO; +import fr.ulr.sammoa.persistence.CampaignTopiaDao; import fr.ulr.sammoa.persistence.Flight; -import fr.ulr.sammoa.persistence.FlightDAO; +import fr.ulr.sammoa.persistence.FlightTopiaDao; import fr.ulr.sammoa.persistence.GeoPoint; import fr.ulr.sammoa.persistence.Observation; import fr.ulr.sammoa.persistence.Route; -import fr.ulr.sammoa.persistence.SammoaDAOHelper; import fr.ulr.sammoa.persistence.SammoaDbMeta; import fr.ulr.sammoa.persistence.SammoaEntityEnum; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.TransectFlight; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.tuple.Pair; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; +import org.nuiton.csv.ExportModel; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.csv.EntityCsvModel; -import org.nuiton.topia.persistence.csv.TopiaCsvCommons; -import org.nuiton.topia.persistence.csv.out.EntityAssociationExportModel; -import org.nuiton.topia.persistence.csv.out.ExportEntityVisitor; -import org.nuiton.topia.persistence.csv.out.ExportModelFactory; -import org.nuiton.topia.persistence.csv.out.TopiaCsvExports; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.ColumnMeta; import org.nuiton.topia.persistence.metadata.TableMeta; +import org.nuiton.topia.service.csv.EntityCsvModel; +import org.nuiton.topia.service.csv.TopiaCsvCommons; +import org.nuiton.topia.service.csv.out.EntityAssociationExportModel; +import org.nuiton.topia.service.csv.out.ExportEntityVisitor; +import org.nuiton.topia.service.csv.out.ExportModelFactory; +import org.nuiton.topia.service.csv.out.TopiaCsvExports; import org.nuiton.util.TimeLog; -import org.nuiton.util.ZipUtil; -import org.nuiton.util.csv.ExportModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -91,7 +88,7 @@ EntityCsvModel<SammoaEntityEnum, E> model = EntityCsvModel.newModel(config.getCsvSeparator(), meta, - TopiaEntity.TOPIA_ID); + TopiaEntity.PROPERTY_TOPIA_ID); for (ColumnMeta columnMeta : meta) { @@ -172,7 +169,7 @@ startTime = TIME_LOG.log(startTime, "exportApplication", "after create Storage structure"); - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { exportReferential(tx, targetStorage); @@ -202,13 +199,13 @@ private void fillAndSaveStorageProperties(CampaignStorage storage) { - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { DecoratorService decoratorService = getService(DecoratorService.class); - CampaignDAO campaignDAO = SammoaDAOHelper.getCampaignDAO(tx); - FlightDAO flightDAO = SammoaDAOHelper.getFlightDAO(tx); + CampaignTopiaDao campaignDAO = tx.getCampaignDao(); + FlightTopiaDao flightDAO = tx.getFlightDao(); Campaign campaign = campaignDAO.findByTopiaId(storage.getId()); @@ -230,7 +227,7 @@ } } - protected void exportReferential(TopiaContext tx, CampaignStorage storage) throws IOException { + protected void exportReferential(SammoaTopiaPersistenceContext tx, CampaignStorage storage) throws IOException { File csvDirectory = storage.getCsvDirectory(); @@ -252,13 +249,13 @@ } TopiaCsvExports.exportData(tableMeta, - defaultExportModelFactory, - prepareDataForExport, - entryFile); + defaultExportModelFactory, + prepareDataForExport, + entryFile); } } - protected void exportFlightData(TopiaContext tx, + protected void exportFlightData(SammoaTopiaPersistenceContext tx, FlightStorage storage, String flightId) throws IOException, TopiaException { @@ -284,7 +281,7 @@ try { Flight flight = flightService.getFlight(tx, flightId); - attachIndexInFlight(tx, flight); + attachIndexInFlight(flight); exportVisitor.export(flight); List<GeoPoint> geoPoints = @@ -303,21 +300,12 @@ } } - protected void attachIndexInFlight(TopiaContext tx, - Flight flight) throws TopiaException { + protected void attachIndexInFlight(Flight flight) { - FlightDAO flightDAO = SammoaDAOHelper.getFlightDAO(tx); - - List<Pair<String, Integer>> map = flightDAO.findAllIndexInFlight(flight); - for (Pair<String, Integer> entry : map) { - - String transectFLightId = entry.getKey(); - Integer indexInFlight = entry.getValue(); - - TransectFlight transectFlight = - flight.getTransectFlightByTopiaId(transectFLightId); - Preconditions.checkNotNull(transectFlight); + int indexInFlight = 0; + for (TransectFlight transectFlight : flight.getTransectFlight()){ transectFlight.setIndexInFlight(indexInFlight); + indexInFlight++; } } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/SammoaPrepareDataForExport.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/SammoaPrepareDataForExport.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/application/SammoaPrepareDataForExport.java 2014-05-16 08:16:53 UTC (rev 665) @@ -23,17 +23,18 @@ * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ulr.sammoa.application.SammoaTechnicalException; import fr.ulr.sammoa.persistence.SammoaEntityEnum; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import org.apache.commons.lang3.StringUtils; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.csv.out.PrepareDataForExport; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.DbMeta; import org.nuiton.topia.persistence.metadata.TableMeta; +import org.nuiton.topia.service.csv.out.PrepareDataForExport; import java.util.List; @@ -47,9 +48,9 @@ protected final DbMeta<SammoaEntityEnum> dbMetas; - protected final TopiaContext tx; + protected final SammoaTopiaPersistenceContext tx; - public SammoaPrepareDataForExport(DbMeta<SammoaEntityEnum> dbMetas, TopiaContext tx) { + public SammoaPrepareDataForExport(DbMeta<SammoaEntityEnum> dbMetas, SammoaTopiaPersistenceContext tx) { this.dbMetas = dbMetas; this.tx = tx; } @@ -66,13 +67,13 @@ return getEntities(tx, tableMeta, "size(e." + associationMeta.getName() + ") > 0"); } - protected <E extends TopiaEntity> List<E> getEntities(TopiaContext tx, + protected <E extends TopiaEntity> List<E> getEntities(SammoaTopiaPersistenceContext tx, TableMeta<SammoaEntityEnum> tableMeta, String extraWhereQuery) { SammoaEntityEnum entityEnum = tableMeta.getSource(); try { - TopiaDAO<E> dao = dbMetas.getPersistenceHelper().getDAO(tx, entityEnum); + TopiaDao dao = tx.getDao(entityEnum.getContract()); // first query to count datas @@ -82,7 +83,10 @@ hql += " WHERE " + extraWhereQuery; } - List<E> result = dao.findAllByQuery(hql); + ImmutableMap <String, Object> parameters = ImmutableMap.of(); + + List<E> result = tx.getJpaSupport().findAll(hql, parameters); + return result; } catch (TopiaException eee) { throw new SammoaTechnicalException("Could not obtain data", eee); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2014-05-16 08:16:53 UTC (rev 665) @@ -48,13 +48,13 @@ import fr.ulr.sammoa.persistence.Route; import fr.ulr.sammoa.persistence.RouteType; import fr.ulr.sammoa.persistence.Routes; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.Species; import fr.ulr.sammoa.persistence.Strate; import fr.ulr.sammoa.persistence.Transect; import fr.ulr.sammoa.persistence.TransectFlight; import org.joda.time.DateTime; import org.joda.time.Interval; -import org.nuiton.topia.TopiaContext; import org.nuiton.util.FileUtil; import org.nuiton.util.TimeLog; import org.slf4j.Logger; @@ -150,7 +150,7 @@ List<RouteType> routeTypes = dataModel.getRouteTypes(); List<Strate> strates = dataModel.getStrates(); - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { // get flights for campaign (and between begin - end date) @@ -373,7 +373,7 @@ List<RouteType> routeTypes = dataModel.getRouteTypes(); List<Strate> strates = dataModel.getStrates(); - TopiaContext tx = beginTransaction(); + SammoaTopiaPersistenceContext tx = beginTransaction(); try { FlightService flightService = getService(FlightService.class); Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java 2014-05-16 08:16:53 UTC (rev 665) @@ -26,26 +26,24 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import fr.ulr.sammoa.application.SammoaDatabase; import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.Observer; -import fr.ulr.sammoa.persistence.ObserverDAO; -import fr.ulr.sammoa.persistence.SammoaDAOHelper; +import fr.ulr.sammoa.persistence.ObserverTopiaDao; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.Sector; -import fr.ulr.sammoa.persistence.SectorDAO; +import fr.ulr.sammoa.persistence.SectorTopiaDao; import fr.ulr.sammoa.persistence.Strate; -import fr.ulr.sammoa.persistence.StrateDAO; +import fr.ulr.sammoa.persistence.StrateTopiaDao; import fr.ulr.sammoa.persistence.StrateType; import fr.ulr.sammoa.persistence.Transect; -import fr.ulr.sammoa.persistence.TransectDAO; import fr.ulr.sammoa.persistence.TransectFlight; +import fr.ulr.sammoa.persistence.TransectTopiaDao; import org.junit.After; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaException; import java.util.List; import java.util.Map; @@ -295,9 +293,8 @@ // Check that 6 transectFlight are attached to the transect // but one is deleted { - TopiaContext tx = database.beginTransaction(); - Map<Transect, Long> map = SammoaDAOHelper.getTransectFlightDAO(tx). - countAllByTransect(); + SammoaTopiaPersistenceContext tx = database.beginTransaction(); + Map<Transect, Long> map = tx.getTransectFlightDao().countAllByTransect(null); Assert.assertEquals(new Long(6), map.get(transect)); } // 6th crossing on flight 1 marked as 1st one (strange but not forbidden) @@ -320,12 +317,12 @@ protected Observer createObserver(String initials, Campaign campaign) throws TopiaException { - TopiaContext transaction = database.beginTransaction(); + SammoaTopiaPersistenceContext transaction = database.beginTransaction(); - ObserverDAO observerDAO = SammoaDAOHelper.getObserverDAO(transaction); + ObserverTopiaDao observerDAO = transaction.getObserverDao(); Observer result = observerDAO.createByNaturalId(initials, campaign); - transaction.commitTransaction(); + transaction.commit(); database.endTransaction(transaction); return result; @@ -333,12 +330,12 @@ protected Transect createTransect(String name, Strate strate) throws TopiaException { - TopiaContext transaction = database.beginTransaction(); + SammoaTopiaPersistenceContext transaction = database.beginTransaction(); - TransectDAO transectDAO = SammoaDAOHelper.getTransectDAO(transaction); + TransectTopiaDao transectDAO = transaction.getTransectDao(); Transect result = transectDAO.createByNaturalId(name, strate); - transaction.commitTransaction(); + transaction.commit(); database.endTransaction(transaction); return result; @@ -346,16 +343,16 @@ protected Strate createStrate(Campaign campaign, int sectorNumber, StrateType strateType) throws TopiaException { - TopiaContext transaction = database.beginTransaction(); + SammoaTopiaPersistenceContext transaction = database.beginTransaction(); - SectorDAO sectorDAO = SammoaDAOHelper.getSectorDAO(transaction); + SectorTopiaDao sectorDAO = transaction.getSectorDao(); Sector sector = sectorDAO.createByNaturalId(sectorNumber, campaign); - StrateDAO strateDAO = SammoaDAOHelper.getStrateDAO(transaction); + StrateTopiaDao strateDAO = transaction.getStrateDao(); Strate result = strateDAO.createByNaturalId(strateType, sector); - transaction.commitTransaction(); + transaction.commit(); database.endTransaction(transaction); return result; Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaConfigMock.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaConfigMock.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaConfigMock.java 2014-05-16 08:16:53 UTC (rev 665) @@ -3,8 +3,8 @@ /* * #%L * SAMMOA :: Application - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java 2014-05-16 08:16:53 UTC (rev 665) @@ -26,19 +26,19 @@ import com.google.common.base.Throwables; import fr.ulr.sammoa.persistence.Campaign; -import fr.ulr.sammoa.persistence.CampaignDAO; +import fr.ulr.sammoa.persistence.CampaignTopiaDao; import fr.ulr.sammoa.persistence.PersistenceException; import fr.ulr.sammoa.persistence.Region; -import fr.ulr.sammoa.persistence.RegionDAO; -import fr.ulr.sammoa.persistence.SammoaDAOHelper; +import fr.ulr.sammoa.persistence.RegionTopiaDao; import fr.ulr.sammoa.persistence.SammoaPersistence; +import fr.ulr.sammoa.persistence.SammoaTopiaApplicationContext; +import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import org.apache.commons.lang3.StringUtils; import org.junit.rules.TestWatcher; import org.junit.runner.Description; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,7 +69,7 @@ protected Properties dbConfiguration; - protected TopiaContext rootCtxt; + protected SammoaTopiaApplicationContext rootCtxt; protected Description description; @@ -90,7 +90,7 @@ * @since 3.0 */ protected Class<? extends TopiaEntity>[] getImplementationClasses() { - return SammoaDAOHelper.getImplementationClasses(); + return rootCtxt.getImplementationClasses(); } @Override @@ -124,11 +124,11 @@ } dbConfiguration.setProperty( - TopiaContextFactory.CONFIG_URL, jdbcUrl); + TopiaConfigurationConstants.CONFIG_URL, jdbcUrl); onDbConfigurationCreate(dbConfiguration, testBasedir, dbPath); - rootCtxt = TopiaContextFactory.getContext(dbConfiguration); + rootCtxt = new SammoaTopiaApplicationContext(dbConfiguration); onRootCtxtCreate(rootCtxt); @@ -163,15 +163,15 @@ } } - protected void onRootCtxtCreate(TopiaContext rootCtxt) { + protected void onRootCtxtCreate(SammoaTopiaApplicationContext rootCtxt) { persistence.setRootContext(rootCtxt); } - public TopiaContext beginTransaction() throws TopiaException { + public SammoaTopiaPersistenceContext beginTransaction() throws TopiaException { return persistence.beginTransaction(); } - public void endTransaction(TopiaContext transaction) { + public void endTransaction(SammoaTopiaPersistenceContext transaction) { persistence.endTransaction(transaction); } @@ -181,15 +181,15 @@ public Campaign createCampaign(String code, String regionCode) throws TopiaException { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); - RegionDAO regionDAO = SammoaDAOHelper.getRegionDAO(transaction); + RegionTopiaDao regionDAO = transaction.getRegionDao(); Region region = regionDAO.createByNaturalId(regionCode); - CampaignDAO campaignDAO = SammoaDAOHelper.getCampaignDAO(transaction); + CampaignTopiaDao campaignDAO = transaction.getCampaignDao(); Campaign result = campaignDAO.createByNaturalId(code, region); - transaction.commitTransaction(); + transaction.commit(); endTransaction(transaction); return result; @@ -199,7 +199,7 @@ return testBasedir; } - public TopiaContext getRootCtxt() { + public SammoaTopiaApplicationContext getRootCtxt() { return rootCtxt; } @@ -223,7 +223,7 @@ stream.close(); } result.setProperty( - TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, + TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, getImplementationClassesAsString()); return result; Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvServiceTest.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvServiceTest.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvServiceTest.java 2014-05-16 08:16:53 UTC (rev 665) @@ -33,7 +33,7 @@ import fr.ulr.sammoa.persistence.SammoaDAOHelper; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.SammoaTopiaPersistenceContext; import java.io.File; import java.net.URL; @@ -71,8 +71,8 @@ int result = instance.importObservers(campaign.getTopiaId(), new File(stream.toURI())); - TopiaContext transaction = database.beginTransaction(); - ObserverDAO dao = SammoaDAOHelper.getObserverDAO(transaction); + SammoaTopiaPersistenceContext transaction = database.beginTransaction(); + ObserverTopiaDao dao = transaction.getObserverDao(); Collection<Observer> observers = dao.findAll(); database.endTransaction(transaction); Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java 2014-05-16 08:16:53 UTC (rev 665) @@ -49,8 +49,8 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; +import org.nuiton.topia.SammoaTopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.DateUtil; import org.nuiton.util.csv.Common; import org.nuiton.util.csv.ImportModel; @@ -78,7 +78,7 @@ public SammoaDatabase database = new SammoaDatabase("/" + config.getApplicationConfig().getConfigFileName(), config.getAutoCommitDelay()); - protected TopiaContext transaction; + protected SammoaTopiaPersistenceContext transaction; @Before public void setUp() throws TopiaException { @@ -108,7 +108,7 @@ createGeoPoint(DateUtil.createDate(30, 15, 12, 18, 7, 2012), 1, 2, flight); createGeoPoint(DateUtil.createDate(39, 18, 12, 18, 7, 2012), 3, 4, flight); - transaction.commitTransaction(); + transaction.commit(); ExportMapService exportMapService = context.getService(ExportMapService.class); @@ -175,7 +175,7 @@ Flight flight) throws TopiaException { - GeoPointDAO transectDAO = SammoaDAOHelper.getGeoPointDAO(transaction); + GeoPointTopiaDao transectDAO = transaction.getGeoPointDao(); GeoPoint result = transectDAO.create(); result.setRecordTime(date); result.setLatitude(latitude); Modified: trunk/sammoa-application/src/test/resources/sammoa-test.properties =================================================================== --- trunk/sammoa-application/src/test/resources/sammoa-test.properties 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-application/src/test/resources/sammoa-test.properties 2014-05-16 08:16:53 UTC (rev 665) @@ -37,7 +37,7 @@ hibernate.connection.driver_class=org.h2.Driver #Not necessary, but useful -hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider +#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider #data directory sammoa.data.directory=target/sammoa-data Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/AutoSaveListener.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/AutoSaveListener.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/AutoSaveListener.java 2014-05-16 08:16:53 UTC (rev 665) @@ -26,12 +26,11 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.event.TopiaEntityEvent; -import org.nuiton.topia.event.TopiaEntityListener; -import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.event.TopiaEntityEvent; +import org.nuiton.topia.persistence.event.TopiaEntityListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -147,19 +146,19 @@ if (isCommitNeeded()) { - TopiaContext transaction = persistence.openContext(); + SammoaTopiaPersistenceContext sammoaTopiaPersistenceContext = persistence.openContext(); try { Set<TopiaEntity> errorSavedEntities = - saveEntities(transaction, createdEntities, CREATE_ACTION); + saveEntities(sammoaTopiaPersistenceContext, createdEntities, CREATE_ACTION); changedEntities.addAll( - saveEntities(transaction, changedEntities, UPDATE_ACTION)); + saveEntities(sammoaTopiaPersistenceContext, changedEntities, UPDATE_ACTION)); changedEntities.addAll(errorSavedEntities); } finally { - persistence.closeContext(transaction); + persistence.closeContext(sammoaTopiaPersistenceContext); } } @@ -180,12 +179,12 @@ * Commit is done after all entities save. If an error occurs, the entity * are keeped in source {@code entities}, otherwise they are removed. * - * @param transaction TopiaContex used to commit + * @param sammoaContext SammoaTopiaPersistenceContext used to commit * @param entities synchronized Set of entities to save * @param action SaveAction to use * @return a Set of entities in error during save */ - protected Set<TopiaEntity> saveEntities(TopiaContext transaction, + protected Set<TopiaEntity> saveEntities(SammoaTopiaPersistenceContext sammoaContext, Set<TopiaEntity> entities, SaveAction action) { @@ -204,11 +203,15 @@ try { for (TopiaEntity entity : entitiesCopy) { - TopiaDAO dao = SammoaDAOHelper.getDAO(transaction, entity); - action.save(dao, entity); + + Class<? extends TopiaEntity> contractClass = SammoaEntityEnum.getContractClass(entity.getClass()); + + TopiaDao<? extends TopiaEntity> dao = sammoaContext.getDao(contractClass); + + action.save((TopiaDao<TopiaEntity>) dao, entity); } - transaction.commitTransaction(); + sammoaContext.commit(); result = Collections.emptySet(); @@ -229,7 +232,7 @@ protected interface SaveAction { - <E extends TopiaEntity> void save(TopiaDAO<E> dao, E entity) throws TopiaException; + <E extends TopiaEntity> void save(TopiaDao<E> dao, E entity) throws TopiaException; } protected static SaveAction CREATE_ACTION = new SaveAction() { @@ -240,7 +243,7 @@ } @Override - public <E extends TopiaEntity> void save(TopiaDAO<E> dao, E entity) throws TopiaException { + public <E extends TopiaEntity> void save(TopiaDao<E> dao, E entity) throws TopiaException { dao.create(entity); } }; @@ -253,7 +256,7 @@ } @Override - public <E extends TopiaEntity> void save(TopiaDAO<E> dao, E entity) throws TopiaException { + public <E extends TopiaEntity> void save(TopiaDao<E> dao, E entity) throws TopiaException { dao.update(entity); } }; Deleted: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightDAOImpl.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightDAOImpl.java 2014-05-16 08:16:53 UTC (rev 665) @@ -1,95 +0,0 @@ -/* - * #%L - * SAMMOA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 UMS 3462, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ulr.sammoa.persistence; - -import org.apache.commons.lang3.tuple.Pair; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.topia.framework.TopiaSQLQuery; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; - -/** - * Created: 08/06/12 - * - * @author fdesbois <desbois(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> - */ -public class FlightDAOImpl<E extends Flight> extends FlightDAOAbstract<E> { - - public Integer findLastFlightNumber() { - - String ql = "SELECT max(flightNumber) FROM FlightImpl"; - - try { - Integer result = findByQuery(Integer.class, ql); - -// int result = queryResult == null ? defaultValue : queryResult + 1; -// -// if (result < defaultValue) { -// result = defaultValue; -// } - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - - public List<Pair<String, Integer>> findAllIndexInFlight(final Flight flight) { - - TopiaSQLQuery<Pair<String, Integer>> query = new TopiaSQLQuery<Pair<String, Integer>>() { - - @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { - String ql = "SELECT t.topiaId, t.flight_idx " + - "FROM Flight f, TransectFlight t " + - "WHERE f.topiaid = ? " + - "AND t.flight = f.topiaId"; - PreparedStatement ps = connection.prepareStatement(ql); - ps.setString(1, flight.getTopiaId()); - return ps; - } - - @Override - protected Pair<String, Integer> prepareResult(ResultSet set) throws SQLException { - Pair<String, Integer> result = Pair.of(set.getString(1), set.getInt(2)); - return result; - } - }; - - try { - - List<Pair<String, Integer>> result = query.findMultipleResult(getContext()); - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - -} Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.java (rev 0) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.java 2014-05-16 08:16:53 UTC (rev 665) @@ -0,0 +1,57 @@ +/* + * #%L + * SAMMOA :: Persistence + * + * $Id: FlightDAOImpl.java 500 2012-08-30 15:58:32Z fdesbois $ + * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ulr.sammoa.persistence; + +import org.nuiton.topia.persistence.TopiaException; + +import java.util.HashMap; + +/** + * Created: 08/06/12 + * + * @author fdesbois <desbois(a)codelutin.com> + * @author tchemit <chemit(a)codelutin.com> + */ +public class FlightTopiaDao extends AbstractFlightTopiaDao<Flight> { + + public Integer findLastFlightNumber() { + + String ql = "SELECT max(" + Flight.PROPERTY_FLIGHT_NUMBER + ") FROM " + Flight.class.getCanonicalName() ; + + try { + Integer result = findUnique(ql, new HashMap<String, Object>()); + +// int result = queryResult == null ? defaultValue : queryResult + 1; +// +// if (result < defaultValue) { +// result = defaultValue; +// } + return result; + } catch (TopiaException e) { + throw new TopiaException(e); + } + } + +} Deleted: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointDAOImpl.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointDAOImpl.java 2014-05-16 08:16:53 UTC (rev 665) @@ -1,47 +0,0 @@ -package fr.ulr.sammoa.persistence; -/* - * #%L - * SAMMOA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 UMS 3462, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; - -import java.util.List; - -public class GeoPointDAOImpl<E extends GeoPoint> extends GeoPointDAOAbstract<E> { - - public List<E> findAllByFlightOrderedByRecordTime(Flight flight) { - - String ql = "FROM GeoPointImpl " + - "WHERE flight = :flight " + - "ORDER BY recordTime"; - - try { - List<E> result = findAllByQuery(ql, "flight", flight); - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - -} //GeoPointDAOImpl<E extends GeoPoint> Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointTopiaDao.java (rev 0) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointTopiaDao.java 2014-05-16 08:16:53 UTC (rev 665) @@ -0,0 +1,37 @@ +package fr.ulr.sammoa.persistence; +/* + * #%L + * SAMMOA :: Persistence + * $Id: GeoPointDAOImpl.java 497 2012-08-30 13:28:13Z fdesbois $ + * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import java.util.List; + +public class GeoPointTopiaDao extends AbstractGeoPointTopiaDao<GeoPoint> { + + public List<GeoPoint> findAllByFlightOrderedByRecordTime(Flight flight) { + + List<GeoPoint> geoPoints = forFlightEquals(flight).setOrderByArguments(GeoPoint.PROPERTY_RECORD_TIME).findAll(); + + return geoPoints; + } + +} //GeoPointDAOImpl<E extends GeoPoint> Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java 2014-05-16 08:16:53 UTC (rev 665) @@ -84,7 +84,7 @@ return FluentIterable.from(dates) .transform(toClosestGeoPoint(geoPoints)) - .toImmutableList(); + .toList(); } public static GeoPoint getClosestPoint(List<GeoPoint> geoPoints, @@ -144,7 +144,7 @@ this.dates = FluentIterable .from(list) .transform(toDate()) - .toSortedImmutableList(Ordering.natural()); + .toSortedList(Ordering.natural()); } @Override Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/HasTopiaIdPredicate.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/HasTopiaIdPredicate.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/HasTopiaIdPredicate.java 2014-05-16 08:16:53 UTC (rev 665) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Deleted: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationDAOImpl.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationDAOImpl.java 2014-05-16 08:16:53 UTC (rev 665) @@ -1,111 +0,0 @@ -/* - * #%L - * SAMMOA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 UMS 3462, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ulr.sammoa.persistence; - -import com.google.common.base.Strings; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; - -public class ObservationDAOImpl<E extends Observation> extends ObservationDAOAbstract<E> { - - private static final Logger logger = LoggerFactory.getLogger(ObservationDAOImpl.class); - - /** - * Override update method to have special treatment for Species. - * We can't save the species before the Observation is saved, and - * the Observation could be automatically saved at any time. - * So we check if the species exists and if the code is correct to push - * this species in the observation. If the species doesn't exist in the - * database, it could be created (localCreation) at the same time (sort of - * aggregate relation that allow cascade on update). - * - * @param e Observation to update - * @return the updated obervsation - * @throws TopiaException for any errors - */ - @Override - public E update(E e) throws TopiaException { - - Species species = e.getSpecies(); - - // Only if species is not persisted and contains a code - if (species != null - && !Strings.isNullOrEmpty(species.getCode()) - && species.getTopiaId() == null) { - - SpeciesDAO speciesDAO = SammoaDAOHelper.getSpeciesDAO(getContext()); - Species existSpecies = speciesDAO.findByNaturalId(species.getCode(), species.getRegion()); - if (existSpecies == null) { - - logger.debug("Create a new species '{}'", species.getCode()); - - species.setLocalCreation(true); - speciesDAO.create(species); - - } else { - - logger.debug("Use existing species '{}'", existSpecies.getCode()); - - e.setSpecies(existSpecies); - } - } - - return super.update(e); - } - - public List<E> findAllByFlightOrderedByObservationTime(Flight flight) { - - - String ql = "FROM ObservationImpl " + - "WHERE flight = :flight " + - "ORDER BY observationTime, topiaCreateDate"; - - try { - List<E> result = findAllByQuery(ql, "flight", flight); - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - - public int findLastObservationNumber(Flight flight) { - - String ql = "SELECT max(observationNumber) " + - "FROM ObservationImpl " + - "WHERE flight = :flight"; - - try { - Integer queryResult = findByQuery(Integer.class, ql, "flight", flight); - int result = queryResult == null ? 1 : queryResult + 1; - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - -} //ObservationDAOImpl<E extends Observation> Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationTopiaDao.java (rev 0) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationTopiaDao.java 2014-05-16 08:16:53 UTC (rev 665) @@ -0,0 +1,100 @@ +/* + * #%L + * SAMMOA :: Persistence + * $Id: ObservationDAOImpl.java 497 2012-08-30 13:28:13Z fdesbois $ + * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ulr.sammoa.persistence; + +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableMap; +import org.nuiton.topia.persistence.TopiaException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + +public class ObservationTopiaDao extends AbstractObservationTopiaDao<Observation> { + + private static final Logger logger = LoggerFactory.getLogger(ObservationTopiaDao.class); + + /** + * Override update method to have special treatment for Species. + * We can't save the species before the Observation is saved, and + * the Observation could be automatically saved at any time. + * So we check if the species exists and if the code is correct to push + * this species in the observation. If the species doesn't exist in the + * database, it could be created (localCreation) at the same time (sort of + * aggregate relation that allow cascade on update). + * + * @param e Observation to update + * @return the updated obervsation + * @throws TopiaException for any errors + */ + @Override + public Observation update(Observation e) throws TopiaException { + + Species species = e.getSpecies(); + + // Only if species is not persisted and contains a code + if (species != null + && !Strings.isNullOrEmpty(species.getCode()) + && species.getTopiaId() == null) { + + SpeciesTopiaDao speciesDAO = topiaDaoSupplier.getDao(Species.class, SpeciesTopiaDao.class); + Species existSpecies = speciesDAO.findByNaturalId(species.getCode(), species.getRegion()); + if (existSpecies == null) { + + logger.debug("Create a new species '{}'", species.getCode()); + + species.setLocalCreation(true); + speciesDAO.create(species); + + } else { + + logger.debug("Use existing species '{}'", existSpecies.getCode()); + + e.setSpecies(existSpecies); + } + } + + return super.update(e); + } + + public List<Observation> findAllByFlightOrderedByObservationTime(Flight flight) { + + List<Observation> observations = forFlightEquals(flight).setOrderByArguments(Observation.PROPERTY_OBSERVATION_TIME, Observation.PROPERTY_TOPIA_CREATE_DATE).findAll(); + return observations; + } + + public int findLastObservationNumber(Flight flight) { + + String hql = "SELECT max(" + Observation.PROPERTY_OBSERVATION_NUMBER + ") " + + newFromClause() + " " + + "WHERE " + Observation.PROPERTY_FLIGHT + " = :flight"; + + Integer queryResult = findAnyOrNull(hql, ImmutableMap.of("flight", (Object)flight)); + + int result = queryResult == null ? 1 : queryResult + 1; + + return result; + } + +} //ObservationDAOImpl<Observation extends Observation> Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java 2014-05-16 08:16:53 UTC (rev 665) @@ -176,7 +176,7 @@ List<Observation> result = FluentIterable .from(observations) .filter(inDateInterval(interval)) - .toImmutableList(); + .toList(); Iterables.removeAll(observations, result); Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/PersistenceException.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/PersistenceException.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/PersistenceException.java 2014-05-16 08:16:53 UTC (rev 665) @@ -3,8 +3,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Position.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Position.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Position.java 2014-05-16 08:16:53 UTC (rev 665) @@ -3,8 +3,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -24,7 +24,7 @@ * #L% */ -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Created: 29/08/12 @@ -33,17 +33,17 @@ */ public enum Position { - NAVIGATOR(n_("sammoa.position.navigator")), + NAVIGATOR(n("sammoa.position.navigator")), - FRONT_LEFT(n_("sammoa.position.frontLeft")), + FRONT_LEFT(n("sammoa.position.frontLeft")), - FRONT_RIGHT(n_("sammoa.position.frontRight")), + FRONT_RIGHT(n("sammoa.position.frontRight")), - BACK_LEFT(n_("sammoa.position.backLeft")), + BACK_LEFT(n("sammoa.position.backLeft")), - BACK_RIGHT(n_("sammoa.position.backRight")), + BACK_RIGHT(n("sammoa.position.backRight")), - CO_NAVIGATOR(n_("sammoa.position.coNavigator")); + CO_NAVIGATOR(n("sammoa.position.coNavigator")); private String label; Deleted: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteDAOImpl.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteDAOImpl.java 2014-05-16 08:16:53 UTC (rev 665) @@ -1,153 +0,0 @@ -/* - * #%L - * SAMMOA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 UMS 3462, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ulr.sammoa.persistence; - -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; - -import java.util.Date; -import java.util.List; - -/** - * Created: 15/06/12 - * - * @author fdesbois <desbois(a)codelutin.com> - */ -public class RouteDAOImpl<E extends Route> extends RouteDAOAbstract<E> { - - public List<E> findAllByFlightOrderedByBeginTime(Flight flight) { - - String ql = "FROM RouteImpl " + - "WHERE flight = :flight " + - "ORDER BY beginTime, topiaCreateDate"; - - try { - List<E> result = findAllByQuery(ql, "flight", flight); - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - - public E findLastByFlight(Flight flight) { - - String ql = "FROM RouteImpl " + - "WHERE flight = :flight " + - "AND deleted = :deleted " + - "ORDER BY beginTime DESC, topiaCreateDate DESC"; - - try { - List<E> queryResults = findAllByQueryWithBound( - ql, 0, 1, "flight", flight, "deleted", false); - E result = queryResults.isEmpty() ? null : queryResults.get(0); - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - - public E findPreviousLEG(Route route) throws TopiaException { - - route = findByTopiaId(route.getTopiaId()); - - String ql = "FROM RouteImpl " + - "WHERE flight = :flight " + - "AND routeType = :type " + - "AND beginTime <= :date " + - "AND deleted = :deleted " + - "ORDER BY beginTime DESC, topiaCreateDate DESC"; - - try { - List<E> queryResults = findAllByQueryWithBound( - ql, 0, 1, - "flight", route.getFlight(), - "type", RouteType.LEG, - "date", route.getBeginTime(), - "deleted", false - ); - E result = queryResults.isEmpty() ? null : queryResults.get(0); - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - - public E findPreviousRoute(Route route) throws TopiaException { - - route = findByTopiaId(route.getTopiaId()); - - String ql = "FROM RouteImpl " + - "WHERE flight = :flight " + - "AND beginTime <= :date " + - "AND deleted = :deleted " + - "ORDER BY beginTime DESC, topiaCreateDate DESC"; - - try { - List<E> queryResults = findAllByQueryWithBound( - ql, 0, 1, - "flight", route.getFlight(), - "date", route.getBeginTime(), - "deleted", false - ); - E result = queryResults.isEmpty() ? null : queryResults.get(0); - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - - public int getLastEffortNumber(Flight flight) { - - String ql = "SELECT max(effortNumber) " + - "FROM RouteImpl " + - "WHERE effortNumber IS NOT NULL " + - "AND flight = :flight"; - - try { - Integer queryResult = findByQuery( - Integer.class, ql, "flight", flight); - int result = queryResult == null ? 1 : queryResult + 1; - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - - public long countByTransectFlightBeforeTime(TransectFlight transectFlight, - Date time) { - - String ql = "SELECT count(*) " + - "FROM RouteImpl " + - "WHERE transectFlight = :transectFlight " + - "AND beginTime < :beginTime"; - - try { - long result = countByQuery(ql, "transectFlight", transectFlight, "beginTime", time); - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - -} Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteTopiaDao.java (rev 0) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteTopiaDao.java 2014-05-16 08:16:53 UTC (rev 665) @@ -0,0 +1,144 @@ +/* + * #%L + * SAMMOA :: Persistence + * $Id: RouteDAOImpl.java 524 2012-09-05 14:03:46Z fdesbois $ + * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ulr.sammoa.persistence; + +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableMap; +import org.nuiton.topia.persistence.TopiaException; + +import java.util.Date; +import java.util.List; + +/** + * Created: 15/06/12 + * + * @author fdesbois <desbois(a)codelutin.com> + */ +public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> { + + public List<Route> findAllByFlightOrderedByBeginTime(Flight flight) { + + List<Route> routes = forFlightEquals(flight).setOrderByArguments(Route.PROPERTY_BEGIN_TIME, Route.PROPERTY_TOPIA_CREATE_DATE).findAll(); + + return routes; + } + + public Route findLastByFlight(Flight flight) { + + Optional<Route> routeOptional = forFlightEquals(flight) + .addEquals(Route.PROPERTY_DELETED, false) + .setOrderByArguments(Route.PROPERTY_BEGIN_TIME + " DESC", Route.PROPERTY_TOPIA_CREATE_DATE + " DESC") + .tryFindFirst(); + + Route route = null; + + if (routeOptional.isPresent()) { + + route = routeOptional.get(); + + } + + return route; + } + + public Route findPreviousLEG(Route route) throws TopiaException { + + route = findByTopiaId(route.getTopiaId()); + + String hql = newFromClause() + " " + + "WHERE " + Route.PROPERTY_FLIGHT + " = :flight " + + "AND " + Route.PROPERTY_ROUTE_TYPE + " = :type " + + "AND " + Route.PROPERTY_BEGIN_TIME + " <= :date " + + "AND " + Route.PROPERTY_DELETED + " = :deleted " + + "ORDER BY " + Route.PROPERTY_BEGIN_TIME + " DESC, " + Route.PROPERTY_TOPIA_CREATE_DATE + " DESC"; + + ImmutableMap<String, Object> parameters = ImmutableMap.of( + "flight", (Object) route.getFlight(), + "type", RouteType.LEG, + "date", route.getBeginTime(), + "deleted", false); + + Route result = findFirstOrNull(hql, parameters ); + + return result; + } + + public Route findPreviousRoute(Route route) throws TopiaException { + + route = findByTopiaId(route.getTopiaId()); + + String hql = newFromClause() + " " + + "WHERE " + Route.PROPERTY_FLIGHT + " = :flight " + + "AND " + Route.PROPERTY_BEGIN_TIME + " <= :date " + + "AND " + Route.PROPERTY_DELETED + " = :deleted " + + "ORDER BY " + Route.PROPERTY_BEGIN_TIME + " DESC, " + Route.PROPERTY_TOPIA_CREATE_DATE + " DESC"; + + ImmutableMap<String, Object> parameters = ImmutableMap.of( + "flight", (Object) route.getFlight(), + "date", route.getBeginTime(), + "deleted", false); + + Route result = findFirstOrNull(hql, parameters ); + + return result; + + } + + public int getLastEffortNumber(Flight flight) { + + String hql = "SELECT max(" + Route.PROPERTY_EFFORT_NUMBER + ") " + + newFromClause() + " " + + "WHERE " + Route.PROPERTY_EFFORT_NUMBER + " IS NOT NULL " + + "AND " + Route.PROPERTY_FLIGHT + " = :flight "; + + ImmutableMap<String, Object> parameters = ImmutableMap.of( + "flight", (Object) flight); + + Integer queryResult = findFirstOrNull(hql, parameters ); + + int result = queryResult == null ? 1 : queryResult + 1; + + return result; + + } + + public long countByTransectFlightBeforeTime(TransectFlight transectFlight, + Date time) { + + String hql = "SELECT count(*) " + + newFromClause() + " " + + "WHERE " + Route.PROPERTY_TRANSECT_FLIGHT + " = :transectFlight " + + "AND " + Route.PROPERTY_BEGIN_TIME + " <= :date "; + + ImmutableMap<String, Object> parameters = ImmutableMap.of( + "transectFlight", (Object) transectFlight, + "date", time); + + long count = count(hql, parameters); + + return count; + + } + +} Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java 2014-05-16 08:16:53 UTC (rev 665) @@ -25,11 +25,8 @@ package fr.ulr.sammoa.persistence; import com.google.common.base.Preconditions; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; import java.io.Closeable; @@ -42,7 +39,7 @@ * {@link #open(Properties, long)}. * <p/> * You will create a transaction with {@link #beginTransaction()} and on finally - * block call {@link #endTransaction(TopiaContext)}. + * block call {@link #endTransaction(SammoaTopiaPersistenceContext)}. * <p/> * Created: 08/06/12 * @@ -52,7 +49,7 @@ protected static SammoaPersistence instance; - protected TopiaContext rootContext; + protected SammoaTopiaApplicationContext rootContext; protected Properties dbConfiguration; @@ -64,7 +61,7 @@ /** * Open the Persistence with {@code dbConfiguration} for - * {@link TopiaContextFactory#getContext(Properties)} and {@code autoCommitDelay} + * {@link SammoaTopiaApplicationContext#SammoaTopiaApplicationContext(java.util.Map)} and {@code autoCommitDelay} * for {@link AutoSaveListener}. You can't open an already opened context. * You have to call {@link #close()} before open it. * @@ -79,17 +76,17 @@ this.dbConfiguration = dbConfiguration; dbConfiguration.setProperty( - TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, - SammoaDAOHelper.getImplementationClassesAsString()); + TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, + SammoaEntityEnum.getImplementationClassesAsString()); autoSaveListener = new AutoSaveListener(this, autoCommitDelay); // Retrieve the rootContext and try opening a transaction to check // the connection - TopiaContext tx = null; + SammoaTopiaPersistenceContext tx = null; try { - rootContext = TopiaContextFactory.getContext(dbConfiguration); - tx = rootContext.beginTransaction(); + rootContext = new SammoaTopiaApplicationContext(dbConfiguration); + tx = rootContext.newPersistenceContext(); } catch (TopiaException ex) { throw new PersistenceException( @@ -106,19 +103,19 @@ } /** - * Begin a new transaction (TopiaContext). The {@link AutoSaveListener} + * Begin a new transaction (SammoaTopiaPersistenceContext). The {@link AutoSaveListener} * will be automatically bind on all entities change. During the transaction - * time, no auto commit will be done, the next {@link #endTransaction(TopiaContext)} + * time, no auto commit will be done, the next {@link #endTransaction(SammoaTopiaPersistenceContext)} * call will release the AutoSaveListener to continue looking for change. * - * @return a new TopiaContext - * @see #endTransaction(TopiaContext) - * @see TopiaContext#beginTransaction() + * @return a new SammoaTopiaPersistenceContext + * @see #endTransaction(SammoaTopiaPersistenceContext) + * @see SammoaTopiaApplicationContext#newPersistenceContext() */ - public TopiaContext beginTransaction() { + public SammoaTopiaPersistenceContext beginTransaction() { autoSaveListener.stop(); - TopiaContext result = openContext(); - result.addTopiaEntityListener(autoSaveListener); + SammoaTopiaPersistenceContext result = openContext(); + result.getFiresSupport().addTopiaEntityListener(autoSaveListener); return result; } @@ -140,24 +137,24 @@ * End the {@code transaction}. The {@link AutoSaveListener} will be released * to continue looking for entities change. * - * @param transaction TopiaContext to end + * @param transaction SammoaTopiaPersistenceContext to end * @see #beginTransaction() - * @see TopiaContext#closeContext() + * @see SammoaTopiaPersistenceContext#closeContext() */ - public void endTransaction(TopiaContext transaction) { + public void endTransaction(SammoaTopiaPersistenceContext transaction) { closeContext(transaction); autoSaveListener.start(); } - /** @return the main TopiaContext where all other transactions are opened */ - public TopiaContext getRootContext() { + /** @return the main SammoaTopiaPersistenceContext where all other transactions are opened */ + public SammoaTopiaApplicationContext getRootContext() { Preconditions.checkState(rootContext != null, "You have to open the persistence to use rootContext"); return rootContext; } - /** @param rootContext the main TopiaContext to use */ - public void setRootContext(TopiaContext rootContext) { + /** @param rootContext the main SammoaTopiaPersistenceContext to use */ + public void setRootContext(SammoaTopiaApplicationContext rootContext) { this.rootContext = rootContext; } @@ -169,20 +166,16 @@ public void destroyDb() { autoSaveListener.stop(); if (rootContext != null) { - try { - // destroy current db (only orks with h2) - rootContext.clear(true); + // destroy current db (only orks with h2) + rootContext.dropSchema(); - // clean root context - setRootContext(null); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + // clean root context + setRootContext(null); } } /** - * Close the persistence context. This will close the main {@link TopiaContext} + * Close the persistence context. This will close the main {@link SammoaTopiaPersistenceContext} * and the {@link AutoSaveListener}. * * @see AutoSaveListener#stop() @@ -191,7 +184,7 @@ public void close() { autoSaveListener.stop(); if (rootContext != null) { - closeContext(rootContext); + rootContext.closeContext(); rootContext = null; } } @@ -211,36 +204,28 @@ } /** - * Open a new {@link TopiaContext}. Errors are thrown using {@link TopiaRuntimeException} + * Open a new {@link SammoaTopiaPersistenceContext}. Errors are thrown using {@link TopiaException} * - * @return a new topiaContext - * @see TopiaContext#beginTransaction() + * @return a new SammoaTopiaPersistenceContext + * @see SammoaTopiaApplicationContext#newPersistenceContext() */ - protected TopiaContext openContext() { - try { - return getRootContext().beginTransaction(); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + protected SammoaTopiaPersistenceContext openContext() { + return getRootContext().newPersistenceContext(); } /** - * Close the given {@link TopiaContext}. Errors are thrown using {@link TopiaRuntimeException} + * Close the given {@link SammoaTopiaPersistenceContext}. Errors are thrown using {@link TopiaException} * - * @param context the topiaContext - * @see TopiaContext#closeContext() + * @param context the SammoaTopiaPersistenceContext + * @see SammoaTopiaPersistenceContext#closeContext() */ - protected void closeContext(TopiaContext context) { + protected void closeContext(SammoaTopiaPersistenceContext context) { if (!context.isClosed()) { - try { - context.closeContext(); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + context.closeContext(); } } - public void flushTransaction(TopiaContext tx) throws TopiaException { - ((TopiaContextImplementor) tx).getHibernate().flush(); + public void flushTransaction(SammoaTopiaPersistenceContext tx) throws TopiaException { + tx.getHibernateSupport().getHibernateSession().flush(); } } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistenceHelper.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistenceHelper.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistenceHelper.java 2014-05-16 08:16:53 UTC (rev 665) @@ -23,11 +23,7 @@ * #L% */ -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.persistence.TopiaDAO; + import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaPersistenceHelper; @@ -44,22 +40,4 @@ return SammoaEntityEnum.valueOf(type); } - @Override - public <E extends TopiaEntity> TopiaDAO<E> getDAO(TopiaContext tx, Class<E> type) { - try { - return SammoaDAOHelper.<E, TopiaDAO<E>>getDAO(tx, type); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - - @Override - public <E extends TopiaEntity> TopiaDAO<E> getDAO(TopiaContext tx, SammoaEntityEnum type) { - return (TopiaDAO<E>) getDAO(tx, type.getContract()); - } - - public void flushTransaction(TopiaContext tx) throws TopiaException { - ((TopiaContextImplementor)tx).getHibernate().flush(); - } - } Deleted: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateDAOImpl.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateDAOImpl.java 2014-05-16 08:16:53 UTC (rev 665) @@ -1,46 +0,0 @@ -package fr.ulr.sammoa.persistence; -/* - * #%L - * SAMMOA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 UMS 3462, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; - -import java.util.List; - -public class StrateDAOImpl<E extends Strate> extends StrateDAOAbstract<E> { - - public List<E> findAllByCampaignOrderedByCode(Campaign campaign) { - - String ql = "FROM StrateImpl " + - "WHERE sector.campaign = :campaign " + - "ORDER BY sector.sectorNumber, code"; - - try { - List<E> result = findAllByQuery(ql, "campaign", campaign); - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } -} //StrateDAOImpl<E extends Strate> Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateTopiaDao.java (rev 0) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateTopiaDao.java 2014-05-16 08:16:53 UTC (rev 665) @@ -0,0 +1,38 @@ +package fr.ulr.sammoa.persistence; +/* + * #%L + * SAMMOA :: Persistence + * $Id: StrateDAOImpl.java 494 2012-08-30 13:27:15Z fdesbois $ + * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import java.util.List; + +public class StrateTopiaDao extends AbstractStrateTopiaDao<Strate> { + + public List<Strate> findAllByCampaignOrderedByCode(Campaign campaign) { + + List<Strate> strates = forEquals(Strate.PROPERTY_SECTOR + "." + Sector.PROPERTY_CAMPAIGN, campaign) + .setOrderByArguments(Strate.PROPERTY_SECTOR + "." + Sector.PROPERTY_SECTOR_NUMBER, Strate.PROPERTY_CODE) + .findAll(); + + return strates; + } +} //StrateDAOImpl<E extends Strate> Deleted: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectDAOImpl.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectDAOImpl.java 2014-05-16 08:16:53 UTC (rev 665) @@ -1,47 +0,0 @@ -package fr.ulr.sammoa.persistence; -/* - * #%L - * SAMMOA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 UMS 3462, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; - -import java.util.List; - -public class TransectDAOImpl<E extends Transect> extends TransectDAOAbstract<E> { - - public List<E> findAllByCampaignOrderedByName(Campaign campaign) { - - String ql = "FROM TransectImpl " + - "WHERE strate.sector.campaign = :campaign " + - "ORDER BY name"; - - try { - List<E> result = findAllByQuery(ql, "campaign", campaign); - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - -} //TransectDAOImpl<E extends Transect> Deleted: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightDAOImpl.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightDAOImpl.java 2014-05-16 08:16:53 UTC (rev 665) @@ -1,121 +0,0 @@ -package fr.ulr.sammoa.persistence; -/* - * #%L - * SAMMOA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 UMS 3462, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.Maps; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -public class TransectFlightDAOImpl<E extends TransectFlight> extends TransectFlightDAOAbstract<E> { - - public Map<Transect, Long> countAllByTransect() { - - String ql = "SELECT transect, count(*) " + - "FROM TransectFlightImpl " + - "GROUP BY transect"; - - try { - List<Object[]> queryResults = findAllByQuery(Object[].class, ql); - Map<Transect, Long> result = Maps.newHashMap(); - for (Object[] row : queryResults) { - Transect transect = (Transect) row[0]; - Long nbTransectFlights = (Long) row[1]; - result.put(transect, nbTransectFlights); - } - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - - public Map<Transect, Long> countAllByTransects(Collection<Transect> transects) { - - - String ql = "SELECT transect, count(*) " + - "FROM TransectFlightImpl " + - "WHERE transect IN (:transects) " + - "GROUP BY transect"; - - try { - List<Object[]> queryResults = findAllByQuery( - Object[].class, ql, "transects", transects); - Map<Transect, Long> result = Maps.newHashMap(); - for (Object[] row : queryResults) { - Transect transect = (Transect) row[0]; - Long nbTransectFlights = (Long) row[1]; - result.put(transect, nbTransectFlights); - } - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - - public int getMaxCrossingNumberByTransect(Transect transect) { - - String ql = "SELECT max(crossingNumber), count(*), transect.nbTimes " + - "FROM TransectFlightImpl " + - "WHERE transect = :transect " + - "AND deleted = :deleted " + - "GROUP BY transect"; - try { - Object[] queryResults = (Object[]) getContext().findUnique( - ql, "transect", transect, "deleted", false); - - int result; - if (queryResults == null) { - // By default we use the transect nbTimes set by import - result = transect.getNbTimes(); - - } else { - int maxCrossingNumber = (Integer) queryResults[0]; - int nbTransectFlights = ((Long) queryResults[1]).intValue(); - int transectNbTimes = (Integer) queryResults[2]; - result = Math.max(Math.max(maxCrossingNumber, nbTransectFlights), transectNbTimes); - } - return result; - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } - } - - public void reAttachIndexInFlight(Iterable<TransectFlight> transectFlights) throws TopiaException { - StringBuilder builder = new StringBuilder(); - - String ql = "UPDATE TransectFlight SET flight_idx = %s " + - "WHERE topiaid = '%s';"; - - for (TransectFlight transectFlight : transectFlights) { - builder.append(String.format(ql, transectFlight.getIndexInFlight(), - transectFlight.getTopiaId())); - } - - getContext().executeSQL(builder.toString()); - } - -} Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightTopiaDao.java (rev 0) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightTopiaDao.java 2014-05-16 08:16:53 UTC (rev 665) @@ -0,0 +1,96 @@ +package fr.ulr.sammoa.persistence; +/* + * #%L + * SAMMOA :: Persistence + * $Id: TransectFlightDAOImpl.java 586 2012-09-21 13:00:10Z fdesbois $ + * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import org.apache.commons.collections.CollectionUtils; +import org.nuiton.topia.persistence.TopiaException; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +public class TransectFlightTopiaDao extends AbstractTransectFlightTopiaDao<TransectFlight> { + + public Map<Transect, Long> countAllByTransect(Collection<Transect> transects) { + + String hql = "SELECT " + TransectFlight.PROPERTY_TRANSECT + ", count(*) " + + newFromClause(); + + ImmutableMap<String, Object> parameters = ImmutableMap.of(); + + if (CollectionUtils.isEmpty(transects)) { + hql += " WHERE " + TransectFlight.PROPERTY_TRANSECT + " IN (:transects) "; + parameters = ImmutableMap.of("transects", (Object) transects); + } + + hql += " GROUP BY " + TransectFlight.PROPERTY_TRANSECT; + + List<Object[]> queryResults = findAll(hql, parameters); + + Map<Transect, Long> result = Maps.newHashMap(); + for (Object[] row : queryResults) { + Transect transect = (Transect) row[0]; + Long nbTransectFlights = (Long) row[1]; + result.put(transect, nbTransectFlights); + } + return result; + } + + public int getMaxCrossingNumberByTransect(Transect transect) { + + String hql = "SELECT max(" + TransectFlight.PROPERTY_CROSSING_NUMBER + "), count(*)" + + newFromClause() + " " + + "WHERE " + TransectFlight.PROPERTY_TRANSECT + " = :transect " + + "AND " + TransectFlight.PROPERTY_DELETED + " = :deleted "; + + ImmutableMap<String, Object> parameters = ImmutableMap.of("transect", (Object) transect, "deleted", false); + + Object[] queryResults = findAny(hql, parameters); + + int maxCrossingNumber = queryResults[0] != null ? (Integer) queryResults[0] : 0; + int nbTransectFlights = ((Long) queryResults[1]).intValue(); + int result = Math.max(Math.max(maxCrossingNumber, nbTransectFlights), transect.getNbTimes()); + + return result; + } + + + public void reAttachIndexInFlight(Iterable<TransectFlight> transectFlights) throws TopiaException { + + StringBuilder builder = new StringBuilder(); + + String ql = "UPDATE TransectFlight SET flight_idx = %s " + + "WHERE topiaid = '%s';"; + + for (TransectFlight transectFlight : transectFlights) { + builder.append(String.format(ql, transectFlight.getIndexInFlight(), + transectFlight.getTopiaId())); + } + + topiaSqlSupport.executeSql(builder.toString()); + } + +} Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectTopiaDao.java (rev 0) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectTopiaDao.java 2014-05-16 08:16:53 UTC (rev 665) @@ -0,0 +1,42 @@ +package fr.ulr.sammoa.persistence; +/* + * #%L + * SAMMOA :: Persistence + * $Id: TransectDAOImpl.java 497 2012-08-30 13:28:13Z fdesbois $ + * $HeadURL: https://svn.codelutin.com/sammoa/trunk/sammoa-persistence/src/main/java/fr/… $ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import java.util.List; + +public class TransectTopiaDao extends AbstractTransectTopiaDao<Transect> { + + public static final String PROPERTY_CAMPAIGN = Transect.PROPERTY_STRATE + "." + Strate.PROPERTY_SECTOR + "." + Sector.PROPERTY_CAMPAIGN; + + public List<Transect> findAllByCampaignOrderedByName(Campaign campaign) { + + List<Transect> transects = forEquals(PROPERTY_CAMPAIGN,campaign) + .setOrderByArguments(Transect.PROPERTY_NAME) + .findAll(); + + return transects; + + } + +} //TransectDAOImpl<E extends Transect> Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Validables.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Validables.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Validables.java 2014-05-16 08:16:53 UTC (rev 665) @@ -3,8 +3,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% Modified: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/DataAutoSaveListenerTest.java =================================================================== --- trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/DataAutoSaveListenerTest.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/DataAutoSaveListenerTest.java 2014-05-16 08:16:53 UTC (rev 665) @@ -27,8 +27,7 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaException; import java.util.Date; @@ -67,16 +66,16 @@ Campaign campaign = database.createCampaign("PACOMM", "FRANCE"); - TopiaContext transaction = database.beginTransaction(); + SammoaTopiaPersistenceContext transaction = database.beginTransaction(); - FlightDAO flightDAO = SammoaDAOHelper.getFlightDAO(transaction); + FlightTopiaDao flightDAO = transaction.getFlightDao(); Flight flight = flightDAO.createByNaturalId("A", number, campaign); - ObservationDAO observationDAO = SammoaDAOHelper.getObservationDAO(transaction); + ObservationTopiaDao observationDAO = transaction.getObservationDao(); Observation result = observationDAO.createByNaturalId(number, flight); result.setObservationTime(time); - transaction.commitTransaction(); + transaction.commit(); database.endTransaction(transaction); return result; @@ -84,12 +83,12 @@ protected Observation getObservation(String topiaId) throws TopiaException { - TopiaContext transaction = database.beginTransaction(); + SammoaTopiaPersistenceContext transaction = database.beginTransaction(); - ObservationDAO observationDAO = SammoaDAOHelper.getObservationDAO(transaction); + ObservationTopiaDao observationDAO = transaction.getObservationDao(); Observation result = observationDAO.findByTopiaId(topiaId); - transaction.commitTransaction(); + transaction.commit(); database.endTransaction(transaction); return result; Modified: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java =================================================================== --- trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java 2014-05-16 08:16:53 UTC (rev 665) @@ -28,9 +28,8 @@ import org.apache.commons.lang3.StringUtils; import org.junit.rules.TestWatcher; import org.junit.runner.Description; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,7 +61,7 @@ protected Properties dbConfiguration; - protected TopiaContext rootCtxt; + protected SammoaTopiaApplicationContext rootCtxt; protected Description description; @@ -83,7 +82,7 @@ * @since 3.0 */ protected Class<? extends TopiaEntity>[] getImplementationClasses() { - return SammoaDAOHelper.getImplementationClasses(); + return SammoaEntityEnum.getImplementationClasses(); } @Override @@ -117,11 +116,11 @@ } dbConfiguration.setProperty( - TopiaContextFactory.CONFIG_URL, jdbcUrl); + TopiaConfigurationConstants.CONFIG_URL, jdbcUrl); onDbConfigurationCreate(dbConfiguration, testBasedir, dbPath); - rootCtxt = TopiaContextFactory.getContext(dbConfiguration); + rootCtxt = new SammoaTopiaApplicationContext(dbConfiguration); onRootCtxtCreate(rootCtxt); @@ -156,15 +155,15 @@ } } - protected void onRootCtxtCreate(TopiaContext rootCtxt) { + protected void onRootCtxtCreate(SammoaTopiaApplicationContext rootCtxt) { persistence.setRootContext(rootCtxt); } - public TopiaContext beginTransaction() throws TopiaException { + public SammoaTopiaPersistenceContext beginTransaction() throws TopiaException { return persistence.beginTransaction(); } - public void endTransaction(TopiaContext transaction) { + public void endTransaction(SammoaTopiaPersistenceContext transaction) { persistence.endTransaction(transaction); } @@ -174,15 +173,15 @@ public Campaign createCampaign(String code, String regionCode) throws TopiaException { - TopiaContext transaction = beginTransaction(); + SammoaTopiaPersistenceContext transaction = beginTransaction(); - RegionDAO regionDAO = SammoaDAOHelper.getRegionDAO(transaction); + RegionTopiaDao regionDAO = transaction.getRegionDao(); Region region = regionDAO.createByNaturalId(regionCode); - CampaignDAO campaignDAO = SammoaDAOHelper.getCampaignDAO(transaction); + CampaignTopiaDao campaignDAO = transaction.getCampaignDao(); Campaign result = campaignDAO.createByNaturalId(code, region); - transaction.commitTransaction(); + transaction.commit(); endTransaction(transaction); return result; @@ -192,7 +191,7 @@ return testBasedir; } - public TopiaContext getRootCtxt() { + public SammoaTopiaApplicationContext getRootCtxt() { return rootCtxt; } @@ -216,7 +215,7 @@ stream.close(); } result.setProperty( - TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, + TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, getImplementationClassesAsString()); return result; Modified: trunk/sammoa-persistence/src/test/resources/sammoa-test.properties =================================================================== --- trunk/sammoa-persistence/src/test/resources/sammoa-test.properties 2014-05-16 08:08:04 UTC (rev 664) +++ trunk/sammoa-persistence/src/test/resources/sammoa-test.properties 2014-05-16 08:16:53 UTC (rev 665) @@ -37,4 +37,4 @@ hibernate.connection.driver_class=org.h2.Driver #Not necessary, but useful -hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider +#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider

1 0

16 May '14

Author: athimel Date: 2014-05-16 10:08:04 +0200 (Fri, 16 May 2014) New Revision: 664 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/664 Log: Update version Modified: trunk/sammoa-ui-swing/pom.xml trunk/sammoa-ui-swing/src/license/THIRD-PARTY.properties trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/CloseAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectTableModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/AddAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CenterObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CircleBackAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/EndAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/LeftObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextTransectAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/RightObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAudioAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAudioAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidFlightAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBarModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/UIImporter.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapLauncherUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java trunk/sammoa-ui-swing/src/main/resources/logback.xml Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/pom.xml 2014-05-16 08:08:04 UTC (rev 664) @@ -125,6 +125,11 @@ </dependency> <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-config</artifactId> + </dependency> + + <dependency> <groupId>org.swinglabs</groupId> <artifactId>jxlayer</artifactId> </dependency> Modified: trunk/sammoa-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/sammoa-ui-swing/src/license/THIRD-PARTY.properties 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/license/THIRD-PARTY.properties 2014-05-16 08:08:04 UTC (rev 664) @@ -1,18 +1,21 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 # - Apache 2 # - Apache License 2.0 +# - Apache License, version 2.0 # - Apache Software Licenses # - BSD License # - BSD-3 Clause License +# - Common Development and Distribution License # - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - v 1.0 -# - GNU General Public License - Version 2 with the class path exception -# - GNU LESSER GENERAL PUBLIC LICENSE +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License # - GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. -# - GNU Lesser General Public License, version 2.1 # - GNU Library or Lesser General Public License # - General Public License (GPL) # - LGPL 2.1 @@ -22,14 +25,13 @@ # - MPL 1.1 # - New BSD License # - OpenMap Software License Agreement +# - Public Domain # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - lgpl -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Apr 23 23:57:44 CEST 2013 +#Thu May 15 16:05:25 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License Modified: trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/filtered-resources/sammoa.properties 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ hibernate.connection.username=sa hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider +#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider sammoa.version=${project.version} sammoa.url=${project.url} Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/CloseAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/CloseAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/CloseAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.JDialog; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 24/07/12 @@ -45,7 +45,7 @@ protected JComponent ui; public CloseAction(JComponent ui) { - super(_("sammoa.action.close")); + super(t("sammoa.action.close")); Preconditions.checkArgument(ui instanceof SammoaUI); this.ui = ui; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -48,24 +48,21 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.ErrorDialogUI; -import jaxx.runtime.swing.editor.config.ConfigUIHelper; -import org.nuiton.util.ApplicationConfig; +import jaxx.runtime.swing.config.ConfigUIHelper; +import org.nuiton.config.ApplicationConfig; import org.nuiton.widget.SwingSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.UIManager; +import javax.swing.*; import javax.swing.plaf.BorderUIResource; -import java.awt.Color; -import java.awt.Desktop; +import java.awt.*; import java.io.File; import java.net.URL; import java.util.Calendar; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/05/12 @@ -153,7 +150,7 @@ default: case HOME: changeScreen(new HomeUI(context), - _("sammoa.title.home")); + t("sammoa.title.home")); break; case VALIDATION: case FLIGHT: @@ -162,27 +159,27 @@ Campaign campaign = flight.getCampaign(); changeScreen(flightUI, - _("sammoa.title.flight", - flight.getSystemId(), - campaign.getCode(), - campaign.getRegion().getCode(), - flight.getFlightNumber())); + t("sammoa.title.flight", + flight.getSystemId(), + campaign.getCode(), + campaign.getRegion().getCode(), + flight.getFlightNumber())); break; case CAMPAIGN: changeScreen(new CampaignUI(context), - _("sammoa.title.campaign")); + t("sammoa.title.campaign")); break; case EXPORT_MAP: changeScreen(new ExportMapUI(context), - _("sammoa.title.exportshape")); + t("sammoa.title.exportshape")); break; case EXPORT_APPLICATION: changeScreen(new ExportApplicationUI(context), - _("sammoa.title.exportApplication")); + t("sammoa.title.exportApplication")); break; case IMPORT_APPLICATION: changeScreen(new ImportApplicationUI(context), - _("sammoa.title.importApplication")); + t("sammoa.title.importApplication")); break; } @@ -225,7 +222,7 @@ ConfigUIHelper helper = new ConfigUIHelper(config); helper.registerCallBack( - "ui", n_("sammoa.action.reload.ui"), + "ui", n("sammoa.action.reload.ui"), SwingUtil.createActionIcon("reload-ui"), new Runnable() { @@ -235,7 +232,7 @@ } } ).registerCallBack( - "home", n_("sammoa.action.reload.home"), + "home", n("sammoa.action.reload.home"), SwingUtil.createActionIcon("config"), new Runnable() { @@ -248,7 +245,7 @@ } } ).registerCallBack( - "actions", n_("sammoa.action.reload.actions"), + "actions", n("sammoa.action.reload.actions"), SwingUtil.createActionIcon("config"), new Runnable() { @@ -264,7 +261,7 @@ } } ).registerCallBack( - "audio", n_("sammoa.action.reload.audio"), + "audio", n("sammoa.action.reload.audio"), SwingUtil.createActionIcon("config"), new Runnable() { @@ -282,7 +279,7 @@ } } ).registerCallBack( - "gps", n_("sammoa.action.reload.gps"), + "gps", n("sammoa.action.reload.gps"), SwingUtil.createActionIcon("config"), new Runnable() { @@ -299,8 +296,8 @@ // APPLICATION - helper.addCategory(n_("sammoa.config.category.applications"), - n_("sammoa.config.category.applications.description")) + helper.addCategory(n("sammoa.config.category.applications"), + n("sammoa.config.category.applications.description")) .addOption(SammoaConfig.SammoaConfigOption.SYSTEM_ID) .setOptionCallBack("home") .addOption(SammoaConfig.SammoaConfigOption.DATA_DIRECTORY) @@ -313,8 +310,8 @@ // SHORTCUT - helper.addCategory(n_("sammoa.config.category.shortcuts"), - n_("sammoa.config.category.shortcuts.description"), "actions") + helper.addCategory(n("sammoa.config.category.shortcuts"), + n("sammoa.config.category.shortcuts.description"), "actions") .addOption(SammoaConfig.SammoaConfigOption.KEY_START) .addOption(SammoaConfig.SammoaConfigOption.KEY_STOP) .addOption(SammoaConfig.SammoaConfigOption.KEY_BEGIN) @@ -332,8 +329,8 @@ // GPS - helper.addCategory(n_("sammoa.config.category.gps"), - n_("sammoa.config.category.gps.description"), "gps") + helper.addCategory(n("sammoa.config.category.gps"), + n("sammoa.config.category.gps.description"), "gps") .addOption(GpsConfig.GpsConfigOption.GPS_HANDLER, SammoaConfig.PROPERTY_GPS_CONFIG + "." + GpsConfig.PROPERTY_GPS_HNALDER_CLASS) .addOption(GpsConfig.GpsConfigOption.GPS_DEVICE) @@ -343,8 +340,8 @@ // AUDIO - helper.addCategory(n_("sammoa.config.category.audio"), - n_("sammoa.config.category.audio.description"), "audio") + helper.addCategory(n("sammoa.config.category.audio"), + n("sammoa.config.category.audio.description"), "audio") .addOption(AudioConfig.AudioConfigOption.SAMPLE_RATE) .addOption(AudioConfig.AudioConfigOption.SAMPLE_SIZE_IN_BITS) .addOption(AudioConfig.AudioConfigOption.RECORD_DELAY_IN_SECONDS) @@ -353,8 +350,8 @@ // OTHER - helper.addCategory(n_("sammoa.config.category.other"), - n_("sammoa.config.category.other.description")) + helper.addCategory(n("sammoa.config.category.other"), + n("sammoa.config.category.other.description")) .addOption(SammoaConfig.SammoaConfigOption.SITE_URL) .addOption(SammoaConfig.SammoaConfigOption.UI_CONFIG_FILE) .setOptionCallBack("ui"); @@ -408,13 +405,13 @@ currentBody = newBody; context.getSwingSession().add(currentBody); ui.getBody().setTitle(title); - ui.getBody().add(currentBody); + ui.getBody().add(currentBody, 1); } protected void closeSammoa(boolean exit) { if (checkCurrentFlight( - _("sammoa.confirmDialog.flightInProgress.message.exit"))) { + t("sammoa.confirmDialog.flightInProgress.message.exit"))) { context.getSwingSession().save(); @@ -451,7 +448,7 @@ public void showHome() { if (checkCurrentFlight( - _("sammoa.confirmDialog.flightInProgress.message.showHome"))) { + t("sammoa.confirmDialog.flightInProgress.message.showHome"))) { setScreen(SammoaScreen.HOME); } } @@ -467,8 +464,8 @@ String thirdPartyPath = "META-INF/" + name + "-THIRD-PARTY.txt"; AboutPanel about = new AboutPanel(); - about.setTitle(_("sammoa.title.about")); - about.setAboutText(_("sammoa.about.message")); + about.setTitle(t("sammoa.title.about")); + about.setAboutText(t("sammoa.about.message")); SammoaConfig config = context.getConfig(); int currentYear = Calendar.getInstance().get(Calendar.YEAR); @@ -480,10 +477,10 @@ years = inceptionYear + ""; } - about.setBottomText(_("sammoa.about.bottomText", - config.getOrganizationName(), - years, - config.getVersion())); + about.setBottomText(t("sammoa.about.bottomText", + config.getOrganizationName(), + years, + config.getVersion())); about.setIconPath(iconPath); about.setLicenseFile(licensePath); about.setThirdpartyFile(thirdPartyPath); @@ -500,7 +497,7 @@ URL siteURL = config.getSiteUrl(); - logger.info(_("sammoa.message.goto.site", siteURL)); + logger.info(t("sammoa.message.goto.site", siteURL)); if (logger.isDebugEnabled()) { logger.debug("goto " + siteURL); @@ -552,7 +549,7 @@ int dialogResponse = JOptionPane.showConfirmDialog( ui, message, - _("sammoa.confirmDialog.flightInProgress.title"), + t("sammoa.confirmDialog.flightInProgress.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, UIManager.getIcon("warning") Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java 2014-05-16 08:08:04 UTC (rev 664) @@ -40,7 +40,7 @@ import java.io.File; import java.util.Locale; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 16/05/12 @@ -105,7 +105,7 @@ if (logger.isErrorEnabled()) { logger.error("Error during db connection", ex); } - SammoaUtil.showErrorMessage(null, _("sammoa.messageDialog.persistence.error", + SammoaUtil.showErrorMessage(null, t("sammoa.messageDialog.persistence.error", ex.getDbUrl(), ex.getMessageWithCause())); System.exit(1); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java 2014-05-16 08:08:04 UTC (rev 664) @@ -33,12 +33,12 @@ import fr.ulr.sammoa.ui.swing.flight.TransectModel; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.swing.renderer.DecoratorTableCellRenderer; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; -import javax.swing.ListCellRenderer; +import javax.swing.*; import javax.swing.table.TableCellRenderer; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 29/05/12 @@ -66,10 +66,10 @@ String result; if (strate == null) { - result = _("sammoa.strate.decorator.all"); + result = t("sammoa.strate.decorator.all"); } else { - result = _("sammoa.strate.decorator.strate", strate.getCode()); + result = t("sammoa.strate.decorator.strate", strate.getCode()); } return result; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.css 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.css 2014-05-16 08:08:04 UTC (rev 664) @@ -79,7 +79,7 @@ } #beginDatePicker { - patternLayout:{_("sammoa.datePattern")}; + patternLayout:{t("sammoa.datePattern")}; date:{getModel().getBeginDate()}; } @@ -88,7 +88,7 @@ } #endDatePicker { - patternLayout:{_("sammoa.datePattern")}; + patternLayout:{t("sammoa.datePattern")}; date:{getModel().getEndDate()}; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -35,7 +35,7 @@ jaxx.runtime.validator.swing.SwingValidatorUtil jaxx.runtime.validator.swing.SwingValidatorMessageTableModel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -56,7 +56,7 @@ import java.io.IOException; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 04/07/12 @@ -290,7 +290,7 @@ @Override public String importCsvFile(File file) throws IOException { int nbImported = importCsvService.importObservers(getModel().getId(), file); - return _("sammoa.messageDialog.observers.import.success", nbImported); + return t("sammoa.messageDialog.observers.import.success", nbImported); } }; @@ -298,7 +298,7 @@ protected String onDbfLoaded(Iterable<Strate> elements, CampaignStorage storage) { int nbImported = importMapService.importStrates(storage.getId(), elements); - return _("sammoa.messageDialog.strates.import.success", nbImported); + return t("sammoa.messageDialog.strates.import.success", nbImported); } }; @@ -308,7 +308,7 @@ @Override protected String onDbfLoaded(Iterable<Transect> elements, CampaignStorage storage) { int nbImported = importMapService.importTransects(storage.getId(), elements); - return _("sammoa.messageDialog.transects.import.success", nbImported); + return t("sammoa.messageDialog.transects.import.success", nbImported); } }; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUI.css 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUI.css 2014-05-16 08:08:04 UTC (rev 664) @@ -80,7 +80,7 @@ } #beginDatePicker { - patternLayout:{_("sammoa.dateTimePattern")}; + patternLayout:{t("sammoa.dateTimePattern")}; showPopupButton:false; editable:{model.isValidationMode()}; date:{bean.getBeginDate()}; @@ -91,7 +91,7 @@ } #endDatePicker { - patternLayout:{_("sammoa.dateTimePattern")}; + patternLayout:{t("sammoa.dateTimePattern")}; showPopupButton:false; editable:{model.isValidationMode()}; date:{bean.getEndDate()}; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -126,30 +126,16 @@ import jaxx.runtime.swing.editor.cell.NumberCellEditor; import org.apache.commons.lang3.BooleanUtils; import org.jdesktop.swingx.JXTable; -import org.nuiton.util.ApplicationConfig; import org.nuiton.util.TimeLog; import org.nuiton.validator.bean.list.BeanListValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.AbstractButton; -import javax.swing.Action; -import javax.swing.ActionMap; -import javax.swing.DefaultCellEditor; -import javax.swing.Icon; -import javax.swing.InputMap; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JTable; -import javax.swing.KeyStroke; -import javax.swing.ListCellRenderer; -import javax.swing.ListSelectionModel; +import javax.swing.*; import javax.swing.event.ListSelectionEvent; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; -import java.awt.Component; +import java.awt.*; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; import java.awt.event.ItemEvent; @@ -165,7 +151,7 @@ import java.util.Map; import java.util.Properties; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/05/12 @@ -389,7 +375,7 @@ List<Transect> transects = FluentIterable.from(transectFlights) .transform(TransectFlights.toTransect()) - .toImmutableList(); + .toList(); Map<Transect, Long> transectRealNbTimes = flightService.getTransectRealNbTimes(transects); @@ -875,7 +861,7 @@ List<Transect> entities = FluentIterable.from(transects) .transform(TransectModel.toTransect()) - .toImmutableList(); + .toList(); // Execute add transects to create the new transectFlights List<TransectFlight> transectFlights = @@ -1168,7 +1154,7 @@ informationDelegator.setShowLights(false); // add combo box to informationDelegator - JCheckBox followMapCheckBox = new JCheckBox(_("sammoa.map.mapFollow")); + JCheckBox followMapCheckBox = new JCheckBox(t("sammoa.map.mapFollow")); followMapCheckBox.addItemListener(new ItemListener() { @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectTableModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectTableModel.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectTableModel.java 2014-05-16 08:08:04 UTC (rev 664) @@ -38,7 +38,7 @@ import javax.swing.table.AbstractTableModel; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** @author sletellier <letellier(a)codelutin.com> */ public class TransectTableModel extends AbstractTableModel { @@ -149,7 +149,7 @@ protected enum TransectColumn { INDEX( - _("sammoa.flightPanel.table.column.index"), + t("sammoa.flightPanel.table.column.index"), true, Integer.class, TransectFlightModel.PROPERTY_INDEX @@ -176,14 +176,14 @@ // } }, NAME( - _("sammoa.flightPanel.table.column.name"), + t("sammoa.flightPanel.table.column.name"), false, TransectFlightModel.PROPERTY_TRANSECT, TransectModel.PROPERTY_SOURCE, Transect.PROPERTY_NAME ), POSITION_NAVIGATOR( - _("sammoa.flightPanel.table.column.position.navigator"), + t("sammoa.flightPanel.table.column.position.navigator"), true, Observer.class ) { @@ -200,7 +200,7 @@ } }, POSITION_LEFT( - _("sammoa.flightPanel.table.column.position.left"), + t("sammoa.flightPanel.table.column.position.left"), true, Observer.class ) { @@ -217,7 +217,7 @@ } }, POSITION_RIGHT( - _("sammoa.flightPanel.table.column.position.right"), + t("sammoa.flightPanel.table.column.position.right"), true, Observer.class ) { @@ -234,7 +234,7 @@ } }, POSITION_CO_NAVIGATOR( - _("sammoa.flightPanel.table.column.position.co-navigator"), + t("sammoa.flightPanel.table.column.position.co-navigator"), true, Observer.class ) { @@ -251,13 +251,13 @@ } }, CROSSING_NUMBER( - _("sammoa.flightPanel.table.column.crossingNumber"), + t("sammoa.flightPanel.table.column.crossingNumber"), true, int.class, TransectFlightModel.PROPERTY_CROSSING_NUMBER ), // NB_TIMES( -// _("sammoa.flightPanel.table.column.nbTimes"), +// t("sammoa.flightPanel.table.column.nbTimes"), // true, // Integer.class, // TransectFlightModel.PROPERTY_TRANSECT, @@ -265,7 +265,7 @@ // Transect.PROPERTY_NB_TIMES // ), DELETED( - _("sammoa.flightPanel.table.column.deleted"), + t("sammoa.flightPanel.table.column.deleted"), true, TransectFlightModel.class ) { @@ -279,7 +279,7 @@ } }, ACTION( - _("sammoa.flightPanel.table.column.action"), + t("sammoa.flightPanel.table.column.action"), true, TransectFlightModel.class ) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/AddAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/AddAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/AddAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -44,7 +44,7 @@ public AddAction(JAXXContext context) { super(Resource.getIcon("/icons/action-add.png"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.add.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.add.tip")); bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -33,7 +33,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -45,8 +45,8 @@ private static final long serialVersionUID = 1L; public BeginAction(JAXXContext context) { - super(_("sammoa.action.begin"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.begin.tip")); + super(t("sammoa.action.begin"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.begin.tip")); bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); bindModelProperty(FlightUIModel.PROPERTY_CURRENT_ROUTE, false); bindModelProperty(FlightUIModel.PROPERTY_NEXT_TRANSECT + ".deleted", false); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CenterObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CenterObservationAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CenterObservationAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -28,7 +28,7 @@ import javax.swing.Action; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -40,7 +40,7 @@ private static final long serialVersionUID = 1L; public CenterObservationAction(JAXXContext context) { - super(_("sammoa.observation.observations.center"), context, Position.NAVIGATOR); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.center.tip")); + super(t("sammoa.observation.observations.center"), context, Position.NAVIGATOR); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.center.tip")); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CircleBackAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CircleBackAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CircleBackAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -37,7 +37,7 @@ import java.awt.event.ActionEvent; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -54,7 +54,7 @@ public CircleBackAction(JAXXContext context) { super(CIRCLE_BACK_ICON, context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.circleBack.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.circleBack.tip")); bindModelProperty(FlightUIModel.PROPERTY_CURRENT_ROUTE, false); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/DeleteTransectAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -37,7 +37,7 @@ import javax.swing.JComponent; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/09/12 @@ -53,7 +53,7 @@ public DeleteTransectAction(JAXXContext context) { super((String) null, context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.deleteTransect.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.deleteTransect.tip")); } @Override @@ -76,7 +76,7 @@ // #1372: If flight isn't started, we propose to delete definitely the transect if (FlightState.WAITING == getModel().getFlightState() && transectFlight.isDeleted()) { - if (SammoaUtil.askQuestion((FlightUI) context, _("sammoa.confirmDialog.deleteTransect.message"))) { + if (SammoaUtil.askQuestion((FlightUI) context, t("sammoa.confirmDialog.deleteTransect.message"))) { FlightService service = getSammoaUIContext().getService(FlightService.class); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/EndAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/EndAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/EndAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -30,7 +30,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -42,8 +42,8 @@ private static final long serialVersionUID = 1L; public EndAction(JAXXContext context) { - super(_("sammoa.action.end"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.end.tip")); + super(t("sammoa.action.end"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.end.tip")); bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/LeftObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/LeftObservationAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/LeftObservationAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -28,7 +28,7 @@ import javax.swing.Action; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -40,7 +40,7 @@ private static final long serialVersionUID = 1L; public LeftObservationAction(JAXXContext context) { - super(_("sammoa.observation.observations.left"), context, Position.FRONT_LEFT); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.left.tip")); + super(t("sammoa.observation.observations.left"), context, Position.FRONT_LEFT); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.left.tip")); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -30,7 +30,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -42,8 +42,8 @@ private static final long serialVersionUID = 1L; public NextAction(JAXXContext context) { - super(_("sammoa.action.next"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.next.tip")); + super(t("sammoa.action.next"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.next.tip")); bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); bindModelProperty(FlightUIModel.PROPERTY_NEXT_TRANSECT + ".deleted", false); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextTransectAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextTransectAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.JComponent; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -46,7 +46,7 @@ public NextTransectAction(JAXXContext context) { super(Resource.getIcon("/icons/action-next-transect.png"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.nextTransect.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.nextTransect.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/RightObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/RightObservationAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/RightObservationAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -28,7 +28,7 @@ import javax.swing.Action; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 03/07/12 @@ -40,7 +40,7 @@ private static final long serialVersionUID = 1L; public RightObservationAction(JAXXContext context) { - super(_("sammoa.observation.observations.right"), context, Position.FRONT_RIGHT); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.right.tip")); + super(t("sammoa.observation.observations.right"), context, Position.FRONT_RIGHT); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.right.tip")); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 05/07/12 @@ -44,7 +44,7 @@ public StartAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_play.png"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.start.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.start.tip")); bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAudioAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAudioAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAudioAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 05/07/12 @@ -44,7 +44,7 @@ public StartAudioAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_play.png"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.startAudio.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.startAudio.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -33,7 +33,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 05/07/12 @@ -46,13 +46,13 @@ public StopAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_stop.png"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.stop.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.stop.tip")); bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } @Override public void actionPerformed(ActionEvent e) { - if (SammoaUtil.askQuestion((FlightUI) context, _("sammoa.confirmDialog.stopFlight.message"))) { + if (SammoaUtil.askQuestion((FlightUI) context, t("sammoa.confirmDialog.stopFlight.message"))) { getFlightController().stop(); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAudioAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAudioAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAudioAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 05/07/12 @@ -44,7 +44,7 @@ public StopAudioAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_stop.png"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.stopAudio.tip")); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.stopAudio.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -35,7 +35,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 23/08/12 @@ -123,7 +123,7 @@ protected boolean askConfirmDelete(String label) { return SammoaUtil.askQuestion( (FlightUI) context, - _("sammoa.confirmDialog.validation.delete.message", label) + t("sammoa.confirmDialog.validation.delete.message", label) ); } @@ -131,7 +131,7 @@ String cascadeLabel) { return SammoaUtil.askQuestion( (FlightUI) context, - _("sammoa.confirmDialog.validation.deleteByCascade.message", label, cascadeLabel) + t("sammoa.confirmDialog.validation.deleteByCascade.message", label, cascadeLabel) ); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidFlightAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidFlightAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidFlightAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -35,7 +35,7 @@ import java.awt.event.ActionEvent; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 23/08/12 @@ -52,8 +52,8 @@ protected boolean validatorIsAdjusting; public ValidFlightAction(JAXXContext context) { - super(_("sammoa.action.validFlight"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validFlight.tip")); + super(t("sammoa.action.validFlight"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.validFlight.tip")); } @Override @@ -64,22 +64,22 @@ boolean hasDeletedTransect = Validables.isAnyDeleted(transectFlights); if (!hasDeletedTransect - || askConfirmDeleteByCascade(_("sammoa.validable.flight"), - _("sammoa.validable.transect"))) { + || askConfirmDeleteByCascade(t("sammoa.validable.flight"), + t("sammoa.validable.transect"))) { List<Route> routes = getModel().getRoutes(); boolean hasDeletedRoute = Validables.isAnyDeleted(routes); if (!hasDeletedRoute - || askConfirmDeleteByCascade(_("sammoa.validable.flight"), - _("sammoa.validable.route"))) { + || askConfirmDeleteByCascade(t("sammoa.validable.flight"), + t("sammoa.validable.route"))) { boolean hasDeletedObservation = Validables.isAnyDeleted(getModel().getObservations()); if (!hasDeletedObservation - || askConfirmDeleteByCascade(_("sammoa.validable.flight"), - _("sammoa.validable.observation"))) { + || askConfirmDeleteByCascade(t("sammoa.validable.flight"), + t("sammoa.validable.observation"))) { // Toggle valid value boolean valid = !getValidModel().getFlightValidFlag(flight); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidObservationAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 23/08/12 @@ -46,8 +46,8 @@ private static final long serialVersionUID = 1L; public ValidObservationAction(JAXXContext context) { - super(_("sammoa.action.validObservation"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validObservation.tip")); + super(t("sammoa.action.validObservation"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.validObservation.tip")); } @Override @@ -63,7 +63,7 @@ if (observation.isDeleted()) { - if (askConfirmDelete(_("sammoa.validable.observation"))) { + if (askConfirmDelete(t("sammoa.validable.observation"))) { Observation observationChanged = getValidationService().validateObservation(observation); getModel().removeObservation(observationChanged); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidRouteAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -32,7 +32,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 23/08/12 @@ -49,8 +49,8 @@ protected boolean validatorIsAdjusting; public ValidRouteAction(JAXXContext context) { - super(_("sammoa.action.validRoute"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validRoute.tip")); + super(t("sammoa.action.validRoute"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.validRoute.tip")); } @Override @@ -69,7 +69,7 @@ if (route.isDeleted()) { - if (askConfirmDelete(_("sammoa.validable.route"))) { + if (askConfirmDelete(t("sammoa.validable.route"))) { Route routeChanged = getValidationService().validateRoute(route); getModel().removeRoute(routeChanged); } @@ -80,8 +80,8 @@ getModel().getObservations(), route, getModel().getRoutes()); if (!hasDeletedObservation - || askConfirmDeleteByCascade(_("sammoa.validable.route"), - _("sammoa.validable.observation"))) { + || askConfirmDeleteByCascade(t("sammoa.validable.route"), + t("sammoa.validable.observation"))) { Route routeChanged = getValidationService().validateRoute(route); getModel().updateRoute(routeChanged); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2014-05-16 08:08:04 UTC (rev 664) @@ -37,7 +37,7 @@ import javax.swing.Action; import java.awt.event.ActionEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 23/08/12 @@ -54,8 +54,8 @@ protected boolean validatorIsAdjusting; public ValidTransectAction(JAXXContext context) { - super(_("sammoa.action.validTransect"), context); - putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validTransect.tip")); + super(t("sammoa.action.validTransect"), context); + putValue(Action.SHORT_DESCRIPTION, t("sammoa.action.validTransect.tip")); } @Override @@ -78,7 +78,7 @@ if (transectFlight.isDeleted()) { - if (askConfirmDelete(_("sammoa.validable.transect"))) { + if (askConfirmDelete(t("sammoa.validable.transect"))) { getValidationService().validateTransectFlight(getModel().getFlight(), transectFlight); getModel().removeTransectFlight(index); } @@ -93,8 +93,8 @@ boolean hasDeletedRoute = routes.anyMatch(Validables.isDeleted()); if (!hasDeletedRoute - || askConfirmDeleteByCascade(_("sammoa.validable.transect"), - _("sammoa.validable.route"))) { + || askConfirmDeleteByCascade(t("sammoa.validable.transect"), + t("sammoa.validable.route"))) { boolean hasDeletedObservation = false; for (Route route : routes) { @@ -103,8 +103,8 @@ } if (!hasDeletedObservation - || askConfirmDeleteByCascade(_("sammoa.validable.transect"), - _("sammoa.validable.observation"))) { + || askConfirmDeleteByCascade(t("sammoa.validable.transect"), + t("sammoa.validable.observation"))) { TransectFlight transectFlightChanged = getValidationService().validateTransectFlight(getModel().getFlight(), transectFlight); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBarModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBarModel.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/onBoard/OnBoardBarModel.java 2014-05-16 08:08:04 UTC (rev 664) @@ -31,7 +31,7 @@ import java.awt.Color; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** @author sletellier <letellier(a)codelutin.com> */ public class OnBoardBarModel extends AbstractSerializableBean implements GpsLocationListener { @@ -51,7 +51,7 @@ protected Color effortPanelColor; public String getAlt() { - return _("sammoa.statusbar.alt", alt); + return t("sammoa.statusbar.alt", alt); } public void setAlt(float alt) { @@ -61,7 +61,7 @@ } public String getSpeed() { - return _("sammoa.statusbar.speed", speed); + return t("sammoa.statusbar.speed", speed); } public void setSpeed(float speed) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanel.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -43,7 +43,7 @@ jaxx.runtime.swing.model.GenericListModel jaxx.runtime.validator.swing.SwingListValidatorMessageTableModel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -78,25 +78,18 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.TableColumnExt; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.list.BeanListValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.Action; -import javax.swing.DefaultCellEditor; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JTable; -import javax.swing.JTextField; -import javax.swing.ListCellRenderer; +import javax.swing.*; import javax.swing.border.LineBorder; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableModel; -import java.awt.Color; -import java.awt.Component; +import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; @@ -105,8 +98,8 @@ import java.util.Date; import java.util.List; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Handler of {@link EffortPanel} ui. @@ -297,42 +290,42 @@ SwingUtil.setI18nTableHeaderRenderer( table, - n_("sammoa.observations.routeTable.column.effortNumber"), - n_("sammoa.observations.routeTable.column.effortNumber.tip"), - n_("sammoa.observations.routeTable.column.beginTime"), - n_("sammoa.observations.routeTable.column.beginTime.tip"), - n_("sammoa.observations.routeTable.column.routeType"), - n_("sammoa.observations.routeTable.column.routeType.tip"), - n_("sammoa.observations.routeTable.column.transect"), - n_("sammoa.observations.routeTable.column.transect.tip"), - n_("sammoa.observations.routeTable.column.seaState"), - n_("sammoa.observations.routeTable.column.seaState.tip"), - n_("sammoa.observations.routeTable.column.swell"), - n_("sammoa.observations.routeTable.column.swell.tip"), - n_("sammoa.observations.routeTable.column.turbidity"), - n_("sammoa.observations.routeTable.column.turbidity.tip"), - n_("sammoa.observations.routeTable.column.skyGlint"), - n_("sammoa.observations.routeTable.column.skyGlint.tip"), - n_("sammoa.observations.routeTable.column.glareFrom"), - n_("sammoa.observations.routeTable.column.glareFrom.tip"), - n_("sammoa.observations.routeTable.column.glareTo"), - n_("sammoa.observations.routeTable.column.glareTo.tip"), - n_("sammoa.observations.routeTable.column.glareSeverity"), - n_("sammoa.observations.routeTable.column.glareSeverity.tip"), - n_("sammoa.observations.routeTable.column.glareUnder"), - n_("sammoa.observations.routeTable.column.glareUnder.tip"), - n_("sammoa.observations.routeTable.column.cloudCover"), - n_("sammoa.observations.routeTable.column.cloudCover.tip"), - n_("sammoa.observations.routeTable.column.subjectiveConditions"), - n_("sammoa.observations.routeTable.column.subjectiveConditions.tip"), - n_("sammoa.observations.routeTable.column.unexpectedLeft"), - n_("sammoa.observations.routeTable.column.unexpectedLeft.tip"), - n_("sammoa.observations.routeTable.column.unexpectedRight"), - n_("sammoa.observations.routeTable.column.unexpectedRight.tip"), - n_("sammoa.observations.routeTable.column.comment"), - n_("sammoa.observations.routeTable.column.comment.tip"), - n_("sammoa.observations.routeTable.column.deleted"), - n_("sammoa.observations.routeTable.column.deleted.tip") + n("sammoa.observations.routeTable.column.effortNumber"), + n("sammoa.observations.routeTable.column.effortNumber.tip"), + n("sammoa.observations.routeTable.column.beginTime"), + n("sammoa.observations.routeTable.column.beginTime.tip"), + n("sammoa.observations.routeTable.column.routeType"), + n("sammoa.observations.routeTable.column.routeType.tip"), + n("sammoa.observations.routeTable.column.transect"), + n("sammoa.observations.routeTable.column.transect.tip"), + n("sammoa.observations.routeTable.column.seaState"), + n("sammoa.observations.routeTable.column.seaState.tip"), + n("sammoa.observations.routeTable.column.swell"), + n("sammoa.observations.routeTable.column.swell.tip"), + n("sammoa.observations.routeTable.column.turbidity"), + n("sammoa.observations.routeTable.column.turbidity.tip"), + n("sammoa.observations.routeTable.column.skyGlint"), + n("sammoa.observations.routeTable.column.skyGlint.tip"), + n("sammoa.observations.routeTable.column.glareFrom"), + n("sammoa.observations.routeTable.column.glareFrom.tip"), + n("sammoa.observations.routeTable.column.glareTo"), + n("sammoa.observations.routeTable.column.glareTo.tip"), + n("sammoa.observations.routeTable.column.glareSeverity"), + n("sammoa.observations.routeTable.column.glareSeverity.tip"), + n("sammoa.observations.routeTable.column.glareUnder"), + n("sammoa.observations.routeTable.column.glareUnder.tip"), + n("sammoa.observations.routeTable.column.cloudCover"), + n("sammoa.observations.routeTable.column.cloudCover.tip"), + n("sammoa.observations.routeTable.column.subjectiveConditions"), + n("sammoa.observations.routeTable.column.subjectiveConditions.tip"), + n("sammoa.observations.routeTable.column.unexpectedLeft"), + n("sammoa.observations.routeTable.column.unexpectedLeft.tip"), + n("sammoa.observations.routeTable.column.unexpectedRight"), + n("sammoa.observations.routeTable.column.unexpectedRight.tip"), + n("sammoa.observations.routeTable.column.comment"), + n("sammoa.observations.routeTable.column.comment.tip"), + n("sammoa.observations.routeTable.column.deleted"), + n("sammoa.observations.routeTable.column.deleted.tip") ); init(table, new SelectionModelAdapter<Route>() { @@ -439,38 +432,38 @@ SwingUtil.setI18nTableHeaderRenderer( table, - n_("sammoa.observations.observationTable.column.observationNumber"), - n_("sammoa.observations.observationTable.column.observationNumber.tip"), - n_("sammoa.observations.observationTable.column.observationTime"), - n_("sammoa.observations.observationTable.column.observationTime.tip"), - n_("sammoa.observations.observationTable.column.position"), - n_("sammoa.observations.observationTable.column.position.tip"), - n_("sammoa.observations.observationTable.column.podSize"), - n_("sammoa.observations.observationTable.column.podSize.tip"), - n_("sammoa.observations.observationTable.column.species"), - n_("sammoa.observations.observationTable.column.species.tip"), - n_("sammoa.observations.observationTable.column.age"), - n_("sammoa.observations.observationTable.column.age.tip"), - n_("sammoa.observations.observationTable.column.decAngle"), - n_("sammoa.observations.observationTable.column.decAngle.tip"), - n_("sammoa.observations.observationTable.column.cue"), - n_("sammoa.observations.observationTable.column.cue.tip"), - n_("sammoa.observations.observationTable.column.behaviour"), - n_("sammoa.observations.observationTable.column.behaviour.tip"), - n_("sammoa.observations.observationTable.column.swimDir"), - n_("sammoa.observations.observationTable.column.swimDir.tip"), - n_("sammoa.observations.observationTable.column.calves"), - n_("sammoa.observations.observationTable.column.calves.tip"), - n_("sammoa.observations.observationTable.column.photo"), - n_("sammoa.observations.observationTable.column.photo.tip"), - n_("sammoa.observations.observationTable.column.comment"), - n_("sammoa.observations.observationTable.column.comment.tip"), - n_("sammoa.observations.observationTable.column.observationStatus"), - n_("sammoa.observations.observationTable.column.observationStatus.tip"), - n_("sammoa.observations.observationTable.column.deleted"), - n_("sammoa.observations.observationTable.column.deleted.tip"), - n_("sammoa.observations.observationTable.column.circleback"), - n_("sammoa.observations.observationTable.column.circleback.tip") + n("sammoa.observations.observationTable.column.observationNumber"), + n("sammoa.observations.observationTable.column.observationNumber.tip"), + n("sammoa.observations.observationTable.column.observationTime"), + n("sammoa.observations.observationTable.column.observationTime.tip"), + n("sammoa.observations.observationTable.column.position"), + n("sammoa.observations.observationTable.column.position.tip"), + n("sammoa.observations.observationTable.column.podSize"), + n("sammoa.observations.observationTable.column.podSize.tip"), + n("sammoa.observations.observationTable.column.species"), + n("sammoa.observations.observationTable.column.species.tip"), + n("sammoa.observations.observationTable.column.age"), + n("sammoa.observations.observationTable.column.age.tip"), + n("sammoa.observations.observationTable.column.decAngle"), + n("sammoa.observations.observationTable.column.decAngle.tip"), + n("sammoa.observations.observationTable.column.cue"), + n("sammoa.observations.observationTable.column.cue.tip"), + n("sammoa.observations.observationTable.column.behaviour"), + n("sammoa.observations.observationTable.column.behaviour.tip"), + n("sammoa.observations.observationTable.column.swimDir"), + n("sammoa.observations.observationTable.column.swimDir.tip"), + n("sammoa.observations.observationTable.column.calves"), + n("sammoa.observations.observationTable.column.calves.tip"), + n("sammoa.observations.observationTable.column.photo"), + n("sammoa.observations.observationTable.column.photo.tip"), + n("sammoa.observations.observationTable.column.comment"), + n("sammoa.observations.observationTable.column.comment.tip"), + n("sammoa.observations.observationTable.column.observationStatus"), + n("sammoa.observations.observationTable.column.observationStatus.tip"), + n("sammoa.observations.observationTable.column.deleted"), + n("sammoa.observations.observationTable.column.deleted.tip"), + n("sammoa.observations.observationTable.column.circleback"), + n("sammoa.observations.observationTable.column.circleback.tip") ); init(table, new SelectionModelAdapter<Observation>() { @@ -720,12 +713,12 @@ { TableCellRenderer defaultDateCellRenderer = table.getDefaultRenderer(Date.class); TableCellRenderer renderer = JAXXWidgetUtil.newDateTableCellRenderer( - defaultDateCellRenderer, _("sammoa.timePattern")); + defaultDateCellRenderer, t("sammoa.timePattern")); table.setDefaultRenderer(Date.class, renderer); JAXXDatePicker datePicker = new JAXXDatePicker(); datePicker.setShowPopupButton(false); - datePicker.setPatternLayout(_("sammoa.timePattern")); + datePicker.setPatternLayout(t("sammoa.timePattern")); JTextField textField = datePicker.getEditor(); // textField.addKeyListener(goNextCellAdapter); textField.setBorder(new LineBorder(Color.GRAY, 2)); @@ -844,7 +837,7 @@ TransectFlight value = getCellEditorValue(); if (value == null || Objects.equal(value, initValue) - || SammoaUtil.askQuestion(editorComponent, _( + || SammoaUtil.askQuestion(editorComponent, t( "sammoa.confirmDialog.changeRouteTransect.message", value.getTransect().getName()))) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -32,7 +32,7 @@ jaxx.runtime.swing.model.GenericListModel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -50,7 +50,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 19/07/12 @@ -289,7 +289,7 @@ // can not authorize to go to this screen SammoaUtil.showErrorMessage( - ui, _("sammoa.validator.no.species.in.region")); + ui, t("sammoa.validator.no.species.in.region")); return; } @@ -305,7 +305,7 @@ int nextFlightNumber = flightService.getNextFlightNumber(); String response = JOptionPane.showInputDialog( - ui, _("sammoa.inputDialog.flightNumber.message"), nextFlightNumber); + ui, t("sammoa.inputDialog.flightNumber.message"), nextFlightNumber); if (response == null) { // nothing to do @@ -316,7 +316,7 @@ if (flightNumber < nextFlightNumber) { SammoaUtil.showErrorMessage( - ui, _("sammoa.inputDialog.flightNumber.error.lessThanNextFlightNumber", nextFlightNumber)); + ui, t("sammoa.inputDialog.flightNumber.error.lessThanNextFlightNumber", nextFlightNumber)); } else { @@ -328,7 +328,7 @@ } catch (NumberFormatException ex) { SammoaUtil.showErrorMessage( - ui, _("sammoa.inputDialog.flightNumber.error.notANumber")); + ui, t("sammoa.inputDialog.flightNumber.error.notANumber")); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/UIImporter.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/UIImporter.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/UIImporter.java 2014-05-16 08:08:04 UTC (rev 664) @@ -26,11 +26,11 @@ import fr.ulr.sammoa.application.io.CampaignStorage; import fr.ulr.sammoa.application.io.input.map.ShpImporter; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; -import org.nuiton.util.csv.ImportRuntimeException; +import org.nuiton.csv.ImportRuntimeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.awt.Component; +import java.awt.*; import java.io.File; import java.io.IOException; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.css 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.css 2014-05-16 08:08:04 UTC (rev 664) @@ -58,7 +58,7 @@ } #backupPanel { - border:{new TitledBorder(_("sammoa.label.exportApplication.backup.panel"))}; + border:{new TitledBorder(t("sammoa.label.exportApplication.backup.panel"))}; } #backupCheckBox { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -35,7 +35,7 @@ java.awt.BorderLayout javax.swing.UIManager - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -60,8 +60,8 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * UI Handler fo {@link ImportApplicationUI}. @@ -198,7 +198,7 @@ backupService.backupApplication(backupFilename); SammoaUtil.showSuccessMessage( frame, - _("sammoa.messageDialog.sammoa.backup.success", + t("sammoa.messageDialog.sammoa.backup.success", getBackupFile(backupFilename))); } catch (Exception e) { ErrorDialogUI.showError(e); @@ -218,7 +218,7 @@ SammoaUtil.showSuccessMessage( frame, - _("sammoa.messageDialog.aplication.import.success", + t("sammoa.messageDialog.aplication.import.success", model.getImportFile())); } catch (Exception e) { @@ -235,7 +235,7 @@ public String getBackupInfo(String filename) { File backupFile = getBackupFile(filename == null ? "" : filename); - String result = _("sammoa.label.exportApplication.backupInfo", backupFile); + String result = t("sammoa.label.exportApplication.backupInfo", backupFile); return result; } @@ -336,24 +336,24 @@ table.setModel(new FlightTableModel(model.getFlightEntries(), true)); infoLabel = - _("sammoa.info.importApplication.importfile.loaded.on.existingCampaign", name); + t("sammoa.info.importApplication.importfile.loaded.on.existingCampaign", name); SwingUtil.setI18nTableHeaderRenderer( table, - n_("sammoa.importApplication.flightTable.column.flightName"), - n_("sammoa.importApplication.flightTable.column.flightName.tip"), - n_("sammoa.importApplication.flightTable.column.flightExist"), - n_("sammoa.importApplication.flightTable.column.flightExist.tip"), - n_("sammoa.importApplication.flightTable.column.toTreat"), - n_("sammoa.importApplication.flightTable.column.toTreat.tip")); + n("sammoa.importApplication.flightTable.column.flightName"), + n("sammoa.importApplication.flightTable.column.flightName.tip"), + n("sammoa.importApplication.flightTable.column.flightExist"), + n("sammoa.importApplication.flightTable.column.flightExist.tip"), + n("sammoa.importApplication.flightTable.column.toTreat"), + n("sammoa.importApplication.flightTable.column.toTreat.tip")); } else { table.setModel(new FlightTableModel(model.getFlightEntries(), false)); - infoLabel = _("sammoa.info.importApplication.importfile.loaded.on.newCampaign", name); + infoLabel = t("sammoa.info.importApplication.importfile.loaded.on.newCampaign", name); SwingUtil.setI18nTableHeaderRenderer( table, - n_("sammoa.importApplication.flightTable.column.flightName"), - n_("sammoa.importApplication.flightTable.column.flightName.tip")); + n("sammoa.importApplication.flightTable.column.flightName"), + n("sammoa.importApplication.flightTable.column.flightName.tip")); } } else { @@ -361,7 +361,7 @@ // nothing is loaded, just remove table model and change label table.setModel(new DefaultTableModel()); - infoLabel = _("sammoa.info.importApplication.no.importfile.loaded"); + infoLabel = t("sammoa.info.importApplication.no.importfile.loaded"); } label.setText(infoLabel); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.css 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.css 2014-05-16 08:08:04 UTC (rev 664) @@ -102,7 +102,7 @@ } #backupPanel { - border:{new TitledBorder(_("sammoa.label.exportApplication.backup.panel"))}; + border:{new TitledBorder(t("sammoa.label.exportApplication.backup.panel"))}; } #backupCheckBox { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -34,7 +34,7 @@ java.io.File javax.swing.UIManager - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -41,12 +41,12 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; +import org.nuiton.decorator.Decorator; import org.nuiton.util.FileUtil; -import org.nuiton.util.decorator.Decorator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.JFrame; +import javax.swing.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; @@ -55,7 +55,7 @@ import java.util.Date; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of {@link ExportApplicationUI}. @@ -221,7 +221,7 @@ backupService.backupApplication(backupFilename); SammoaUtil.showSuccessMessage( frame, - _("sammoa.messageDialog.sammoa.backup.success", + t("sammoa.messageDialog.sammoa.backup.success", getBackupFile(backupFilename))); } catch (Exception e) { ErrorDialogUI.showError(e); @@ -239,7 +239,7 @@ SammoaUtil.showSuccessMessage( frame, - _("sammoa.messageDialog.sammoa.export.success", + t("sammoa.messageDialog.sammoa.export.success", dataModel.getExportFile())); boolean removeFlightId = false; @@ -285,7 +285,7 @@ public String getBackupInfo(String filename) { File backupFile = getBackupFile(filename == null ? "" : filename); - String result = _("sammoa.label.exportApplication.backupInfo", backupFile); + String result = t("sammoa.label.exportApplication.backupInfo", backupFile); return result; } @@ -367,7 +367,7 @@ if (dataModel.getExportFile().exists()) { doExport = SammoaUtil.askQuestion( ui, - _("sammoa.messageDialog.sammoa.exportFile.alreadyExists", + t("sammoa.messageDialog.sammoa.exportFile.alreadyExists", dataModel.getExportFile())); } return doExport; @@ -380,8 +380,8 @@ public void chooseExportDirectory() { File f = SammoaUtil.chooseDirectory( ui, - _("sammoa.title.choose.export.directory"), - _("sammoa.action.choose.export.directory"), + t("sammoa.title.choose.export.directory"), + t("sammoa.action.choose.export.directory"), ui.getModel().getExportDirectory() ); ui.getModel().setExportDirectory(f); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIModel.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIModel.java 2014-05-16 08:08:04 UTC (rev 664) @@ -30,7 +30,7 @@ import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.ui.swing.io.AbstractApplicationModelWithBackup; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaEntities; import java.io.File; import java.util.List; @@ -168,7 +168,7 @@ ExportApplicationModel result = ExportApplicationModel.newModel( new File(getExportDirectory(), getExportFilename()), getSelectedCampaign().getTopiaId(), - Iterables.transform(flightsToExport, TopiaId.GET_TOPIA_ID) + Iterables.transform(flightsToExport, TopiaEntities.getTopiaIdFunction()) ); return result; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapLauncherUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapLauncherUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapLauncherUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -28,7 +28,7 @@ java.io.File javax.swing.UIManager - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.css 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.css 2014-05-16 08:08:04 UTC (rev 664) @@ -35,7 +35,7 @@ }*/ #campainPeriodFilter { - border:{new TitledBorder(_("sammoa.label.campaign.period.filter"))}; + border:{new TitledBorder(t("sammoa.label.campaign.period.filter"))}; } #campaignBeginDateLabel { @@ -43,7 +43,7 @@ } #beginDatePicker { - patternLayout:{_("sammoa.datePattern")}; + patternLayout:{t("sammoa.datePattern")}; date:{getModel().getBeginDate()}; } @@ -52,7 +52,7 @@ } #endDatePicker { - patternLayout:{_("sammoa.datePattern")}; + patternLayout:{t("sammoa.datePattern")}; date:{getModel().getEndDate()}; } @@ -60,28 +60,28 @@ beanType:{Strate.class}; showReset:true; list:{strateFilter}; - labelText:{_("sammoa.label.strateFilter")}; + labelText:{t("sammoa.label.strateFilter")}; } #routeTypeFilterListHeader { beanType:{RouteType.class}; showReset:true; list:{routeTypeFilter}; - labelText:{_("sammoa.label.routeTypeFilter")}; + labelText:{t("sammoa.label.routeTypeFilter")}; } #speciesTypeFilterListHeader { beanType:{StringRef.class}; showReset:true; list:{speciesTypeFilter}; - labelText:{_("sammoa.label.speciesTypeFilter")}; + labelText:{t("sammoa.label.speciesTypeFilter")}; } #speciesFilterListHeader { beanType:{Species.class}; showReset:true; list:{speciesFilter}; - labelText:{_("sammoa.label.speciesFilter")}; + labelText:{t("sammoa.label.speciesFilter")}; } #quitButton { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -38,7 +38,7 @@ java.awt.BorderLayout java.awt.event.ItemEvent - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -44,20 +44,15 @@ import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.OneClicListSelectionModel; import jaxx.runtime.swing.editor.bean.BeanListHeader; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.DecoratorUtil; +import org.nuiton.decorator.JXPathDecorator; import org.nuiton.util.FileUtil; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.DecoratorUtil; -import org.nuiton.util.decorator.JXPathDecorator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JFrame; -import javax.swing.JList; -import java.awt.Dimension; +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -66,7 +61,7 @@ import java.util.Date; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of {@link ExportMapUI}. @@ -257,8 +252,8 @@ public void chooseEffortDirectory() { File f = SammoaUtil.chooseDirectory( ui, - _("sammoa.title.choose.export.directory"), - _("sammoa.action.choose.export.directory"), + t("sammoa.title.choose.export.directory"), + t("sammoa.action.choose.export.directory"), ui.getModel().getExportDirectory() ); ui.getModel().setExportDirectory(f); @@ -267,15 +262,15 @@ public void exportEfforts() { Action startAction = new AbstractStartAction( - _("sammoa.action.startExport"), + t("sammoa.action.startExport"), ui) { private static final long serialVersionUID = 1L; @Override protected String getSuccessMessage(int nbRow, ExportMapModel dataModel) { - return _("sammoa.messageDialog.map.export.success", - nbRow, dataModel.getExportDirectory()); + return t("sammoa.messageDialog.map.export.success", + nbRow, dataModel.getExportDirectory()); } @Override @@ -301,7 +296,7 @@ model.setSelectedRouteTypes( getFilterValues(RouteType.class, ui.getRouteTypeFilter())); - displayExportLauncher(_("sammoa.title.export.exportEfforts"), + displayExportLauncher(t("sammoa.title.export.exportEfforts"), model.getExportEffortsFilename(), model, startAction); @@ -311,15 +306,15 @@ public void exportObservations() { Action startAction = new AbstractStartAction( - _("sammoa.action.startExport"), + t("sammoa.action.startExport"), ui) { private static final long serialVersionUID = 1L; @Override protected String getSuccessMessage(int nbRow, ExportMapModel dataModel) { - return _("sammoa.messageDialog.map.export.success", - nbRow, dataModel.getExportDirectory()); + return t("sammoa.messageDialog.map.export.success", + nbRow, dataModel.getExportDirectory()); } @Override @@ -350,7 +345,7 @@ model.setSelectedSpeciesTypes( getFilterValues(StringRef.class, ui.getSpeciesTypeFilter())); - displayExportLauncher(_("sammoa.title.export.exportObservations"), + displayExportLauncher(t("sammoa.title.export.exportObservations"), model.getExportObservationsFilename(), model, startAction); @@ -359,15 +354,15 @@ public void exportGeoPoints() { Action startAction = new AbstractStartAction( - _("sammoa.action.startExport"), + t("sammoa.action.startExport"), ui) { private static final long serialVersionUID = 1L; @Override protected String getSuccessMessage(int nbRow, ExportMapModel dataModel) { - return _("sammoa.messageDialog.map.export.success", - nbRow, dataModel.getExportDirectory()); + return t("sammoa.messageDialog.map.export.success", + nbRow, dataModel.getExportDirectory()); } @Override @@ -388,7 +383,7 @@ }; ExportMapUIModel model = getModel(); - displayExportLauncher(_("sammoa.title.export.exportGeoPoints"), + displayExportLauncher(t("sammoa.title.export.exportGeoPoints"), model.getExportGeoPointsFilename(), model, startAction); @@ -419,7 +414,7 @@ JFrame frame = ui.getParentContainer(JFrame.class); Action closeAction = new AbstractAction( - _("sammoa.action.cancelExport"), + t("sammoa.action.cancelExport"), SwingUtil.createActionIcon("cancel")) { private static final long serialVersionUID = 1L; @@ -542,8 +537,8 @@ shp.exists()) { doExport = SammoaUtil.askQuestion( ui, - _("sammoa.messageDialog.mapOrDbf.exportFile.alreadyExists", - dbf, shp)); + t("sammoa.messageDialog.mapOrDbf.exportFile.alreadyExists", + dbf, shp)); } return doExport; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -34,7 +34,7 @@ jaxx.runtime.validator.swing.SwingValidatorUtil jaxx.runtime.validator.swing.SwingValidatorMessageTableModel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -41,7 +41,7 @@ import java.io.File; import java.io.IOException; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 04/07/12 @@ -102,7 +102,7 @@ JFrame parent = ui.getParentContainer(JFrame.class); SammoaUtil.openInDialog(ui, parent, - _("sammoa.dialog.title.region"), + t("sammoa.dialog.title.region"), ui.getCloseAction()); ui.setVisible(true); @@ -152,7 +152,7 @@ @Override public String importCsvFile(File file) throws IOException { int nbImported = importCsvService.importSpecies(getModel().getId(), file); - return _("sammoa.messageDialog.species.import.success", nbImported); + return t("sammoa.messageDialog.species.import.success", nbImported); } }; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUI.jaxx 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUI.jaxx 2014-05-16 08:08:04 UTC (rev 664) @@ -34,7 +34,7 @@ jaxx.runtime.validator.swing.SwingValidatorUtil jaxx.runtime.validator.swing.SwingValidatorMessageTableModel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java 2014-05-16 08:08:04 UTC (rev 664) @@ -43,7 +43,7 @@ import javax.swing.JFrame; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 04/07/12 @@ -107,7 +107,7 @@ JFrame parent = ui.getParentContainer(JFrame.class); SammoaUtil.openInDialog(ui, parent, - _("sammoa.dialog.title.transect"), + t("sammoa.dialog.title.transect"), ui.getCloseAction()); StrateModel defaultStrate = getModel().getStrate(); Modified: trunk/sammoa-ui-swing/src/main/resources/logback.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/logback.xml 2014-05-16 08:05:33 UTC (rev 663) +++ trunk/sammoa-ui-swing/src/main/resources/logback.xml 2014-05-16 08:08:04 UTC (rev 664) @@ -49,6 +49,8 @@ <logger name="fr.ulr.sammoa" level="INFO"/> + <logger name="fr.ulr.sammoa.application.device.gps" level="TRACE"/> + <root level="ERROR">  <appender-ref ref="CONSOLE"/>

1 0

r663 - trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence
by athimel＠users.forge.codelutin.com 16 May '14

16 May '14

Author: athimel Date: 2014-05-16 10:05:33 +0200 (Fri, 16 May 2014) New Revision: 663 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/663 Log: Ajout du persistence context Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java Added: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java (rev 0) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java 2014-05-16 08:05:33 UTC (rev 663) @@ -0,0 +1,24 @@ +package fr.ulr.sammoa.persistence; + +import org.nuiton.topia.persistence.TopiaIdFactory; +import org.nuiton.topia.persistence.internal.HibernateProvider; +import org.nuiton.topia.persistence.internal.TopiaHibernateSessionRegistry; +import org.nuiton.topia.persistence.internal.support.TopiaFiresSupport; +import org.nuiton.topia.persistence.support.TopiaJpaSupport; +import org.nuiton.topia.persistence.support.TopiaListenableSupport; + +public class SammoaTopiaPersistenceContext extends AbstractSammoaTopiaPersistenceContext { + + public SammoaTopiaPersistenceContext(HibernateProvider hibernateProvider, TopiaListenableSupport listenableSupport, TopiaIdFactory topiaIdFactory, TopiaHibernateSessionRegistry sessionRegistry) { + super(hibernateProvider, listenableSupport, topiaIdFactory, sessionRegistry); + } + + public TopiaJpaSupport getJpaSupport() { + return jpaSupport; + } + + public TopiaFiresSupport getFiresSupport() { + return firesSupport; + } + +} //SammoaTopiaPersistenceContext

1 0

r662 - trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence
by sbavencoff＠users.forge.codelutin.com 16 May '14

16 May '14

Author: sbavencoff Date: 2014-05-16 10:03:24 +0200 (Fri, 16 May 2014) New Revision: 662 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/662 Log: update version Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java 2014-05-16 08:00:52 UTC (rev 661) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java 2014-05-16 08:03:24 UTC (rev 662) @@ -59,13 +59,6 @@ } @Override - public void addTransectFlight(int index, TransectFlight transectFlight) { - fireOnPreWrite(PROPERTY_TRANSECT_FLIGHT, null, transectFlight); - getTransectFlight().add(index, transectFlight); - fireOnPostWrite(PROPERTY_TRANSECT_FLIGHT, index, null, transectFlight); - } - - @Override public Collection<Observer> getObserver() { if (observer == null) { observer = Lists.newArrayList();

1 0

r661 - trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence
by sbavencoff＠users.forge.codelutin.com 16 May '14

16 May '14

Author: sbavencoff Date: 2014-05-16 10:00:52 +0200 (Fri, 16 May 2014) New Revision: 661 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/661 Log: update version Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Dates.java Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Dates.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Dates.java 2014-05-16 07:37:57 UTC (rev 660) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Dates.java 2014-05-16 08:00:52 UTC (rev 661) @@ -3,8 +3,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %%

1 0

r660 - trunk/sammoa-persistence
by sbavencoff＠users.forge.codelutin.com 16 May '14

16 May '14

Author: sbavencoff Date: 2014-05-16 09:37:57 +0200 (Fri, 16 May 2014) New Revision: 660 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/660 Log: Modified: trunk/sammoa-persistence/pom.xml Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-05-16 07:33:24 UTC (rev 659) +++ trunk/sammoa-persistence/pom.xml 2014-05-16 07:37:57 UTC (rev 660) @@ -116,7 +116,7 @@ <templates> org.nuiton.eugene.java.JavaEnumerationTransformer, org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.topia.generator.TopiaMetaTransformer + org.nuiton.topia.templates.TopiaMetaTransformer </templates> </configuration> <goals>

1 0

r659 - trunk/sammoa-persistence/src/main/xmi
by sbavencoff＠users.forge.codelutin.com 16 May '14

16 May '14

Author: sbavencoff Date: 2014-05-16 09:33:24 +0200 (Fri, 16 May 2014) New Revision: 659 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/659 Log: Update version and topia 3 Modified: trunk/sammoa-persistence/src/main/xmi/sammoa.zargo Modified: trunk/sammoa-persistence/src/main/xmi/sammoa.zargo =================================================================== --- trunk/sammoa-persistence/src/main/xmi/sammoa.zargo 2014-05-16 07:28:51 UTC (rev 658) +++ trunk/sammoa-persistence/src/main/xmi/sammoa.zargo 2014-05-16 07:33:24 UTC (rev 659) @@ -1,11 +1,9 @@ -PK��;Asammoa.argo�TK��0�ﯰr��l�B��.�bϕO��8��zƱ�8}��JQ5��˞q�u��Aկ��Yu�X)T�:�-��z�0�l�t�;��"1R:��D+�1Cu��}WG+pL�q�r1��!༰Ҁ��7&��U�$��~a��r^0��j�QR�^L��@Y�� t�RB��I8��U�/İ�Ÿ��C��hi! :I;'-�3��أE.w\:H�3|�Z -�-�O$A'�=��=�Ƃ�$V -'b�I'�N��Y��m9��B��(l[-�]�Aޢ� -�P��VS��;M�V�v܀G:AՔ� �x��Z,7�RO��C�W�S�s"�U��Ѽ�Y�L��a� -��,͊�q�2�P�0�=\��m�Z -�U��?֏��2V�� -�k,"X̗��h"�(!�[~�V��_GE~T��q~vx;F��~C��H@-i��pF�*S��:��/��G�64�ur�9=-�+��6�3��P�߷čH.��[�7lM��-=x �M]�um��FWV ��t\�"�)z��U��#z�2Z^ꧺ� -PK��&%K�PK��;Asammoa_Diagrammedeclasses.pgml�]ے�F�}�Wp�0��j�n��-i��^�ʒBj��Ą�M�g�D//�5�?��c[I�n +PK��Dsammoa.argo�TK��0�ﯰr��l�B��.�bϕO��8��zƱ�8}��JQ5��y�̔\7��@T�*{�Uw��Bծ��rK�G�ζJ��,#e��(Ot�#T��weq�'��)c�(��+ +X�}c��^N�q��)��V�7J +_��\(�9��@�PJ�= ��j�V��N��%�C�H�N��I��L<�'9�h��R��Vh��I�Ijì�`O��A4��^�I��*p��G[N�i�P�= +�V�Ch��(`�5��18��!F��NݹU�'��nP5eq&��/��<��-��휈3F��@ o4�|T��jIm�&o�g&��v�e��*��Ǉ��OO+FM݆4F +�2j�-J�☆��y��E�uT�Ge�y��g��}䞽~nh:�B�ӝ�7�_��3 +V��M�w��d��o�zm�j�4�s�%�Ts�m��}I�gi�q{�qi��Xҳ��^[7L��2��ճ-��wc�UY%�]<�q��d�h��G<1�hx��7PK��DH�PK��Dsammoa_Diagrammedeclasses.pgml�]ے�F�}�Wp�0��j�n��-i��^�ʒBj��Ą�M�g�D//�5�?��c[I�n `� pl�� @U�YY�'�^��i�k8_L��{�g�h8��_��%{��^��퇛�?��=�� ދ��r��_��b.��2yZ4_��h�/��N��y��r��/'�_��j�\��L��^��g��0��/��y?x��w��3�?��_l��a��ŋ��k^��ys��d�mo�?��d��w��O��s��O��q��2��s��I��k��9��v!_�_.��2L��k�c:�/�p�_\��!��t�"�<��y=HH�o�k>��x��-��$�~�<�|�/��O�K?��e6��+�L_��_pP�?}�/Gw��o��7_��˒�#V�W<=mv��z�of�_��<p� @@ -83,41 +81,44 @@ yG��Rq��]��R �Ǿc��B��,lQY��9唥�?-3��R� �K�gk�J�n2z�%��ZKִ��Xt�l-��ݽ��݃u��s��[k�ȃܽ��݇u��k'5݉5�2�>�q1��T�=_�D#��B�>0 �sH�g��?mi�?Zл/��܇��}�玞��5�1t��h�v��sw�L��f�A��m�a��w�6�tjHL�SS��_"��r�ɿ?M�|��PK��' -�*ƚPK��;A&sammoa_Diagrammedecasdutilisation.pgml��8��Sx��Tċ(��Tz��N�A�8.�K3.ːTIg��y��ؒ�,�u+�fd7:(ےL�P��_�|XN��Q��3ta�M��<� -V�˳��}�M��ꗗ��oW��z�^��&g��mr{ƏH��y��ja��E��$�� -f�h�p��b��1��b��{��v�Y��|Ę�~E��s��̵,�WK~��>�e��V��,�փ�4�?5��:�_<&�2�g�yg��⧼��y2[-�~v��`am��o�o��kp��_��v��̥�w�r�%Y��0�<�z$��8��A��a��-��q]� -m��_��Lҟx��'��O��Yr�1��K��n��q�G~�|[��3�Wb�܄�*Q��t�w�W�:��9:��of�;�<l���5��J�*�Z9�J�~��/��=W�n>��`KAhCvm>��O2>��g#��lߕ:SחJW�=��oj�GCn'��I�'��ͻ�M\d��'۩��^�k{��N&��U��2\l?��2�_�)��s��-}$��[��8 ��l�W��O�͗��]�x��h�ܬ��z��\&ײ�]�ןtոT��&.��t>q��y�|b�!]Bg*�0v��kA��"��ɷ��Wٷ�^U4+�-�B��{!�A�]Rh��-�f�ד�d;��TQ/�ꥰռ��h�Dd]$��Eo��ʪ�TMԭJ�:��A|^7��Ӧ��r��,J�.r�6 -��v��4��V�0Z�� -�Z)�4C��4� -�} -�L�I}B�=��#�/��ۅ^��E3��)\6҂ÅTZq��O��a+��〕�#��)hR�S\��d�*AZ*��t:8� -u��XE�`��¿�XG~�ŐJD��_��?TC��!��'aI|�W*F�l�-~��p��X,�B5�&H��v��8m�7J�6A"��J��t��D�O(�K"et�p��wyC�A)Ob`cr�{�@N.�r*�(�I�X�}X:�] -h��fv7�!��m�66��ز&ض��g�AH�B&?�"/�V)��ߥ&�|y�_�4]��PFe��'��V�vK�o?�+��JX��b�7��}9.��l*]�Hi5�!G��a!# -2�;�m"#C��R��U��0i��d#Y��HF@L�3� �=<ɼ>^�� -�/�1�h�b �a�9�l��P�d�lEC$��h��#$��E�FO(� -2�� 2T2�b�NZ�{3@��@F��ʾ�q�d�L A��Հ�۪&�Lq� d�J� #��G`��2�vW�UcL��n#+BL5�tX� ��l^�� -�,�^��X��u��u�D-6�P�p��+�*FR�]�.'e�ṿ[�j�F�;Rj��.�L ��Q�]�i��*��Ԓ?��F-��∍$��_G�d��T��¯ZlT��#��f�T��n��i��q��/��ڏ'��j��;��[��?ng��9��7�U�V5�PɩB�c��j��1e?� -a��,�H��*�a@êf�b��*��@S��@��JT�OY��]�&�x��;eX�<cd�0��gL��c*��O�viG�qT�a�"�I�3�p��I�/� aX��6f�t#�iE.2��i@�;Ǎ0�P��$�T��0�qZF�&#Ld;;�b5�z�A�SH��-!�l��^>qR��h:ƿ�#��܋��s��37я�|eM�3��r��1Zpƅ��.��/��Efθ -�Rw�gܡ<|S��3n��N Lƙ��;�L��/;��K��^q�Sq�(��(G�t� )<C��W�%P��q��T0�Xx��A��ǈ��ng�DN�x�dC<PC�S^#��l�g��k R�>R��"�T ɦ��J6:%0�lP�K;��b�Ŏ�c��+�ѡ -�Jl#�K6S��ܜ:�j�ц�Wa��+O�E*��M�9��/�A��3\�`Dc�B�(�ȍ3�h��˫��]�o��^)Lc��ER��ix/��fj 5U=0j��+z@[��h�ʻl �[�i�4}�ᩦ�g8>�)�_&�8-�Սk��DC��ÚR"��V/��mM647�k$�y�� -R��fg�L:�y��-R#��#d(�h23#�t(3�tJ��bf�� ٙ��t�z`�h�3#ڪF��n��m�zڤS�H��#5�3�� -��]�Tu�tp)�[�߰��7�� -�f�6��L��Q��<�¸�x�,��f�N6U=0�epk �N�b��]*�9�F��Nn=�r甎�;U҉��oH�ۑ�fT�UoD��W��mZ�|*��gPl�1Kx�Y��P�xTmC� -��h �d�VxH�F-KuC��zj�ve�R�A%�+�նw�r��a/J!��6�r�4&PF��ŞC�)|$E2��4�K{vLrY0��hÞ�ԟ#��Ar�=�T - 鯪�џ&�`i�N�F�_yz�}pSk��xw~�>��J��5�� -��ZcHM1ȰbA��"2�P�Ɛ�j�QKj�m��IuC�'�6��*c�Vʌ1[6MR��g:d�1dQg��B9D_1��p��RC -�FcT/�F$�"RNW��Pi�}�K�DW�K,o�DbB��"�V&�I�j��v�*R�֘#�m��2�+�ƔqC��Zl�$2�K�ep��}�e�L��RMɔU�D��RM ��|�>K�8�>�aj25% -�1�&35��cj��5��Hj ±�o� ��>�Y�4�wEMfj��K$�CMGD*��Q�UP�)��25��f�� U!b,�=��V�`ا]n*�(��bE]�] u۳�0J��Jd�L��n�9��?�m��,�R��z� -ܯba��Ϭ�4��%�x͗�8��0n��_��w�;#��?�횼i�s~KW��˅_W~1�*�T�E̪%kz��b_��-��m�G*�w��$Xs6�o��|�*s"��e�K��HE.-�׫��j&�:��Sx�W�cG"��L��}�"��o?"=�_b��Ć}�<n�e> {h�f��Z�9��Xw8�,��6qt�#[��ģ}s��EU%}#�hW��G�g�Gsh��r��M~R��厘F��o�4ꎛFߴ��F��v?8��E�F��v?4��FШ#W�޼ҍ��dnEDi��:�:x��דF��F�z4*�qwu��-��hqV��単G߶�*�y�5�V��y�;�hw��7ju��x�;�hw�C�g��}Oꬣ��(�5n��=ܥ�x+�v��Ax��=ڕG��G�4�U��Q�F��(��ˢnƢ�7�6P�P,��v?4�bk�,��X��Ģ��̢�2�E��ƹ��]��ۨT�R>\�R�Ģ}�V��RnU®ve��bo,��7Zˢ�F11�6,�ñ(7�VV��Y�X��Y��E+�s�ó(:�hw�C�(2�Eu�( -��YT��(��L��\�X�o^�X�pgaQ��`W-b�Ƣ��,[x�,Z�)^ñ(7��G��(>�hw�(7��ǌ��(>�hw�C�(�)Y��E1��E��z��}��!X�J�Ѯ,ZD�E�g�,��Ӳl��h�@Wx%�f��1x%'�.~p%�f��1x%'�.~h%?%�j㗰]ǢDˢ�ՓE��E��u}+�hG��1��,��Ӳl��h�0Wx��f��x1x�'�.~p��fQ�A��(=�hw�C�(5�E]��j�Ro%��E++�8��]�o�$x�$�`QO�:ؕE!�E;ղhǼN�/�zB\�Y�5�z��b�,j�X��Y�7��G��}b��fQ��f^B5vQ��}ӆ��K)�.\�.��/0�I��]C�و�C�$��W��vBv�7l��&;�fw��&7l��&;�fw�C�&36��zY�%�,��kM�y��I�]�J��]aS��7�,*V��h��a��qWLj��T1��r��/x�<UL�!~h�4�bRO��頋T�z��v�<L��I��4�Z�Ѯ4*Us��>%S��x��4:�I^{�<��*&�?8��b�ס,8��*&�?4��Q1�/�j31�n�j��P߈��WL�s��{�+�J՜�F� -��i�c�$<�zI^��Txw�$�=��FO��z��F�]/��P� -�FO��z��Fͨ�ԗF��'��$*ujw�~4J_/i*Ř��Tɺ�#�N�ZN��|a��9��q��i� -4��q�K��y��(9�K�!~h%㮗4m��gQr��C��,JL��2J�.��=C��%M�sU�K�ʢR-�}�h�V݃E�sZ��K�vM�g�q�K�6p�`,z��C��,:�zI�E��Y�T/��Y��zI�,��b�&��;=�%%s�aXT -I�`Q%&kW�j9�(�簺M�`U�R��jqͤi��Uxwͤi{�<��j&�?8��fҴCa6p=�L�!�g��Ң4(�v0��O�(�d[��]S+��Z'R�3�'9|M��S�G��T� �7=iNv�M�'�戫"M;��渫"M��i�T��is�U��J��*R�C[?ͨ�d� -S�'F5x��~R\��lm�&�g�&ҷ*R��c>��l�}��+��$�Q�|B��?q�O��2�_ĉ�a�m��N�*�?w�D9�q��X#�}6�ز&ض�� Y��2XǾ,�b��M��N~d$�^u#��4�N��^$��(��y��=��c߽,��'*��D�U��]��&�-�� 2�>��G�q�o!��|��.��6rŗ?ʴ�*��ݏ&��I�V1�y�\\#gE�B��>ס8�O�x\�W<�O�?��B�Ne��L7j��__��KN�I�ZWz�+�V�\��K;�Ѩ��8�*rߔI�O\yCi;s��TDQ/ � �启��*]�+R��Ż\ -�Z�T%�-J�:/ځ|^;��&��r��,J9}J5 ��Q~��d�Њ��z GK�s�^�r��G��T -l0��Vwv4��.S�\��[X��$6��:��q�y� ��k��:=�n^wq��E��Sq��6��R\G[��sk��^�u��nt�-��~�PK -*��QPK��;Asammoa_Diagrammedeclasses2.pgml��o�8��_��t'�)6��i�v�nݤi�N�ʍ���$�@RJ[��6U1��>�'&�on��tE��gC +�*ƚPK��D&sammoa_Diagrammedecasdutilisation.pgml��r�8��S��>%� 9��8��Umn]�I��RS[�L�ܕEI'��{��s��$ �VK" +i*K"i�� +��F��˟��k'a��8C��,g�M��_�}��s��_^��ۿ]��+k5�'|��߯�[g��MzsƏȾ� �Y��jQ<?��$�݄�y<�?H�̦Ip��|�׏Ip�߽]��b�C�"��yd�~}�ٶ��-�<��be��>�8�\�>� +��n�s��i��h��/��)��`�N��E�9�]8��l��w�;]��-�I�.��v��̣�n�łK�x3�Q|q��.L��IG� +��o7�}YLg��7��U�6��gI�7��b��\��C�XMӻOa~Y��E�L� ��*��.��i�Zr��T98o�]��^��_f|�(��n)��+��P�W+��k��:��*�N�`��v�Y�X��DRa +�kse�v�d\��;/�*��nߕ:SחJW�=��oj�GCn'��I�/��˻�Q\��'[��Xm�ݵ�v[{-K�T��m�L3;]D��ga:]��3E��D��G�I�o!��|H��6�M�q,��|}-o��C��b=LW��W/��6r-[�y~}��e��!��7qInq�3��̲��.a4��k<��5!}�Χ��{~��ͷ�aULkc\��\j��%��)p��aI�B#�z1lm�E�$�7�N��-#�#*�"RMQ7u(��<uh�E��r�H.��4N�1~FB��_��f�d�V�U��Ѫ�#��,�_K�UX�c�e2K��3��3�x\�\>��^x �B��#�a�Q�l��4߸�{��}�׳ +VXEm/%~k{1�W{��*7O(�C��INq�&B�Ŭ i�t*��T��|�*&��8L��*.�L"��.�}54��A�ķ}eb�϶��/x�珈�t(�P#:�8�."Z#��F�8c�H렫q|��&�%�zI��t�.�bH (e�9�QL�� L��(�a��>,�q�'��o3�{��w�M��'�m;��?��0)9Ȕg]?W��A��2Y>��OS�.��'# +~2�� +�}6��(��${X +�9t�/�&��u��!�?(��'�UF�#��1Imu�;H��AV��9Ȉa��Q��e�{|�y3\�� +�?g�^4��0ŕR�E�b�J1D��!�ߑ� 4��RL��Ǽe��AVG�s%:ļ��2J��U�!��:�$��C �T-`dC +��rw�_,�e#~��b.�@̡�� SDG�Ş�Q0�� a�Srp��+7��'M?��n��s��΅��#>��.�~)]e��T�E�ղ�j�u��⌟W��J�F�+�a��?��+��⊥#��o��~;D^a*�05Z��jG +g:p\5S=-T�q�rlv�#��:DXu�X7�r��V�=I��}�4��s�P��|�X�t�Q��:_��/)�N� 3l�0�F3U�0�`�xR�f0�$&Vjf�u��R��X� �[��d0U�`��A� +R�K;r��r +��0)��A�`M��d}�M��xd�f�� zy']e��V�Pֲ�jv��^ܑ�K�F/�a�R��ċEvX�;��v��+��~�8Yo�2��k��^�@y��qN��>�f^k��.�- ��F��q��`~��-�#�5�W�]��e��7��X��P�3e�f�2Y�;х�S��~QFE��Hރ��ـ�"vW(_�G��R�iBy�X�/��_�l��2��e8�p��:�b�K��.SA7-T�R�'��g��Q��5�W�� ?��#��j|èF��NX#��Ƅ��f�bN� ��5��0%C��]4�X�۫p�C��:�%Ǹ&�k�/I�j��B��p�rуьܺQҌ�pgiyIU^��gx�F�3��h��"�-�m&�U|�mMx|�)��Mike"��P��ɂ��g�8�)��\��E��#.��A)x-oh��w��-�>4�"�F9��r4�.#I�>�4z��]ɾ�#嘶�d�;�d�,��A�dK��r�͙)�ף��m��S�55{��Kڲ߆ye��o�r�'~ٛN��&i��m·[z��3��V�5��jtv��PL��F1��SL�� +9�Fx66��v��s�;��1}�J�P��z#�܆*7��-��M��N��v�s�1��:aǇ�bG�6�[C�!!��ߑ�Q]Y�=ƒ�R�ک])�6��1\qe��a^�Rړ��qڸ%2�NP��fhÁ��H�O��`i�NRb��h$; +j�`l�gږ�h�=וØ�g�b1@�==T�0��l��WC�Ɓ��Bi9��@8V�0�n Ȩ<G:v9o�T��x��߮?4�C�R4�9J�<S�^:f�0䌢jӗxr��Q��ץ"rFQ6�Q�H��KB�]E2��a��^�]Q-1�u� +��X�H*�V9��[Ԅb��\�m{{ aN�R:LG1$Xڝc<��n@n��g�D�!��]��<2��F�.�}|�T�{T[\�KM��:_~�l�hMn¨5��.U�@��F��&Ԭ9�#j�Q��K�"��i;�Y$c@��a/i ��5�(P��H�^"��j�v��9p�d�T�qĨ�w{�5a&I43 Ƃٓ�!��r�}��&r��/V��R�=��┋��A�T��v��G�ݔ��,��W��UL\��fͥ?�L)�k��&��o~�k��@��_��n��M��[6��_.��bU��2��l长{��y�n8��?,�p��<L��M�V��_/�^"'�4u^-o&�e��O�_� +D�Q�7��3P�\��ŏHO�X��!�a-D�G~w;��h��_O��Z�5GV��g��?��>�0$�g�&��P�(��o�튢W�CQ��YAќ�4$��$��2gy��e�=D=�A�m��A�;�hw񃃨g6�^�O2� �@��A�:��r��+[~�!K�U��X�Z̥��D�n��-*E@��$��A�+c�!@�X�C��Y-��o0��k�K��o4�V��Q�?�hw񃣨o4�z +��P�?�hw�C��?x��D]�CQFk�6[{��'�p; +�J�V��(�{�+�s*4�bI{U�Q��C�a(��P��6C�p_��v?4�b�lm��0��:�"�[<'~M =&��H��5Q��_q�6|� C��I��Ё�P%�jW-�h�� +1��1B#�1�a��"�1�2Vd��脡��lu�'pE'�.~hE��P(��`�v�j��D�) +��о��C��UB +v��"��`��D{`h~Nˌ� +��J�L��b�1�=9C� C��C��ڞ��a��bT��b��Pe �8*�C`�ܣ]1��?��Ot=04?�e�"ch�TVx%fch{j<��v?8��1�=1C� C��C�S�Pm�v�0�h1Ա{bh��:{�P)'C��=�C�bL��׮��X�`�� +��lmO��Pz��Pj4�� +��v?4��c��KQ"~ +W꽡�:ohe��v�+a�bh!�ahîM��q�&옋�~�$Vxu��P�=-C��v?8�:fch{R<�:'�.~hu��m�P�7�h3�)�˕}� �+��r�THyW�,�s��G�wM~g�e��Hz�+��f6g��}�s&;qfw�s&3�3۳��9��8��9� +�3��wY��jM�y� +H��?��F��r�T��`�Yԟ��I-��L��5��T��G~{"<Y��?4Y��QO��/�;��IuWw��,��/e�C��G��T��` ��]��?�;��d.x=�?�!~p5��ߡ�8��?4��Q_�n��xu �j7�G�'��/�C��ܣ]AT��t0m(T��a��O�A��G~{:<��?8��]��Pb +DOՏz�D_��/�R]�NV�ђ(��9�u��(9~��E�e#�At"Uf:��sJ��i��Տ& +��0��]�hҞ��T��1��]�hҞ��T��1��(E��y;=1��Տ&R9�*[G튡Re�Cah=�C�sZf,��M:$��c��Տ& +H�7=U?�!~p5��ѤC�5p=U?�!~hi��z��tk7Z��!w{V?"ʶD��P)�C�ԫ]1T��HV_u]��|��#jp�I��Tx5�Ҥ==EO�z�Eͮ�4�Pf +EO�z��9��O�d;��J��/��غʙ�SS�9ڀQ�s�%r� +G)�5'r�vEM��0j��:v&M�G��5�&�U�A��G��/x�<�8�!~p�4��ѤC!5p�<�8�!~h��k9N��<)�Yzg�vs&��L�o��$��l�=��g��gV�Q��E��o +��" ^&iQ�}| +�o�K>4�2��: +��r0�A��F��b۶�� Y��g�b��@z��:L��"�,5��H��>uV��|l��"��Di/�[�-�I��_A9��N�~��m-�,�V��ђ��tͷ��߇.�%�-nJ�k&῅��!I��p6][�%��xc��Al=,�4�.��ꅸ�F��S��܆��?��'l�K��e�!]�v*�0f�ak9��*�>\p2�O�'�ҳ\ɶ6��?��*a�n�jmYou�[�tXE��H�^��ӵ�"�! ��7yg�V�T#�MJ�:O�q|Q��q��/��~5�SM��0��Q�_F�Fg�d�VlUM@N��߿ h��&�9~��U{�$��U{S&��|�#��8��Z9�)��^5�k�i��޼j�Z9=��U3�VΛ�"x�کVN�C{�FP+G[��j" ��]�uq��iLh��PKC)�$[QPK��Dsammoa_Diagrammedeclasses2.pgml��o�8��_��t'�)6��i�v�nݤi�N�ʍ���$�@RJ[��6U1��>�'&�on��tE��gC Y�3'��3o(�8�3e��h��_�O��7|��$��Md��\��؉�9KZ#o`G^��J�5�m/��w��Y�p�"��?��q`��ɲ�{��=]�H�Mt�T�Z�n�6:�3E9P�yGJ��=�Cy�֔B�$��Nc �;#�u�E�b��x�{Jzk{��Ą�*Vv%U�w%�Ю��6��8�C�b�:f4�!��>�*��9�l��q��X��ʳ�^Fԅ��̬�h�p�A ��K��X~��˒U�q`;��Qr�p�W6��,��g^@sc1�F�f(�7ӳ[8S��ڟ�ˡ>NK.��]��iIɮ:��%�ް|�Q�è�a��a�:��V��ÒĻZU�3�h$��gv�;C9 ��p�Ro3��i�?��K��p�߶r`Y~��iK .�1�Q�oć��b�J��k��0NUC�0Z�U��n嬴S�<ȽW1 �!Y��D�2��z�+,��Ʋ��ud��f��Zi5Z�T[��*`��J}v�ʃ3xD��pԐ��D*&b#S��Rs��y�૭�$]��l��r��.�eS�q8��/��ܾ��2K�Ϻ�8ڦ�c�d��KnXҀ��^��h��٬ R� @@ -125,89 +126,98 @@ 8 ��R��E�H�(tX )q��Ed�b賀��S�3��aHi�lޔj#��h*�� Bz�)��jo�O��)\�RF�J�Jz�x�OT=�,u>�&㔁J�jQ��5}0��@�@U��({R�I��(�,U��n�'e�=EL�Y�>0��b��Я*6�,��}ZS\OS�h�ŔG��QGA�jWE��S�RK�RY�ȳ�4�,!M��LSj��>��2M��gWυ�>C�B� ��V�#�m�6z�9H�O��:_˪��H�O��5�Y��NL�XJ-�M��1Q��-kV�j[l��̝��Z�t�5/�t">�W�!xg;>�CJ��DېN�6�qvϞ<��.˒�'��I�dP��I��q��9��Z�oG6ko��1��vx�.8�|��"r�y1�c�K@`�_�Q��>(�3��_�f�Õw8�ATM!μ�W�|$_"[Vmp�9��=�)�g��wޮM��G� �o.��Ѩ��d��&��S>h�Ӌ�Ƚ��0WG�G]0}p�p�yܶd��,�M�+�B��4��]}М��X��m�� -�&=��i��6��s��Fm#M�F۰��Nۤ��Ʀ`n��s|��~gm�=��i��6��V�V�6�Զ�wm��ңI��w�6y�`��?PKɟ��FAPK��;Asammoa.todoeO�j�0<�_��.YnkW6�M��{��Xk#P�ERL?�5%Ѕeg��aV�/�,`�ƙ�H�3��Tz��ٝ�HɾI��Н?�ģBҞ��J�H��*%a%�u�|�� +�&=��i��6��s��Fm#M�F۰��Nۤ��Ʀ`n��s|��~gm�=��i��6��V�V�6�Զ�wm��ңI��w�6y�`��?PKɟ��FAPK��Dsammoa.todoeO�j�0<�_��.YnkW6�M��{��Xk#P�ERL?�5%Ѕeg��aV�/�,`�ƙ�H�3��Tz��ٝ�HɾI��Н?�ģBҞ��J�H��*%a%�u�|�� ,��\�l�v� -l�:�L�A;��Nx�{�i7��D�7��=�l5�^8�0�@h�@��h^PZ��ˢ��CYV�j*8�5��ӓ��LB�l�)�?�~�$?PKP��KPK��;Asammoa_profile.profile��Q(K-*��S�UP2�3PRH�K�O��K ��Z()��qq��e��qqr�䔦g恘��> +l�:�L�A;��Nx�{�i7��D�7��=�l5�^8�0�@h�@��h^PZ��ˢ��CYV�j*8�5��ӓ��LB�l�)�?�~�$?PKP��KPK��Dsammoa_profile.profile��Q(K-*��S�UP2�3PRH�K�O��K ��Z()��qq��e��qqr�䔦g恘��> �z& Q}�0� -��b<��SR�S�R�K��+�,EȂ9PK8��7y�PK��;A -sammoa.xmi�][�㶑~ϯ�Ir<�ٴZ7�2N�#�ՓٝK{��>�@$�f�"e^ڞ<��ط}��i��?�_�%�E��o�{� ��W@U��6�'츆m)R^tZ� -�4[7��ŏ�W��y�Z�um�bͻ/��L�}��7�7��j��U�6��3ȏZoh��G_��;T:��n_��n��}��o�~��e��nk�[��U��v<�v�lJ�׾K��{�,W��c�&р�h��u�7�?m��n��_�Q�d�XW�~�<��ݾjw�:��}�m��!�k+_��?(��7��7��1̀�5&��ul*!��[2��˟~�i�{��M;��l�#�ݽ�t}�6z��S�^��P��m�F��Qu^^��3�/v|�$ѷܣ��F/ý�`�XZ0��%2]L��/�`�|��;Y��,��h�Q��=o��E�Z�3��?Rn��&v�nІ��6��p��tv��]��^�OwY�M��1��&r��<u��ы��bt��m��ݽ�|em�X1�Q�iߖuf7r��Ͼ�A+��v� -rm(��U!�O]e��Y��q#�&n� -؇e��'JƗ�+�%_��O��32 -7X3�"��v\%�)��|K��}3��V�:�+^.ɔ~�h�Q�W_��J7Ȼ�W,�W�z=|��)�E+�D�IW�K�1��5^DT}��d�ֹ$п�D�=+"��`�Ċ�Q�!�1�Vt�%��ʎ�z4Ȟd�Y�<٦��I/S1L��'�T��#�&_��(��h��G�wHo��wmlB��/��G�- -:� -�7�)��g��tڿ|~�� -B𚯱��A��[4�l�?��Nk}��g -��!��8DfB#̉ІL��[�e,|��O��ٷ�o?��?��sbAO�m��s9��*�T�|� -�O�l�1� ��R^��'2oڭ��ٚFV��Q=�ɱB�l�*�Zh��+d�]L'ұ7D�u_!�5n�@ˌ�y��!4$� -�z�?D��HnV'��R4�K��1\px_�a;G��D}hi]�Wؾ� -�֯u�� -��t7��Vc��!�Ȏ��R�~�'��Hq7��d��X�>��{W D%��>Rtd�ʲ��2�;��x�2%%�7��i��r�3akC��G��0&��"��91j8��s��>K�?K�=�*��>;X#m��2��vɖo� -�e��}�|��&w?~�s�r}1Rg<R��D�p�|��h�-)Ltu�חL��N��ٛ�_��ٿ�кŶ�"�h�'L&�4��m*Y��"_�Nk� �88e�'��|��tƱ��x�f��7��~��d�� #6��44�(�;�� ^C�3�j��)-8�症�0�k<䬰�|O�);��{��!�v˾��7=cC�%�gu��{��e�I�S-�6�9��\��>��9��W�P��&�7�v$^�*ٚ9�קMf�x�6i��7�C��=z��5>�_�-�Y]�s�� Ƿk�N�Z�KDh��zBԥ��a��X��$n[Gk��1#�=��u��ׯ&�?�@]O&��޿{��C)h��W.�=�tOQ��3[�7lS��U��m�-0�Qo�Ymr�ԝ1�+�6q��'��U)�4��3�-��ĵ4�tr_��4��m^?��P��2ؐ&��?3\�׵5#��#<k��/콡�P'k�1��-�ܡ3��}��&޷r8:vv�x��u��j��U�R˶8� -�I$��gZk��7�В딓�,�Ƶ,e�� L)!��rIf�1q?�M1�1q+b��!"��<�=:�$P$ڤ��D�\��,qlk�6�1��h�;jW�6!-�K=��:W]Ϙ'q��k��Ͱ��xr��q{O_�[g�4座��Q�lp��X��ADoe�V\% N �Z> -<��tA�;�R��ؾ{؋e��-�^��y؋U�Vֽؼ�F�y3�"��;O8��=T��捴��؍YVE|�T{E|��"��0�I�� -3R�8so�m�p!a�k3�#��/��n��`t{�x'Pǡh��*�:��v^v�`z*�M��O˩Ȅ��)۰i�i��6�z�0qP��i;�Is��@K��;�%��_�I1zX�@�}$|K��Q��m<��^��6�33T�^_�(��3�3Sj�E*��$�yA��L{ݱ_Vg��-�^|�%��N\[L�0ybq��}A)|hd�|Q�G K�(5�u��K>s-S#3��^�M��Ť�&O,�h��i�Qn��hd��s��&=�b�U1;��8��9��N5��[F.�q��:8.��kC��`�a)!��G3�igȧ�.)=�WK ��0�U�-ݤW�-��H�@l��Prٰ��jk�"&uK�!>r��q��5,&fV�>��Y81�_�@H�q��s��}�a0HѾ��z�Nq��V��$Ly�GT�[[��d4a�:Y:��Y��Xn�ʾ�P�$��ʳS*@��Q�4�E�� -��)z��Ԫ��a�P=j��x8�O�ܢG�'B��UjeXZL�IQ��m�+|�s��R5j�H�a�Z�{�7��B0 rͭѶ��;��P�Z��])'��&|��X�- Lf̐��h�,�,�)(Q?L��ʞ+uV�kưC��í4��+�"�)��j��S��?ӎXv0��kF-'t�'� -��H��Sr 芹��7�j�ݑ:@�q��p�S��0�$�@@V��Uk��=��p��iX4��|��?��d5��$�w��)~DO��7q�y��H�]�� J��'��(�� -K�kɅ��n��D/�ε(U-/17��r|v��٥!2��m��a�@ɽJ�t=��Z��EaJ��X"��J��"��8P^�Z\�9J��J��ʷ��M��}�;ʈQW�/�H�1�}�R��h�@��T -�/��F�j8�>i��J*<N��C"�(��Wؾ��S�� 6ӑ��lG0�`6�a괘�2��1oÅ�J�3�)ӑ�i[+��u�)��c��<��lPA(`Z�#( �@��#�Xn@�Z ��Qm�Ll9HL��xZL2+ �J4 -��c��&�Ђ�L� �0�X�z#��C7��r��^��nP�� -m(�7�D�$�Z̶@�<��:T�BZ�n&�D%)~��;O��`+0�i�� -�t��*At�>^v1��>�ڝa1%K`Xy��VX^��%�"��l0RB� -�dr7��e��ym�xo��Q�m1q��P�MB��>7�`N�4�! sV-y�� -��iо0��!ll��;��8��̈��i -�{[ �[d��B б6�V& �K�)U'N3�a�4 �i�� -@@��%��=��v�ռ��񡀛�N��YL*;q� �]� � nT�b{�և<�R<-y��:��w�\g��1��r�8 ��'A�C��ʁH�!� ��2-&z@�>��u��n@X&�ܜ��G۳d�YLB[q� �m�C{�!��[9a�o��V�-��p&�X�o��%+7�'��'dpQ��@��fc�O�`��AGt�Z;�j��b�ә��n�� B�؃�Ȓ,-&�P�@#�u�,�$��(�!��ՄL�e�t9b&�}�Sn��`P�b��g�3� |��0j|�Tǝ�h��E�P�l�2��UT6�{� ߭O��0}L�A�4�H� �i�t -M�>8?�:�ofܨS�d?1M��`VP�0}x�P@d�o��0d�YP��0}n�Pc��"�-�f�2g� -�<c��&A Q�u��wI:H�p��i�w�){�ȳ�a�w&��b��郸�X��@Y��NG�C/��'m(��Ib�N��e�b -Ia�H\�ƌC�f�͑�?Q�Ϗ$ -X��L��%',��5�$*.��`��H�` !�#֡�E��b�f斄;��X0�0��O��>�{"�]� -:��Em -� �MA�CeͶ;�ߓIB{�g��q��F�rH�b�.�h�wuv�:n61��OY�c�V��p��i]4��|ǡ�-�[��튁̣�@��S�k�M��7u�y��]��)��p�L��x��Ѱ��\��次��+aJ��;עT��ܤ�f{��cd93s�_�1��0L��϶�Ԃ�v�1o��ZW��y�mI�Ӧ(5:&��%�&�L/wFW˅�;32��+�� -rS�A2y��N�@HN�P�CfF�\óo�_�b��X=��%6IU�q�c�Q��X��e��;O��0�b��`0f��:��p�kna;B�� b�ۉ��b��V,�7�_� ׋��Y̅Bq��>a��@ *�X��̶��"��a�d1�q�X8$�e��#H��i@�K{��}.|��9��-\��=tʍ�#A�� -��A��X�z#�Uo�4��<��B��r1W��+9�GK?%E}��@��!�51�/r�h��0�8Z��8��ido(P��Ђ��v��(�ׂ"��ȂX�z��łyt��c� -dx:(90�Q�O��D��x��^��@��U��2��:� -��gQ��}Ra��0Soʽ'�3CJ§y@P��AIRO{��!��cͳ�,n�ө�uUS)��E��|��Q��j��:TVg��%1e�Y�=I�@0(�:�8 U<��<"T�:;�Ŭ��p��u�l�I�gɞ:£��,�Q__�S�$"Z��$�,�Β�>K�O6��A[Ȱ��8}��u��Q\&��#i~�z�HI�S�G�>��Pc �NO��M��yZ�th3��8@d�[�c��p@��T��q�:�$��r�6�M�t�s�Y�@��PY��"z�b8@#z�u��)G*M,��0��C�1��f�X�o�e�y�-J�J�a��,�>Հ��)��s�sNJ�T�oyW�8lgۿ�]Viڛ��S��|!�w��,f�+A �rc��-��P - ֡��/��7\@�P9Yv�� -�:TsSP�so��^D�ͦ�|;H�p��i�w��ԝ��7��pR�17�=�{e�Y��cHh�PM'x��;ڠ�өP�4U�wC�P�p�Zy��R-�J��p'$�!{U�N^��/�R-��+A 8zc��[�[:��?�f!N T��u�B�/rEw�8 �Ѣ"�� X��t{�@9~S[�@��Pk��DƜ�آ�@�@��X�zGƈ{j�Nk�`�O�V?(�h1Nq��g�P�\ĝ> 4� -i�Ѱ?0� -�٥��3G�ͣ��t�+��[Ba� -b�Y�&�P9�� i:��5�գ|��[��3 -��,�!j[�}�R�vo��)�}��;�[E�!�Iqt� 8�=��~��xLwGC��1N��n"5�~�/\�<a��v -��_� -5}R4%y�>v>�ɲf[��8t�C>��'�4�y4��>B�%U��=�jm�CXD��wa�s�(��N�� QoG�Ѱ��\��Q�}=��d��s-J�A�� -��?7�h��#˙�[�:�g�τ�n��϶�Ԃ�v�1_�A��ֱ |[�KIde-��8}p�6֡�fQ��3�^�x��LC��?g冁>3�4|�VP�yh��l]�8ZLZq� m�CՁ��Ae��?h��נ�>T��!E|j�lH�e?͸�}��V�R��R��a�v��ށ��k��o<�W�ܕ�:S��܃Z��jL݉�@��? >7��)�&�(��{�nW��vg��l'6�2A� �赕MD}�ⳒZq��xIz��f-H�qo�$��9<z��ۂ,�!\|��B"'�kk{�#��Phd��t�Ci��Ƌ -yn<'�z�Й�@��h��f��1��o?a��9�Z9x�Բ-��<JU#q�q��J��E��s]�#��J��H� -b�ڌ:�2a��e� ��L��0�` �K�ӊd�* D�$1� D$ڤ�9-O؆ -��\�UZ)w�/{�.bm�;�A�2\�]��șvW؄ �?дe��b�X�ط^��(N�X�l�d23nhNq[0q�`&��X�QL�q��@d��KU�x� -{�p��x8��p��1P��ș�w`�%��|�)�p�0}b��^e�_��r��%��x��:��@��VA��u�c -ڼ��U\ ��533�_P6Dq�y0��%�K��%@��E|\H�U#�Q~BRVE�IM�UE��8{E|[vE��LP��SGx4֖��,�Q_g�u��!��L"��3�Ý.�a��f�b3/��e��b�@��F@h�1��x�y��k˱�2�t�j1��K��D�l�-��2\f��W�)e��\�/Ux}�k)?%��N��'JQ�:d_^�{��E��!�{��P@��݂.��(v�P�I(��f�2��ր�r�R�?ѧy8�K�nFI��K܇U��8:(;0� -�@Ac��x.Pm�`[ �Ҳ��h��,h,pk�X�I�SNF�@�'�PY,�"�Z��v�}��7�X��V&��<L'󳘰 �f��i��2-N�5(��I��e7'��(p�6��l� -�ZL]b �0q�C�PPASR�[�[:�4K�Iu(A`ER�� -��C��dB��ڠ˴j�U��֐9sp�� -d�Z�A�>8�:T�:q�fe�j��$J�^�Ƣ|��l��BvZ��l#�k��k�� -��md�k��w�D��,.�a��N�x�Q9/͊F#sH]�j��A,�.�gU�� -�f3��떷D|��L[R�d�yI#�V�� I��E��e��I>�΄,�3��5�� JE��LY}{-�l��ۻ7sKR��0��?N�� -�Q�'��W��s]��gC��g�,��P}�S%��,�FY-�<�� `��ș�ڠ�3w��(��Q��Xlv��:��g�;��\�ΘɅAj�Ɋ*a��ƚ��%]Еq�R3��=)�YX\2�0�5B�t��T=�U�x��t�7�c��Q�� U��j4��┳B��o�� -�tli�Z�i`��V�%�(!��D'��N -��-2�%�2��^L�&g'��⚯0'�� ,�s,��0'�'@�Y��Y]��K��h�]��6�Z��\4L�)=�̔��O�4�흫"�k0gR8a�� -/pE�=Cn�� -��]8��Χ��ds��C��?�D� -d�G�l?p��[��Z�kJd�M��VT��.ls�d�&J'��(��!"�9�ŢƗ�3|�Z�ă��+��v��Y�ɛC��ĸ�i�2;�q�=d�Prӡ[��!��*�҂��crIvȽ*��%�#:Y\.�� -��@+��ŧcZ��2�ã�)��Z��~'��n��-ن -�b��Q|��l<k�#�� ƃN9�ASGs��[a�oc��Ӓp�02:�'*��|G4��!��Ew��Έ��.�jh�>��q�I��#�9s�Gd �{]�T��xZ��m��=A 6�VB� -�{�K�fS�}�m��n�Ұ�nCu��rf31�Qm��U�^23��jM2!}��==��z|�W� a�<��sf��I|m�!��-��^/��XِuA�LqтXY#��]��D1�B��O!�C��4dj��`K٘�K_�a��2��s>ÁN��|��^� -{��l�#k�`��,��P -�M3�p��G鈵�SQR�O�9��3�}|��s�e�~$H'&ˆ�Ff�O8�ڃe�3�2=��ű�m-��ܭ4Dݘ[��:��ω��l��Ǭ��ݫK$��黳��p<��ل5�W_>��- -�� -ZY�J|>#��JR�1�k`�@}��zC�ai{$��%'�/��?��~r�/� -��X��\~�\�dj�h�)O�Y�1 -��;2C�D�%�"�n%�W -A�HD��M'+��R#[J�l��l͊�{d��S0��I�1�n:5�҃�A��Lp��C�g�}ր�ت -c��mh?��e�'�'+��F��9a8djû�K�e�`��w{/e��}�!�$��y��׉,�@��6q7�r.��AҮ�ĪH��dx��U��~�� bWgg�� 9�8��i}�-r&��6w�d��'ˌ��+\��̐��To�d��ꊜ��]��.�#�(q��b�r��#��ș��n��9�oW�9��s�� --r2� -�E��.�&#g�@ms� 3�6 -9��"g"�Ks�L��Q�̐s�4�d��9� -��d��(�:d��늜��"g�cs�L��s�¨Cf��{�5E�1�.C]�s�H��%�d�Ga��N"�m��"g"wVs�L��Q�̐��ɼ�U[��Q9��(�:d��b��FNfҙ�"'\�{��`�Ga�n_�*D�DI�EN�v�ܡ�� ¨�!:q�f2��"��=wh.rN�Qu�,*�Q��L0W[�kw��(�:d��7MCNf��"'\��|��C�U�ܡ"�ˆ��9�kwQ��!�*|��(��$��yh��޷~�K(;G��pє͓F�ϛ��5CL��u�jg@P��*�x��]�F[��2cX� ��({��-�y�喎<��;*kQ}H�� X�4YxP�f�u��'��r�ܾ ��Tn��/o_S��o�PK�9��%P,PK��;A��&%K�sammoa.argoPK��;A��' -�*ƚ�sammoa_Diagrammedeclasses.pgmlPK��;A -*��Q&v-sammoa_Diagrammedecasdutilisation.pgmlPK��;Aɟ��FAaCsammoa_Diagrammedeclasses2.pgmlPK��;AP��KsJsammoa.todoPK��;A8��7y��Ksammoa_profile.profilePK��;A�9��%P, -MLsammoa.xmiPK�[r \ No newline at end of file +��b<��SR�S�R�K��+�,EȂ9PK8��7y�PK��D +sammoa.xmi�]ے㸑}�W0��X�JR�{&$��ݻ}��{� ��H +/5�~��ط}t�i�a�O�K�D�(� Q�-OW@&��@f"��'�z�c+T^tZ� +�u�0�%�ŏ�W��y�Z�ue�ͻ/��,�{��7�7��l9�e�6�� +{k��7ɏ>Z�i�?cCy�>)U��_��Te:�P��( +�^�#��)��g�у�}� +h��/�׵��]:��ٞB��k�&��h��u�7�?m��n�ԯ��(.~2=B?yÿ� ��D��ڝ�NG�v_v�/ɰ��|�ֱ��f�(��$��>��O�a��0�c`K��ߒ��vw^��NK��w�7m�Swl��w�J��u�Niwpվ"C��q��v^vz}<Z�=�yy5l��/ۻϰ��D�r�V+�PL�~�usa��P��0��x��7��x��.�w�ƳD�.�2�3��ƍ�Ί��q�'��k��H�m��Z�S��Iz��Z;޷��S��w��/��y�.�-d��Z��t��1��/�d\�ёhw�O��(+'��2L�趬�0��/��5Zb�q7��hM��ů +��(�dL{e��5qCV�.�(k<Q2�|^� +�ʗ�.V�/��ez��6Y(��)!L��W��٫��_�bA��E' +��W�I�E�b��z��뇰�D��N�/Z�'��Yt�zd)�<��I�AH��K�l�I�L4ߓ�$R� +��ɨ,�x:��S�q1n�0=��l٨�G��I6��ʓc)ݯX��"ݬ/�x"HE:<�`��z��Q��~��&�+|��!�菈~��y��¤s��yS�i��?�N@YL��/�� .��E��1��7��L��ݑ��#��8�Qv��L�91ڐI�\�~#t��E��v��W?��2��X��ζ�8�39��*�T�|rL�O�l�1� ��R^[�'2o.ڮ��w�9�NV��S=��{�F��?��!� +�zӉt�5�v#P�|�[%�2��w^ڢ�z +a��Uh�gv3��8��B�Nu�f5F�j��o��=�� +;w�I��ׁI��h��=��!��:�q�Z��/�$��)�٢�Kײ�r��֜,��'[;�*��ewx��Y��G��No8ZhLII��0�p[�嶼�L�Z�c��*s>LH`��=#��;tN��lr�v7��˒��zO�*��8*?��H[�� k�]��M�SY3٧z�=f��Ïf�\_��)��w�?��.��z��!��n� +Uc��O_��u2��l;(ҩf�D�񸝅w�Me!?TC��m-0�g��]sN�#�ݡ�G�Q��8ִ��f�ƿ��P�LϜ�d��}�:�[��cEr�^w��k�y�GT�0>��y��%��I3e˖{� +t�6d�n��Z�o� ��n��u�٩,�0�c~��f5gt�@۟J 7��r~!�^��J�^G�f@Ж�k�A�[3��̐��:��4Q�;�G�_��&��+��kr.Y��vM~�Q� +�@��'D]*�k��l�e��M�u��z3δ�8��#��w}3�}(��ô~x��O� ��#��)��W� �gf��m��J�c��ܱ�&? +� +;��o��5�aEݦ�ۻ��*��~F��t�u��F#>��K��F3��R�=X޿yW�x4��~:��g�~�y�n��Sv�h�'-s�3�dc==fV�m�:t�aW֞az�B7��»V��6/�ß��Z.]��_j;6Ǹ�5�d�z�Lk��c��[�� q-K��E��yB=QJ�!��B��mL�}S�mL��$g�x�H�:Oq�. �6��'��x�:�5FO�A��X��Վ�թM�@��Ȱ�NFU��S�I�q��x|3(�6�0!zbm��W�V�9�)M�(�t�Cc1�\�"֝U�[�W��ȴ�EO�=g��M)�bl�=��rߋݖ}/��<D��*r^+�^l�\�Ȭ�F��c�lXr��`��~��a�F��j��,�"��"�e��^_�D��$�Fe��)H�� +xL��2�5��k�Ǘ�i�K~0��Q��H4��*�:��vVv�`z*��M��O˩Ȕ��)۰I�i��6�zx?qP��I�Ɠ��Aw��)w�<��_�q1zX�@�}$zK��Q��m<Q3/��^��Ɨ7��j�<��R#z�(RG�Y@��K +ɤw��e�p�A�"��G^�� +�a�ĵ�D��'7*��΁��/ J`\�(aif&��r�v�g�ejd�؋� ��%��8�<<��&�+#�VA�d'W��*f�҃#��s1gbq��P�ש��z��疑�f(�N�7E��Ч�:`XJH�E.t��-<A��) +�KJ��-'<�oUrK7�{K�.5=[},�\6��Z��I�R��2��u +��O,dN��s ��8NF�9\��.N0dh�[�\>�ǸP3+D�GHO�_�<��c`k[2��r�.�̬D��SL,7Ye_D�I��d�9 i��A��QVJ��=��Uj5m��G��Qg4٧�[n�#�!w�ڀ*�2,-&ݤ(}�6ӎ=�Dt��ϱ@�ƽ՛S�Z!��h[��]��c�X-�ׂ��L=�C��V��SfHO�j��w�� +{��&��eϕ:��5c�!\p��V��i��i5z{�)y�IG,;@��P�5�� +��d�6�Y�)9t��U��kn��P��(�G�5m0��n�i" ��̪�uc�|�~>��~��iXt��Ŷ��?��Md4��(�w�� ~DO��3qk��H�]�� J��'�ń(��M��iɅ��n��9�^��kQ��Z^bn� +�s�ǫ��옗��KC�>3�&RKm�%£vL}cn:}*�î�.�H�1M�*�&�֛&�S_U�>慝��R5L(�?�� +$M9i#�x��;�<; +�$h�K^x��&��ƃ��S'Ť��yo z@_T�x�L�&�,�^�~`H��A��O�p�,�� +B�VCY��,� � +�� ͝cf +� +�PpO�I�!A�X�-��7(�[c��r-( G�@�It�7 <�:t�8j/��Lw��hM��p ��b�� ѡ��u3I]��3��{�}:.ֿ�K��I�s��6h�Oo��˙��T��b��G*�۝A1%K`X7X�V� +�ɘ%�"��l0�<�%_�dr7��ymyÏ��m1q�༐�P�MB��d� GE��9��<�@�H�D�4h��^� +֎qo�\ +R�ʍ}fDr�4�-�-��LX�K�@��*z ��܄@h �͒gIC�D�j^W��P��R�,&�8}��'��7�`��n@F@)��X� +j��C��\ݘ�R^�b�� ѡ�Fq�� +$Б��=��= ND$:�x7 ,n��;�2�,&��8}��/��{��RN9a�o��V�-��p&�D�o�k\�'��'d�pQ��j�o N3�Vҧy0P��U��]��3�w1��h73n��-��mdI�E(A �&:TJ��r�Y�zs��c�鲬�.��$�q�)ۤ9��,��Q�ϐCfHA�4Oa��:��7z��e��1�=i��A�[9�v��a��f��h$p��A�,-��0}p~Lth�L�Q�� 6�~d*�C��Sa� �4��7��i��p3a� �,ѡ� Qߏ[<�rtdM]y�SCM�@(��PY�"t��a��}lt�){�ȳ�i9w&��b��郸�D��@Y��NRG�}/��Gm(R��qj�M��e�b +Ia�H\�ƌC�f�́�?Q��$ +X��L��%',��5�$*.��`Ì��H�` !�#ѡ�E��b�f斄;��X0�0��GO��>�{"�]� +:��Em +� �MA�CeͶ[�ߓIB;�g��q��b@�b��hht +v�:n61��Oy�c�U��~��i]t��ץ�-�[��튉��@��3�k�I��3uk��]��)�g��h�\L��y��Ѵ��\��次��+aF��;עT��d�f{��óc�933;X%1��3L�g��M��k]e�ѷ%0��ܖ��L3u��]-L��\��8R�*�MM�h�ZLn: !9]�C��9]q +ρ�%��s�(o��$U�9[��Y�F!��jl~�Y��<�o��@��r��y,z��s� L�s�O�)o'N��Kt�r��,�~�\/��g1 +��Xh\c��{S�6B��|J�:��[��@�� +X��@d�iV�!��W� ��r,�4f��i��`�g�ַ�0��17J�j1.��F��z[�y(��6�1�b�q��r�qL��W +1'Bjb �_�/�� +aJq��q��< ��P�U��! +��'�GQ��E��>#��蘀�[�Y��_r(`��AA��)J�b��`5c�[��-Ld*Mt�3[��8�S�5a�ޔ{O�2CJ��y@P��AIROz��c�w�,n�ө��k�RB�b��w�B�^8߰y�gk1��Zx��bnga�g�#Dp`CILY~cO� J�5HOt�.�U�NNq1-�()A �%*r޳dO��H_Py��P5�)��(I��n��ϒ��uD�r�2�,�!N8 j�u� n�H��߱��)R��j�$:��=g��n�i��<�.7':��X�N��i1�8��b�5��ܻ�`S>��p� �8':T֦,��6�ѐ^u��H�.�bq��L�1I1�3�8}`&Ht��@\&�W��@�v�J�rl�P +(I��ʊ;�}��DI��3�v��e�&��_9�p��rw�P)��b6��.7ѡ�*.�Jn0~��b�H��m��eg10 N�@�C57�9��.�E��@��l�ɷ��~��0��P�c��y|��I��+�Β'�AB�D�j*8�S��A��k�ڙ�Bqýba{�? +Hq��+!�D��q`XA�:yɺs��Hq�?��Mt�VnMl�r�,��8�P�"�P� +�� +��G��&"�2S��YLAl �"v�C�Q@8>��s<c��a�#��: +��:&kX��@��8 +��A�C�swT�Gh��{Á:�3� +�إ��3G�� +�+��[Ba� +�Y��̡r�RҴ*wk��G��ϝ3`�2�n��u��mPx�5Juֽ��ES6�T��;�[E�� Iqt� 8��~��hDwG�i�ΐ�n"5�~��=�>a��L��ɧ�_� +5}24%y�v?�Ȳ��z�t�CC>�9 �4�u0��>B�%U'�=��j��KXD��wQ�S�(��M�� Q6oG�Ѵ��\��q�]=��x��s-J�^�� +��;7�x��3ϙ��*�'�Ϙ�ng��M��y�=~Z�!�m/�,i$��983��D��D�Be^�� Y��~N� +*3�4z�Vиyh��l]�8ZLZq� m�CՁ��Ae�S��r��z_�l�5�x�0��dH��2Rβ�f\K�?zy��Di`U)��0w;��lA��õG +�7�U7w��4�E{��}<��.�3w�%Pk��Mf�@J��) +){jO�v +ʉ��kw�s]e;��א R��D��|"��`p��̊�%�K��Ï6kA2�{;'qX�,��]�d��u�g&�υ�/��?�9�<G79�+��GB#�%�8��J��u^l�s��'L|GDcI�7�� i/�;� �ϡ��cs�@\�Q�I2��+h�x�$�DP��.��T��O:�+�f܉o +� ��d(c��H0�%'��{K�]r��T$�UI B&��!"�&sϑjy�6��\�h��a{��t�)�p�wa�#g�]a&��nw��h��o��)P�>�p=؂�:d��М�`��L;��/X��-p_�B�B��`8d3�6�c��/�3��K^��|SL�a��nM��F��KS��}�U�=�eu�Uo�t��,�ڨ��Y;ea��z��k-,jff�ZP6Dq�y0��%�K��%@��E|XH�U#��,��5q��83�>��0�� +�p�/��۟kC�`�u��!��L"��s�Ý.�a��f�b3/��Ge��b�@��w�� ?��h�y�V��HcN:]��e�S�f6��I.��}}�K�2D.�/Ux}�k(?%�� N��'JQ&:�_^�{��E��!�{��P@��݂.��(v�P�I(��fҲ��ք�r�2�?ѧy8p�� +��Bs��q�_v(`��B��\��^¶@��e�=u��@�X�X,�֒ ��,-��PO&ѡ�X�G��<�K��:�)Z��S�<LL75x��g1a 2͈��<��eZ��kP�4?�nN�9)�P�`m�9^�6�^�1��Ba�D�� +i��P�� 8h�vwʄ��~�i՘i|O��#k��p��8}p>Ht�lu�󚕅�]w3�(�-g^��5c��isc��!u�FD׊�׊ߛ9��fE�ĉ�Y+&�Y\*��,ɝ8�:��r^��F携8>�Z��A,�.��U�� +�fs��u�[">�f�-�q��sI#�V��Vɢ�)I��E��i>τ,��p��)�� JE��X};-�l��ۻ73KRu2�a�7��ȑ��lO5;b� q�n��$��.+XL� + ��^�J&1:H4��de�<�]KY+��G��5��Ӥ�FQ +��{��b��fv8��ݨ]8��`��Q?��wFL.�3sNVT K�k�9ZX��]�'P,5#�aɌ�㲞��%��F��r��[��]L7|#��Πǎ��T�yߍ��.;��m`[��-3��aU��O�Gti�f��&_ =N��lr��,��q��E�>�0�&̩� f�|a��m��u)�-�c�fWk�� >�'��q�� Y��sU�} +�L +'�y��g�M�cz!��y��~��i�/ٜ��R��|Y�Q2��}�� ~$�g��}f��ڜ:��ң q1!��q��i;-�F��n�}��%�%q�e��Jjv7]�u�u��PWwt�ZfG�?��n:t�B?wR�XZP>tq!z��Y�r� +�{I��N��-uӻ��,�ʧie��V~�h��q��P��t��P�P�Uw6��'�t�]T~>a�ٸ��f��\4�VX4�ۘ)$��$�?��|��?�#�[Mݢ;Xck�}nm5�h��$�$�a��9�'2�׽�C*}o<�9��&�͎�DF+�W�LD��S�'��6{��7xa�f��3�d��9��q�(��M/�EXџ�jM:!}��=;��z|�W� a�ܓ��sb��qrmg!��1B-��Y�]�XY�uA�L�тXY!;��]��X��Bk��v\_!�C��td遥`[Y[�G_�c��p��r>ǁN��ә� +�� \��#{�`��v��l��P +�Ms�p +��n��H��SQR�O��Y��s�}|��q��~$H'&��NfR%C��B팺L��?dql��s�D&�+ +Q7�mG��s��|%>�k�?�d��I +x��d��O>s6f��՗�t��j��Y%�<#��RR�1�)k`�P}��zC�ais$��%'�/��?��}��/� +��X��׫��\|�\�dj�x�)O�U�1 +��;2C�D�%�"�n%�W +ALH�� +��R'[J�l��l��{`��S8��I�1�n:u�6A��Lp��C9πUր�ت +c��c�i?/��e�/�'+��F��9a0`jû�K�e�`��{/e�s�!�$��y�;�Y؁,�m�n��\B�sI��R�"e��Y��WQ��}��Tr��AR�� ڹA��q�匜L�Cm�3��K&'�̼8Yf�L]�j�䆜��z#'�DVW��B5w�49��[X��ܐSmr��"g*һ�K&�̾]]f�L��6W�B��Uhِ��V�-r�.�5w�49Sj�+�!�i��t}�9S�]��d��(�;䆜�!'3�șJU��%�d�Ga�!7��L?XW�d��9S��d��#p�r�e��)r��wꊜ�T��.�&#'8 +��t�1o��9S��d��(�;䆜�D��FN�%��"��9Ga�!7�d�7r2��9��s�#'8 +�p��X!b&J�-rµ�� +FNp��ё3�y�9�p��Cs�s�¸CnQI�"X�FNf��"'\�{��`�Ga�!7�ir2��9��]�K��s� +�;T$�`ِ�Q�9�p�.�P�@�s� +�;4 +9sI�=f��&�l��N�ѝ/\4e�Q��&p+�Cs��,�J8\�u[��1��6~BVpj�^,v�w��e ��Z\��7,M��Yz��6��]��n_��*p;��T7�!��?~��PK~��P�%z%PK��D��DH�sammoa.argoPK��D��' +�*ƚ�sammoa_Diagrammedeclasses.pgmlPK��DC)�$[Q&s-sammoa_Diagrammedecasdutilisation.pgmlPK��Dɟ��FA�Bsammoa_Diagrammedeclasses2.pgmlPK��DP��K�Isammoa.todoPK��D8��7y�Ksammoa_profile.profilePK��D~��P�%z% +�Ksammoa.xmiPK��q \ No newline at end of file

1 0

r658 - trunk
by sbavencoff＠users.forge.codelutin.com 16 May '14

16 May '14

Author: sbavencoff Date: 2014-05-16 09:28:51 +0200 (Fri, 16 May 2014) New Revision: 658 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/658 Log: Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-16 07:27:24 UTC (rev 657) +++ trunk/pom.xml 2014-05-16 07:28:51 UTC (rev 658) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>5.0.6</version> </parent> <groupId>fr.ulr</groupId> @@ -89,7 +89,7 @@ <distributionManagement> <site> - <id>${platform}</id> + <id>doc.${platform}</id> <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement> @@ -101,28 +101,33 @@ <properties> - <platform>forge.codelutin.com</platform> + <platform>codelutin.com</platform> <projectId>sammoa</projectId> + <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain>  - <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> - <nuitonI18nVersion>2.5</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> + <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> + <nuitonCvsVersion>3.0-rc-1</nuitonCvsVersion> + <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> + <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> + <nuitonI18nVersion>3.1</nuitonI18nVersion> - <eugenePluginVersion>2.6.2</eugenePluginVersion> - <topiaVersion>2.8-rc-1</topiaVersion> - <hibernateVersion>4.2.0.Final</hibernateVersion> - <h2Version>1.3.171</h2Version> + <eugeneVersion>2.9-SNAPSHOT</eugeneVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <hibernateVersion>4.3.5.Final</hibernateVersion> + <h2Version>1.4.178</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.5.18</jaxxVersion> - <swingXVersion>1.6.4</swingXVersion> - <xworkVersion>2.3.12</xworkVersion> + <jaxxVersion>2.8.5</jaxxVersion> + <swingXVersion>1.6.5-1</swingXVersion> + <xworkVersion>2.3.16.3</xworkVersion> - <jodaTimeVersion>2.1</jodaTimeVersion> + <jodaTimeVersion>2.3</jodaTimeVersion> - <slf4jVersion>1.7.3</slf4jVersion> - <logbackVersion>1.0.6</logbackVersion> + <slf4jVersion>1.7.7</slf4jVersion> + <logbackVersion>1.1.2</logbackVersion> <i18n.bundles>en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> @@ -158,8 +163,20 @@ <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${nuitonConfigVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + <version>${nuitonDecoratorVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonCvsVersion}</version> </dependency> <dependency> @@ -183,13 +200,13 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonValidatorVersion}</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonValidatorVersion}</version> <classifier>tests</classifier> </dependency> @@ -197,6 +214,12 @@ <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>${xworkVersion}</version> + <exclusions> + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> </dependency>  @@ -226,6 +249,12 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-config</artifactId> + <version>${jaxxVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> <scope>test</scope> @@ -283,6 +312,12 @@ <version>${hibernateVersion}</version> </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-csv</artifactId> + <version>${topiaVersion}</version> + </dependency> +  <dependency> <groupId>com.h2database</groupId> @@ -331,7 +366,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.8.3</version> + <version>1.9.1</version> <scope>compile</scope> </dependency> @@ -339,7 +374,7 @@ <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> - <version>5.0</version> + <version>5.0.4</version> </dependency> <dependency> @@ -405,7 +440,14 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>${eugenePluginVersion}</version> + <version>${eugeneVersion}</version> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-templates</artifactId> + <version>${topiaVersion}</version> + </dependency> + </dependencies> </plugin> <plugin>

1 0

r657 - trunk
by athimel＠users.forge.codelutin.com 16 May '14

16 May '14

Author: athimel Date: 2014-05-16 09:27:24 +0200 (Fri, 16 May 2014) New Revision: 657 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/657 Log: test commit Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-24 08:53:13 UTC (rev 656) +++ trunk/pom.xml 2014-05-16 07:27:24 UTC (rev 657) @@ -527,3 +527,4 @@ </profiles> </project> +

1 0