[Sammoa-commits] r442 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application 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/application/io/output/map sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa sammoa-application/src/test/java/fr/ulr/sammoa/application sammoa-application/src/test/java/fr/ulr/sammoa/application/io/input/csv s

Author: tchemit Date: 2012-08-20 14:44:55 +0200 (Mon, 20 Aug 2012) New Revision: 442 Url: http://forge.codelutin.com/repositories/revision/sammoa/442 Log: refactor SammoaDecoratorProvider to UIDecoratorService + reformat some codes Added: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java Removed: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaDecoratorProvider.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaServiceSupport.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.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/SammoaStorage.java 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/sammoa/ExportApplicationService.java trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.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-persistence/src/main/java/fr/ulr/sammoa/persistence/AutoSaveListener.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Flights.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObserverPositions.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observers.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SectorImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Sectors.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateType.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Strates.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Transects.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/java/org/nuiton/topia/tck/TopiaDatabase.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaUIContext.java 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/FlightBarHandler.java 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/TransectBooleanTableCell.java 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/sammoa/ImportApplicationUIHandler.java 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/sammoa/ExportApplicationUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/SpeciesCodeValidator.java 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/TransectUIHandler.java trunk/sammoa-ui-swing/src/test/java/fr/ulr/sammoa/ui/swing/BeanValidatorDetectorTest.java 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2012-08-20 12:44:55 UTC (rev 442) @@ -383,7 +383,7 @@ Preconditions.checkNotNull(campaign); - FlightService flightService = newService(FlightService.class); + FlightService flightService = getService(FlightService.class); // delete all flights from db List<Flight> flights = flightService.getFlights(tx, campaign); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java 2012-08-20 12:44:55 UTC (rev 442) @@ -87,7 +87,7 @@ return persistence; } - public <S extends SammoaService> S newService(Class<S> serviceType) { + public <S extends SammoaService> S getService(Class<S> serviceType) { try { S s = (S) services.get(serviceType); return s; 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaServiceSupport.java 2012-08-20 12:44:55 UTC (rev 442) @@ -37,7 +37,7 @@ * {@link #context}, {@link #config} and {@link #persistence} objects. * <p/> * <strong>Note:</strong> should be used for any service! and never - * instanciated by hand but via {@link SammoaContext#newService(Class)} method. + * instanciated by hand but via {@link SammoaContext#getService(Class)} method. * * @author tchemit <chemit@codelutin.com> * @since 0.6 @@ -57,8 +57,8 @@ this.config = context.getConfig(); } - public <S extends SammoaService> S newService(Class<S> serviceType) { - return context.newService(serviceType); + public <S extends SammoaService> S getService(Class<S> serviceType) { + return context.getService(serviceType); } public CampaignStorage getCampaignStorage(String campaignId) { Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java 2012-08-20 12:44:55 UTC (rev 442) @@ -250,7 +250,7 @@ this.flight = flight; - this.service = context.newService(FlightService.class); + this.service = context.getService(FlightService.class); this.currentRoute = service.getLastRoute(flight); this.lastTransect = service.getLastTransectDone(flight); 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/CampaignStorage.java 2012-08-20 12:44:55 UTC (rev 442) @@ -25,7 +25,6 @@ import com.google.common.collect.Sets; import fr.ulr.sammoa.application.DecoratorService; -import fr.ulr.sammoa.application.SammoaContext; import fr.ulr.sammoa.persistence.Campaign; import org.apache.commons.io.filefilter.DirectoryFileFilter; import org.nuiton.util.decorator.Decorator; Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/SammoaStorage.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/SammoaStorage.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/SammoaStorage.java 2012-08-20 12:44:55 UTC (rev 442) @@ -26,7 +26,6 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; import fr.ulr.sammoa.application.DecoratorService; -import fr.ulr.sammoa.application.SammoaContext; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-08-20 12:44:55 UTC (rev 442) @@ -137,7 +137,7 @@ EsriGraphicList graphicList = new EsriPointList(); - FlightService flightService = newService(FlightService.class); + FlightService flightService = getService(FlightService.class); Campaign campaign = dataModel.getCampaign(); Region region = campaign.getRegion(); @@ -368,7 +368,7 @@ TopiaContext tx = beginTransaction(); try { - FlightService flightService = newService(FlightService.class); + FlightService flightService = getService(FlightService.class); // get flights for campaign (and between begin - end date) Iterable<Flight> flights = flightService.getFlights( @@ -580,7 +580,7 @@ Campaign campaign = dataModel.getCampaign(); Region region = campaign.getRegion(); - FlightService flightService = newService(FlightService.class); + FlightService flightService = getService(FlightService.class); // get flights for campaign (and between begin - end date) Iterable<Flight> flights = flightService.getFlights(campaign, Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationService.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/sammoa/ExportApplicationService.java 2012-08-20 12:44:55 UTC (rev 442) @@ -143,7 +143,7 @@ TopiaContext tx = beginTransaction(); try { DecoratorService decoratorService = - newService(DecoratorService.class); + getService(DecoratorService.class); CampaignDAO campaignDAO = SammoaDAOHelper.getCampaignDAO(tx); FlightDAO flightDAO = SammoaDAOHelper.getFlightDAO(tx); @@ -224,7 +224,7 @@ ExportEntityVisitor.newVisitor(dbMetas.getEntityEnumProvider(), exportContexts); - FlightService flightService = newService(FlightService.class); + FlightService flightService = getService(FlightService.class); try { for (String flightId : flightIds) { 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/FlightServiceTest.java 2012-08-20 12:44:55 UTC (rev 442) @@ -67,7 +67,7 @@ SammoaContext context = new SammoaContext(config, database.getPersistence()); - FlightService service = context.newService(FlightService.class); + FlightService service = context.getService(FlightService.class); Campaign campaign = database.createCampaign("PACOMM", "FRANCE"); @@ -84,7 +84,7 @@ SammoaContext context = new SammoaContext(config, database.getPersistence()); - FlightService service = context.newService(FlightService.class); + FlightService service = context.getService(FlightService.class); Campaign campaign = database.createCampaign("PACOMM", "FRANCE"); 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvServiceTest.java 2012-08-20 12:44:55 UTC (rev 442) @@ -61,7 +61,7 @@ SammoaContext context = new SammoaContext(config, database.getPersistence()); - ImportCsvService instance = context.newService(ImportCsvService.class); + ImportCsvService instance = context.getService(ImportCsvService.class); Campaign campaign = database.createCampaign("PACOMM-2012", "FRANCE"); 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/output/map/ExportMapServiceTest.java 2012-08-20 12:44:55 UTC (rev 442) @@ -99,7 +99,7 @@ campaign.setBeginDate(DateUtil.createDate(1, 1, 2012)); campaign.setEndDate(DateUtil.createDate(31, 12, 2012)); - FlightService flightService = context.newService(FlightService.class); + FlightService flightService = context.getService(FlightService.class); Flight flight = flightService.createFlight(campaign); flight.setBeginDate(DateUtil.createDate(18, 0, 12, 18, 7, 2012)); @@ -109,7 +109,7 @@ transaction.commitTransaction(); - ExportMapService exportMapService = context.newService(ExportMapService.class); + ExportMapService exportMapService = context.getService(ExportMapService.class); File exportDirectory = database.getTestBasedir(); 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/AutoSaveListener.java 2012-08-20 12:44:55 UTC (rev 442) @@ -56,11 +56,11 @@ protected long commitDelay; protected final Set<TopiaEntity> changedEntities; - + protected final Set<TopiaEntity> createdEntities; - + protected Timer timer; - + protected boolean stop; protected TimerTask currentTask; @@ -98,12 +98,12 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - + if (!stop && evt.getSource() instanceof TopiaEntity) { - + TopiaEntity entity = (TopiaEntity) evt.getSource(); changedEntities.add(entity); - + logger.trace("Record entity '{}' for autoCommit [propertyChange={}]", entity, evt.getPropertyName()); } @@ -112,7 +112,7 @@ public void addCreatedEntity(TopiaEntity entity) { createdEntities.add(entity); } - + public synchronized void start() { stop = false; if (currentTask != null) { @@ -121,7 +121,7 @@ currentTask = new AutoCommit(); timer.schedule(currentTask, commitDelay); } - + public synchronized void commit() { if (currentTask != null) { currentTask.cancel(); @@ -139,7 +139,7 @@ @Override public void run() { - + if (isCommitNeeded()) { TopiaContext transaction = persistence.openContext(); @@ -148,7 +148,7 @@ saveEntities(transaction, createdEntities, CREATE_ACTION); saveEntities(transaction, changedEntities, UPDATE_ACTION); - + } finally { persistence.closeContext(transaction); } @@ -160,7 +160,7 @@ } } } - + protected boolean isCommitNeeded() { return !changedEntities.isEmpty() || !createdEntities.isEmpty(); } @@ -170,10 +170,10 @@ * manipulated as a synchronized collection. A copy is made before save. * 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 entities synchronized Set of entities to save - * @param action SaveAction to use + * @param entities synchronized Set of entities to save + * @param action SaveAction to use */ protected void saveEntities(TopiaContext transaction, Set<TopiaEntity> entities, @@ -212,12 +212,12 @@ } } } - + 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() { @Override 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java 2012-08-20 12:44:55 UTC (rev 442) @@ -72,7 +72,7 @@ @Override public int getTransectFlightIndex(TransectFlight transectFlight) { int result = Iterables.indexOf(getTransectFlight(), - Predicates.equalTo(transectFlight)); + Predicates.equalTo(transectFlight)); return result; } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Flights.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Flights.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Flights.java 2012-08-20 12:44:55 UTC (rev 442) @@ -44,7 +44,7 @@ public static Comparator<Flight> onDate() { return ON_DATE_COMPARATOR; } - + public static Function<Flight, String> toSystemId() { return TO_SYSTEM_ID_FUNCTION; } @@ -52,31 +52,31 @@ public static Function<Flight, String> toFlightNumber() { return TO_FLIGHT_NUMBER_FUNCTION; } - + public static Predicate<Flight> withSystemId(String systemId) { return new FlightWithSystemIdPredicate(systemId); } - + protected static Function<Flight, String> TO_SYSTEM_ID_FUNCTION = new Function<Flight, String>() { - @Override - public String apply(Flight input) { - return input.getSystemId(); - } - }; + @Override + public String apply(Flight input) { + return input.getSystemId(); + } + }; protected static Function<Flight, String> TO_FLIGHT_NUMBER_FUNCTION = new Function<Flight, String>() { - @Override - public String apply(Flight input) { - return input != null ? String.valueOf(input.getFlightNumber()) : "undefined"; - } - }; - + @Override + public String apply(Flight input) { + return input != null ? String.valueOf(input.getFlightNumber()) : "undefined"; + } + }; + protected static class FlightWithSystemIdPredicate implements Predicate<Flight> { - + protected String systemId; public FlightWithSystemIdPredicate(String systemId) { @@ -96,18 +96,18 @@ public int compare(Flight flight1, Flight flight2) { int result = ComparisonChain .start() - // on beginDate, first null + // on beginDate, first null .compare( flight1.getBeginDate(), flight2.getBeginDate(), Ordering.natural().reverse().nullsFirst() ) - // on endDate null + // on endDate null .compareTrueFirst( flight1.getEndDate() == null, flight2.getEndDate() == null ) - // on flightNumber + // on flightNumber .compare( flight1.getFlightNumber(), flight2.getFlightNumber(), 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java 2012-08-20 12:44:55 UTC (rev 442) @@ -70,7 +70,7 @@ public static boolean isCoordinatesEmpty(GeoPoint geoPoint) { return geoPoint.getLatitude() == GeoPoints.EMPTY_COORDINATE - && geoPoint.getLongitude() == GeoPoints.EMPTY_COORDINATE; + && geoPoint.getLongitude() == GeoPoints.EMPTY_COORDINATE; } public static Predicate<GeoPoint> withCoordinatesEmpty() { @@ -82,7 +82,6 @@ } /** - * * @param geoPoints * @param dates * @return 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java 2012-08-20 12:44:55 UTC (rev 442) @@ -101,6 +101,7 @@ return input.getObserverPosition(); } }; + public static List<Observation> retainsObservations(List<Observation> observations, PeriodDates periodDate) { Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObserverPositions.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObserverPositions.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObserverPositions.java 2012-08-20 12:44:55 UTC (rev 442) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -38,7 +38,7 @@ private ObserverPositions() { // static class do not have instanciation } - + public static Predicate<ObserverPosition> withOneOfObservers(Collection<Observer> observers) { return new ObserverPositionWithObserverPredicate(observers); } @@ -46,11 +46,11 @@ public static Predicate<ObserverPosition> withObserver(Observer observer) { return new ObserverPositionWithObserverPredicate(Lists.newArrayList(observer)); } - + public static Predicate<ObserverPosition> withPosition(Position position) { return new ObserverPositionWithPositionPredicate(position); } - + protected static class ObserverPositionWithObserverPredicate implements Predicate<ObserverPosition> { Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observers.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observers.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observers.java 2012-08-20 12:44:55 UTC (rev 442) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -42,11 +42,11 @@ public static Predicate<Observer> isNotPilot() { return Predicates.not(isPilot()); } - + public static Predicate<Observer> isPilot() { return IS_PILOT_PREDICATE; } - + public static Comparator<Observer> onInitials() { return ON_INITIALS_COMPARATOR; } @@ -54,18 +54,18 @@ protected static Predicate<Observer> IS_PILOT_PREDICATE = new Predicate<Observer>() { - @Override - public boolean apply(Observer input) { - return input.isPilot(); - } - }; + @Override + public boolean apply(Observer input) { + return input.isPilot(); + } + }; protected static Comparator<Observer> ON_INITIALS_COMPARATOR = new Comparator<Observer>() { - @Override - public int compare(Observer o1, Observer o2) { - return o1.getInitials().compareTo(o2.getInitials()); - } - }; + @Override + public int compare(Observer o1, Observer o2) { + return o1.getInitials().compareTo(o2.getInitials()); + } + }; } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteImpl.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteImpl.java 2012-08-20 12:44:55 UTC (rev 442) @@ -44,7 +44,7 @@ @Override public ObserverPosition getObserverPositionByPosition(Position position) { ObserverPosition result = - Iterables.find(getObserverPosition(), ObserverPositions.withPosition(position), null); + Iterables.find(getObserverPosition(), ObserverPositions.withPosition(position), null); return result; } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SectorImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SectorImpl.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SectorImpl.java 2012-08-20 12:44:55 UTC (rev 442) @@ -38,5 +38,5 @@ this.sectorNumber = sectorNumber; this.campaign = campaign; } - + } //SectorImpl Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Sectors.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Sectors.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Sectors.java 2012-08-20 12:44:55 UTC (rev 442) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -34,19 +34,19 @@ private Sectors() { // static class do not have instanciation - } - + } + public static Function<Sector, Integer> toSectorNumber() { return TO_SECTOR_NUMBER_FUNCTION; } - + protected static Function<Sector, Integer> TO_SECTOR_NUMBER_FUNCTION = new Function<Sector, Integer>() { - @Override - public Integer apply(Sector input) { - return input.getSectorNumber(); - } - }; + @Override + public Integer apply(Sector input) { + return input.getSectorNumber(); + } + }; } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateType.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateType.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateType.java 2012-08-20 12:44:55 UTC (rev 442) @@ -26,15 +26,15 @@ public enum StrateType { - + COAST('C'), - + NERITIC('N'), - + SLOPE('P'), - + OCEANIC('O'); - + private char code; private StrateType(char code) { @@ -54,7 +54,7 @@ throw new EnumConstantNotPresentException(StrateType.class, "code=" + code); } - + public static StrateType valueOf(int ordinal) { for (StrateType value : values()) { if (ordinal == value.ordinal()) { @@ -64,5 +64,5 @@ throw new EnumConstantNotPresentException(StrateType.class, "ordinal=" + ordinal); } - + } //StrateType Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Strates.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Strates.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Strates.java 2012-08-20 12:44:55 UTC (rev 442) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -44,26 +44,26 @@ public static String getCode(Strate strate) { Preconditions.checkArgument(strate != null, "Can't retrieve code from null strate"); - + String result; if (strate.getCode() == null) { - + StrateType strateType = strate.getStrateType(); Preconditions.checkArgument(strateType != null, "Can't retrieve code if strateType is null"); - + Sector sector = strate.getSector(); Preconditions.checkArgument(sector != null, "Can't retrieve code if sector is null"); - + result = "" + strateType.getCode() + sector.getSectorNumber(); } else { - + result = strate.getCode(); } return result; - } - + } + public static Function<Strate, String> toCode() { return TO_CODE_FUNCTION; } @@ -75,27 +75,27 @@ public static Comparator<Strate> onCode() { return ON_CODE_COMPARATOR; } - + protected static Function<Strate, String> TO_CODE_FUNCTION = new Function<Strate, String>() { - @Override - public String apply(Strate input) { - return input.getCode(); - } - }; + @Override + public String apply(Strate input) { + return input.getCode(); + } + }; protected static Comparator<Strate> ON_CODE_COMPARATOR = new Comparator<Strate>() { - @Override - public int compare(Strate o1, Strate o2) { - int result = Ordering.natural() - .nullsFirst() - .compare(o1.getCode(), o2.getCode()); - return result; - } - }; + @Override + public int compare(Strate o1, Strate o2) { + int result = Ordering.natural() + .nullsFirst() + .compare(o1.getCode(), o2.getCode()); + return result; + } + }; protected static class StrateWithCodePredicate implements Predicate<Strate> { Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Transects.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Transects.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Transects.java 2012-08-20 12:44:55 UTC (rev 442) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -38,11 +38,11 @@ private Transects() { // static class do not have instanciation } - + public static Function<Transect, String> toName() { return TO_NAME_FUNCTION; } - + public static Comparator<Transect> onName() { return ON_NAME_COMPARATOR; } @@ -50,24 +50,24 @@ public static Predicate<Transect> withStrate(Strate strate) { return new TransectWithStratePredicate(strate); } - + protected static Function<Transect, String> TO_NAME_FUNCTION = new Function<Transect, String>() { - @Override - public String apply(Transect input) { - return input.getName(); - } - }; + @Override + public String apply(Transect input) { + return input.getName(); + } + }; protected static Comparator<Transect> ON_NAME_COMPARATOR = new Comparator<Transect>() { - @Override - public int compare(Transect o1, Transect o2) { - return o1.getName().compareTo(o2.getName()); - } - }; + @Override + public int compare(Transect o1, Transect o2) { + return o1.getName().compareTo(o2.getName()); + } + }; protected static class TransectWithStratePredicate implements Predicate<Transect> { 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/DataAutoSaveListenerTest.java 2012-08-20 12:44:55 UTC (rev 442) @@ -38,23 +38,23 @@ * @author fdesbois <desbois@codelutin.com> */ public class DataAutoSaveListenerTest { - + @Rule public SammoaDatabase database = new SammoaDatabase("/sammoa-test.properties", 300); - + @Test public void testAutoUpdate() throws Exception { AutoSaveListener instance = database.getPersistence().autoSaveListener; Observation observation = createObservation(1, new Date()); - + Assert.assertTrue(instance.changedEntities.isEmpty()); - + observation.setCalves("4"); - + Assert.assertFalse(instance.changedEntities.isEmpty()); - + Thread.sleep(500); observation = getObservation(observation.getTopiaId()); @@ -94,5 +94,5 @@ 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java 2012-08-20 12:44:55 UTC (rev 442) @@ -67,7 +67,7 @@ public TopiaContext beginTransaction() throws TopiaException { return persistence.beginTransaction(); } - + public void endTransaction(TopiaContext transaction) { persistence.endTransaction(transaction); } Modified: trunk/sammoa-persistence/src/test/java/org/nuiton/topia/tck/TopiaDatabase.java =================================================================== --- trunk/sammoa-persistence/src/test/java/org/nuiton/topia/tck/TopiaDatabase.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-persistence/src/test/java/org/nuiton/topia/tck/TopiaDatabase.java 2012-08-20 12:44:55 UTC (rev 442) @@ -60,7 +60,7 @@ * <p/> * You don't need to close any transaction, it will be done for you and the end * of each method test. - * + * <p/> * Note : this is a copy from TopiaDatabase from Topia3. There is some minor * modifications to simplify extension. * @@ -107,7 +107,7 @@ @Override protected void starting(Description description) { - this.description=description; + this.description = description; // get test directory testBasedir = getTestSpecificDirectory( @@ -140,9 +140,9 @@ onDbConfigurationCreate(dbConfiguration, testBasedir, dbPath); rootCtxt = TopiaContextFactory.getContext(dbConfiguration); - + onRootCtxtCreate(rootCtxt); - + } catch (Exception e) { throw new IllegalStateException( "Could not start db at " + testBasedir, e); @@ -199,7 +199,7 @@ result.setProperty( TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, getImplementationClassesAsString()); - + return result; } @@ -208,7 +208,7 @@ String dbPath) { // nothing done by default } - + protected void onRootCtxtCreate(TopiaContext rootCtxt) { // nothing done by default } Deleted: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaDecoratorProvider.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaDecoratorProvider.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaDecoratorProvider.java 2012-08-20 12:44:55 UTC (rev 442) @@ -1,99 +0,0 @@ -/* - * #%L - * SAMMOA :: UI Swing - * - * $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.ui.swing; - -import com.google.common.base.Preconditions; -import fr.ulr.sammoa.application.DecoratorService; -import fr.ulr.sammoa.application.SammoaContext; -import fr.ulr.sammoa.persistence.Strate; -import fr.ulr.sammoa.ui.swing.flight.StrateModel; -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 javax.swing.ListCellRenderer; -import javax.swing.table.TableCellRenderer; - -import static org.nuiton.i18n.I18n._; - -/** - * Created: 29/05/12 - * - * @author fdesbois <desbois@codelutin.com> - * @author tchemit <chemit@codelutin.com> - */ -public class SammoaDecoratorProvider extends DecoratorService { - - @Override - public void setSammoaContext(SammoaContext context) { - super.setSammoaContext(context); - - // add extra ui decorators - decoratorProvider.registerJXPathDecorator(TransectModel.class, "${source/name}$s"); - decoratorProvider.registerDecorator(new Decorator<StrateModel>(StrateModel.class) { - - private static final long serialVersionUID = 1L; - - @Override - public String toString(Object bean) { - StrateModel model = (StrateModel) bean; - Strate strate = model.getSource(); - - String result; - if (strate == null) { - result = _("sammoa.strate.decorator.all"); - - } else { - result = _("sammoa.strate.decorator.strate", strate.getCode()); - } - - return result; - } - }); - } - - public <O> ListCellRenderer newListCellRender(Class<O> type) { - - Preconditions.checkNotNull(type); - - Decorator<O> decorator = getDecoratorByType(type); - Preconditions.checkNotNull(decorator); - - DecoratorListCellRenderer result = new DecoratorListCellRenderer(decorator); - return result; - } - - public <O> TableCellRenderer newTableCellRender(Class<O> type) { - - Preconditions.checkNotNull(type); - - Decorator<O> decorator = getDecoratorByType(type); - Preconditions.checkNotNull(decorator); - - DecoratorTableCellRenderer result = new DecoratorTableCellRenderer(decorator); - return result; - } -} Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaUIContext.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaUIContext.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaUIContext.java 2012-08-20 12:44:55 UTC (rev 442) @@ -54,8 +54,6 @@ protected SwingSession swingSession; - protected SammoaDecoratorProvider decoratorProvider; - protected String campaignId; protected String flightId; @@ -80,8 +78,8 @@ return context; } - public <S extends SammoaService> S newService(Class<S> serviceType) { - return context.newService(serviceType); + public <S extends SammoaService> S getService(Class<S> serviceType) { + return context.getService(serviceType); } public SammoaConfig getConfig() { @@ -112,13 +110,6 @@ this.swingSession = swingSession; } - public SammoaDecoratorProvider getDecoratorProvider() { - if (decoratorProvider == null) { - decoratorProvider = newService(SammoaDecoratorProvider.class); - } - return decoratorProvider; - } - public void setCampaignId(String campaignId) { this.campaignId = campaignId; } Copied: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java (from rev 441, trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaDecoratorProvider.java) =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java (rev 0) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java 2012-08-20 12:44:55 UTC (rev 442) @@ -0,0 +1,99 @@ +/* + * #%L + * SAMMOA :: UI Swing + * + * $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.ui.swing; + +import com.google.common.base.Preconditions; +import fr.ulr.sammoa.application.DecoratorService; +import fr.ulr.sammoa.application.SammoaContext; +import fr.ulr.sammoa.persistence.Strate; +import fr.ulr.sammoa.ui.swing.flight.StrateModel; +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 javax.swing.ListCellRenderer; +import javax.swing.table.TableCellRenderer; + +import static org.nuiton.i18n.I18n._; + +/** + * Created: 29/05/12 + * + * @author fdesbois <desbois@codelutin.com> + * @author tchemit <chemit@codelutin.com> + */ +public class UIDecoratorService extends DecoratorService { + + @Override + public void setSammoaContext(SammoaContext context) { + super.setSammoaContext(context); + + // add extra ui decorators + decoratorProvider.registerJXPathDecorator(TransectModel.class, "${source/name}$s"); + decoratorProvider.registerDecorator(new Decorator<StrateModel>(StrateModel.class) { + + private static final long serialVersionUID = 1L; + + @Override + public String toString(Object bean) { + StrateModel model = (StrateModel) bean; + Strate strate = model.getSource(); + + String result; + if (strate == null) { + result = _("sammoa.strate.decorator.all"); + + } else { + result = _("sammoa.strate.decorator.strate", strate.getCode()); + } + + return result; + } + }); + } + + public <O> ListCellRenderer newListCellRender(Class<O> type) { + + Preconditions.checkNotNull(type); + + Decorator<O> decorator = getDecoratorByType(type); + Preconditions.checkNotNull(decorator); + + DecoratorListCellRenderer result = new DecoratorListCellRenderer(decorator); + return result; + } + + public <O> TableCellRenderer newTableCellRender(Class<O> type) { + + Preconditions.checkNotNull(type); + + Decorator<O> decorator = getDecoratorByType(type); + Preconditions.checkNotNull(decorator); + + DecoratorTableCellRenderer result = new DecoratorTableCellRenderer(decorator); + return result; + } +} Property changes on: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/UIDecoratorService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUIHandler.java 2012-08-20 12:44:55 UTC (rev 442) @@ -38,6 +38,7 @@ import fr.ulr.sammoa.ui.swing.SammoaScreen; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import fr.ulr.sammoa.ui.swing.SammoaUIHandler; +import fr.ulr.sammoa.ui.swing.UIDecoratorService; import fr.ulr.sammoa.ui.swing.io.input.CsvImporter; import fr.ulr.sammoa.ui.swing.io.input.UIImporter; import fr.ulr.sammoa.ui.swing.region.RegionUI; @@ -89,10 +90,10 @@ this.ui = ui; this.uiImporter = new UIImporter(this.ui); - this.importMapService = context.newService(ImportMapService.class); - this.importCsvService = context.newService(ImportCsvService.class); - this.flightService = context.newService(FlightService.class); - this.referentialService = context.newService(ReferentialService.class); + this.importMapService = context.getService(ImportMapService.class); + this.importCsvService = context.getService(ImportCsvService.class); + this.flightService = context.getService(FlightService.class); + this.referentialService = context.getService(ReferentialService.class); } protected CampaignUIModel getModel() { @@ -129,7 +130,7 @@ regionUi.addComponentListener(regionUIListener); ui.getRegionComboBox().setRenderer( - context.getDecoratorProvider().newListCellRender(Region.class)); + context.getService(UIDecoratorService.class).newListCellRender(Region.class)); SwingValidatorUtil.installUI(ui.getErrorTable(), new SwingValidatorMessageTableRenderer()); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightBarHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightBarHandler.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightBarHandler.java 2012-08-20 12:44:55 UTC (rev 442) @@ -40,7 +40,8 @@ /** @author sletellier <letellier@codelutin.com> */ public class FlightBarHandler implements PropertyChangeListener { - private static final Logger logger = LoggerFactory.getLogger(FlightBarHandler.class); + private static final Logger logger = + LoggerFactory.getLogger(FlightBarHandler.class); protected FlightBar view; 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-08-20 12:44:55 UTC (rev 442) @@ -76,9 +76,9 @@ import fr.ulr.sammoa.persistence.TransectFlight; import fr.ulr.sammoa.persistence.TransectFlights; import fr.ulr.sammoa.ui.swing.SammoaColors; -import fr.ulr.sammoa.ui.swing.SammoaDecoratorProvider; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import fr.ulr.sammoa.ui.swing.SammoaUIHandler; +import fr.ulr.sammoa.ui.swing.UIDecoratorService; import fr.ulr.sammoa.ui.swing.action.AddAction; import fr.ulr.sammoa.ui.swing.action.BeginAction; import fr.ulr.sammoa.ui.swing.action.CenterObservationAction; @@ -162,7 +162,7 @@ protected final ReferentialService referentialService; - protected final SammoaDecoratorProvider decoratorProvider; + protected final UIDecoratorService decoratorService; public FlightUIHandler(SammoaUIContext context, FlightUI ui) { this.context = context; @@ -170,9 +170,9 @@ this.ui = ui; ui.setContextValue(context); - this.flightService = context.newService(FlightService.class); - this.referentialService = context.newService(ReferentialService.class); - this.decoratorProvider = context.getDecoratorProvider(); + this.flightService = context.getService(FlightService.class); + this.referentialService = context.getService(ReferentialService.class); + this.decoratorService = context.getService(UIDecoratorService.class); } public FlightController getFlightController() { @@ -225,9 +225,9 @@ startTime = timeLog.log(startTime, "beforeInitUI", "entities are loaded"); - context.newService(FlightControllerDefault.class); + context.getService(FlightControllerDefault.class); - flightController = context.newService(FlightControllerDefault.class); + flightController = context.getService(FlightControllerDefault.class); try { flightController.openGpsDevice(context.getConfig().getGpsConfig()); @@ -358,7 +358,7 @@ timeLog.log(uiStartTime, "initUI"); ListCellRenderer observerListCellRenderer = - decoratorProvider.newListCellRender(Observer.class); + decoratorService.newListCellRender(Observer.class); { // init transect table @@ -378,7 +378,7 @@ observerListCellRenderer)); transectTable.setDefaultRenderer(Observer.class, - decoratorProvider.newTableCellRender(Observer.class)); + decoratorService.newTableCellRender(Observer.class)); // Set specific renderer for NbTimes column TableCellRenderer defaultRenderer = transectTable.getDefaultRenderer(String.class); @@ -419,12 +419,12 @@ } ui.getStrateCombobox().setRenderer( - decoratorProvider.newListCellRender(Strate.class)); + decoratorService.newListCellRender(Strate.class)); ui.getObserverSelector().setRenderer( new ObserverListCellRenderer(observerListCellRenderer) ); ui.getTransectList().setCellRenderer( - new TransectListCellRenderer(decoratorProvider.newListCellRender((Transect.class)))); + new TransectListCellRenderer(decoratorService.newListCellRender((Transect.class)))); long startTime = TimeLog.getTime(); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectBooleanTableCell.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectBooleanTableCell.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/TransectBooleanTableCell.java 2012-08-20 12:44:55 UTC (rev 442) @@ -36,11 +36,11 @@ import java.util.List; /** -* TODO -* -* @author tchemit <chemit@codelutin.com> -* @since TODO -*/ + * TODO + * + * @author tchemit <chemit@codelutin.com> + * @since TODO + */ public class TransectBooleanTableCell extends AbstractCellEditor implements TableCellRenderer, TableCellEditor { 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java 2012-08-20 12:44:55 UTC (rev 442) @@ -34,10 +34,10 @@ import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.Flights; import fr.ulr.sammoa.persistence.HasTopiaIdPredicate; -import fr.ulr.sammoa.ui.swing.SammoaDecoratorProvider; import fr.ulr.sammoa.ui.swing.SammoaScreen; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import fr.ulr.sammoa.ui.swing.SammoaUIHandler; +import fr.ulr.sammoa.ui.swing.UIDecoratorService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,8 +72,8 @@ public HomeUIHandler(SammoaUIContext context, HomeUI ui) { this.context = context; this.ui = ui; - this.flightService = context.newService(FlightService.class); - this.referentialService = context.newService(ReferentialService.class); + this.flightService = context.getService(FlightService.class); + this.referentialService = context.getService(ReferentialService.class); } protected HomeUIModel getModel() { @@ -91,13 +91,13 @@ @Override public void afterInitUI() { - SammoaDecoratorProvider decoratorProvider = - context.getDecoratorProvider(); + UIDecoratorService decoratorService = + context.getService(UIDecoratorService.class); ui.getCampaignCombobox().setRenderer( - decoratorProvider.newListCellRender(Campaign.class)); + decoratorService.newListCellRender(Campaign.class)); ui.getFlightCombobox().setRenderer( - decoratorProvider.newListCellRender(Flight.class)); + decoratorService.newListCellRender(Flight.class)); List<Campaign> campaigns = referentialService.getCampaigns(); ui.getCampaignListModel().setElements(campaigns); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/sammoa/ImportApplicationUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/sammoa/ImportApplicationUIHandler.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/sammoa/ImportApplicationUIHandler.java 2012-08-20 12:44:55 UTC (rev 442) @@ -29,10 +29,10 @@ import fr.ulr.sammoa.application.io.input.sammoa.ImportApplicationModel; import fr.ulr.sammoa.application.io.input.sammoa.ImportApplicationService; import fr.ulr.sammoa.persistence.Campaign; -import fr.ulr.sammoa.ui.swing.SammoaDecoratorProvider; import fr.ulr.sammoa.ui.swing.SammoaScreen; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import fr.ulr.sammoa.ui.swing.SammoaUIHandler; +import fr.ulr.sammoa.ui.swing.UIDecoratorService; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,16 +63,16 @@ protected final FlightService flightService; - protected final SammoaDecoratorProvider decoratorProvider; + protected final UIDecoratorService decoratorService; public ImportApplicationUIHandler(SammoaUIContext context, ImportApplicationUI ui) { this.context = context; this.ui = ui; - this.importService = context.newService(ImportApplicationService.class); - this.flightService = context.newService(FlightService.class); - this.referentialService = context.newService(ReferentialService.class); - this.decoratorProvider = context.getDecoratorProvider(); + this.importService = context.getService(ImportApplicationService.class); + this.flightService = context.getService(FlightService.class); + this.referentialService = context.getService(ReferentialService.class); + this.decoratorService = context.getService(UIDecoratorService.class); } @Override 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2012-08-20 12:44:55 UTC (rev 442) @@ -35,10 +35,10 @@ import fr.ulr.sammoa.persistence.Strate; import fr.ulr.sammoa.persistence.StringRef; import fr.ulr.sammoa.persistence.StringRefs; -import fr.ulr.sammoa.ui.swing.SammoaDecoratorProvider; import fr.ulr.sammoa.ui.swing.SammoaScreen; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import fr.ulr.sammoa.ui.swing.SammoaUIHandler; +import fr.ulr.sammoa.ui.swing.UIDecoratorService; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ErrorDialogUI; @@ -86,15 +86,15 @@ protected final ReferentialService referentialService; - protected final SammoaDecoratorProvider decoratorProvider; + protected final UIDecoratorService decoratorService; public ExportMapUIHandler(SammoaUIContext context, ExportMapUI ui) { this.context = context; this.ui = ui; - this.referentialService = context.newService(ReferentialService.class); - this.exportService = context.newService(ExportMapService.class); - this.decoratorProvider = context.getDecoratorProvider(); + this.referentialService = context.getService(ReferentialService.class); + this.exportService = context.getService(ExportMapService.class); + this.decoratorService = context.getService(UIDecoratorService.class); } @Override @@ -149,7 +149,7 @@ public void afterInitUI() { ui.getCampaignCombobox().setRenderer( - decoratorProvider.newListCellRender(Campaign.class)); + decoratorService.newListCellRender(Campaign.class)); ExportMapUIModel model = getModel(); @@ -205,7 +205,7 @@ // reset strates,... if (logger.isInfoEnabled()) { Decorator<Campaign> decorator = - decoratorProvider.getDecoratorByType(Campaign.class); + decoratorService.getDecoratorByType(Campaign.class); logger.info("New selected campain: {}", decorator.toString(newCampaign)); } @@ -503,7 +503,7 @@ OneClicListSelectionModel.installModel(jList); // init list - Decorator<E> decorator = decoratorProvider.getDecoratorByType(beanType); + Decorator<E> decorator = decoratorService.getDecoratorByType(beanType); Preconditions.checkNotNull(decorator, "No decorator found for type " + beanType); if (logger.isDebugEnabled()) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIHandler.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIHandler.java 2012-08-20 12:44:55 UTC (rev 442) @@ -29,10 +29,10 @@ import fr.ulr.sammoa.application.io.output.sammoa.ExportApplicationService; import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; -import fr.ulr.sammoa.ui.swing.SammoaDecoratorProvider; import fr.ulr.sammoa.ui.swing.SammoaScreen; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import fr.ulr.sammoa.ui.swing.SammoaUIHandler; +import fr.ulr.sammoa.ui.swing.UIDecoratorService; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.ErrorDialogUI; @@ -73,16 +73,16 @@ protected final FlightService flightService; - protected final SammoaDecoratorProvider decoratorProvider; + protected final UIDecoratorService decoratorService; public ExportApplicationUIHandler(SammoaUIContext context, ExportApplicationUI ui) { this.context = context; this.ui = ui; - this.flightService = context.newService(FlightService.class); - this.referentialService = context.newService(ReferentialService.class); - this.exportService = context.newService(ExportApplicationService.class); - this.decoratorProvider = context.getDecoratorProvider(); + this.flightService = context.getService(FlightService.class); + this.referentialService = context.getService(ReferentialService.class); + this.exportService = context.getService(ExportApplicationService.class); + this.decoratorService = context.getService(UIDecoratorService.class); } @Override @@ -148,9 +148,9 @@ ui.getCampaignCombobox().setRenderer(new DecoratorListCellRenderer( - decoratorProvider.getDecoratorByType(Campaign.class))); + decoratorService.getDecoratorByType(Campaign.class))); ui.getFlightCombobox().setRenderer(new DecoratorListCellRenderer( - decoratorProvider.getDecoratorByType(Flight.class))); + decoratorService.getDecoratorByType(Flight.class))); ExportApplicationUIModel model = getModel(); @@ -326,7 +326,7 @@ // reset flights,... if (logger.isInfoEnabled()) { Decorator<Campaign> decorator = - decoratorProvider.getDecoratorByType(Campaign.class); + decoratorService.getDecoratorByType(Campaign.class); logger.info("New selected campain: {}", decorator.toString(newCampaign)); } @@ -370,7 +370,7 @@ // reset flights,... if (logger.isInfoEnabled()) { Decorator<Flight> decorator = - decoratorProvider.getDecoratorByType(Flight.class); + decoratorService.getDecoratorByType(Flight.class); logger.info("New selected flight: {}", decorator.toString(newCampaign)); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java 2012-08-20 12:44:55 UTC (rev 442) @@ -37,8 +37,8 @@ import fr.ulr.sammoa.persistence.Route; import fr.ulr.sammoa.persistence.Routes; import fr.ulr.sammoa.ui.swing.SammoaColors; -import fr.ulr.sammoa.ui.swing.SammoaDecoratorProvider; import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import fr.ulr.sammoa.ui.swing.UIDecoratorService; import fr.ulr.sammoa.ui.swing.action.CircleBackAction; import fr.ulr.sammoa.ui.swing.flight.FlightUIHandler; import fr.ulr.sammoa.ui.swing.flight.FlightUIModel; @@ -123,7 +123,7 @@ public EffortPanelHandler(EffortPanel ui) { this.ui = ui; SammoaUIContext context = ui.getContextValue(SammoaUIContext.class); - flightService = context.newService(FlightService.class); + flightService = context.getService(FlightService.class); } public FlightUIModel getFlightUIModel() { @@ -133,11 +133,11 @@ public void init() { SammoaUIContext context = ui.getContextValue(SammoaUIContext.class); - final SammoaDecoratorProvider decoratorProvider = - context.getDecoratorProvider(); + final UIDecoratorService decoratorService = + context.getService(UIDecoratorService.class); ListCellRenderer observeCellRenderer = - decoratorProvider.newListCellRender(Observer.class); + decoratorService.newListCellRender(Observer.class); ui.getNavComboBox().setRenderer(observeCellRenderer); ui.getLeftComboBox().setRenderer(observeCellRenderer); @@ -156,7 +156,7 @@ @Override protected String decorateBean(Object bean) { - return decoratorProvider.getDecorator(bean).toString(bean); + return decoratorService.getDecorator(bean).toString(bean); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/SpeciesCodeValidator.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/SpeciesCodeValidator.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/SpeciesCodeValidator.java 2012-08-20 12:44:55 UTC (rev 442) @@ -46,7 +46,7 @@ protected Collection<?> getCollection(Object object) throws ValidationException { if (species == null) { SammoaContext appContext = SammoaUIContext.getUIContext().getAppContext(); - species = appContext.newService(ReferentialService.class).getAllValidSpecies(); + species = appContext.getService(ReferentialService.class).getAllValidSpecies(); } return species; } 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUIHandler.java 2012-08-20 12:44:55 UTC (rev 442) @@ -66,8 +66,8 @@ RegionUI ui) { this.ui = ui; this.uiImporter = new UIImporter(ui); - this.importCsvService = context.newService(ImportCsvService.class); - this.referentialService = context.newService(ReferentialService.class); + this.importCsvService = context.getService(ImportCsvService.class); + this.referentialService = context.getService(ReferentialService.class); } public RegionUIModel getModel() { 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 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java 2012-08-20 12:44:55 UTC (rev 442) @@ -30,6 +30,7 @@ import fr.ulr.sammoa.persistence.Transect; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import fr.ulr.sammoa.ui.swing.SammoaUIHandler; +import fr.ulr.sammoa.ui.swing.UIDecoratorService; import fr.ulr.sammoa.ui.swing.flight.StrateModel; import fr.ulr.sammoa.ui.swing.flight.TransectModel; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; @@ -66,7 +67,7 @@ TransectUI ui) { this.context = context; this.ui = ui; - this.referentialService = context.newService(ReferentialService.class); + this.referentialService = context.getService(ReferentialService.class); } protected TransectUIModel getModel() { @@ -83,8 +84,11 @@ @Override public void afterInitUI() { + UIDecoratorService decoratorService = + context.getService(UIDecoratorService.class); + ui.getTransectStrateComboBox().setRenderer( - context.getDecoratorProvider().newListCellRender(Strate.class)); + decoratorService.newListCellRender(Strate.class)); SwingValidatorUtil.installUI(ui.getErrorTable(), new SwingValidatorMessageTableRenderer()); } @@ -103,11 +107,15 @@ JFrame parent = ui.getParentContainer(JFrame.class); - SammoaUtil.openInDialog(ui, parent, _("sammoa.dialog.title.transect"), ui.getCloseAction()); + SammoaUtil.openInDialog(ui, parent, + _("sammoa.dialog.title.transect"), + ui.getCloseAction()); StrateModel defaultStrate = getModel().getStrate(); - SwingUtil.fillComboBox(ui.getTransectStrateComboBox(), getModel().getStrateReferential(), defaultStrate); + SwingUtil.fillComboBox(ui.getTransectStrateComboBox(), + getModel().getStrateReferential(), + defaultStrate); if (defaultStrate != null) { selectStrate(defaultStrate); @@ -124,13 +132,14 @@ } if (logger.isInfoEnabled()) { - logger.info(String.format("Select the strate %1$s", strate.getSource().getCode())); + logger.info("Select the strate {}", strate.getSource().getCode()); } getModel().setStrate(strate); // Set the transect referential for validation - List<Transect> transects = Lists.transform(strate.getTransects(), TransectModel.toTransect()); + List<Transect> transects = Lists.transform(strate.getTransects(), + TransectModel.toTransect()); getModel().setTransectReferential(transects); // Prepare the iteration for the new element @@ -147,7 +156,7 @@ String name = strateCode + "/" + newNumber; if (logger.isInfoEnabled()) { - logger.info(String.format("Use name %1$s for the new transect", name)); + logger.info("Use name {} for the new transect", name); } getModel().setName(name); Modified: trunk/sammoa-ui-swing/src/test/java/fr/ulr/sammoa/ui/swing/BeanValidatorDetectorTest.java =================================================================== --- trunk/sammoa-ui-swing/src/test/java/fr/ulr/sammoa/ui/swing/BeanValidatorDetectorTest.java 2012-08-20 12:12:05 UTC (rev 441) +++ trunk/sammoa-ui-swing/src/test/java/fr/ulr/sammoa/ui/swing/BeanValidatorDetectorTest.java 2012-08-20 12:44:55 UTC (rev 442) @@ -38,7 +38,10 @@ import java.io.File; import java.util.SortedSet; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @author chemit <chemit@codelutin.com> @@ -50,9 +53,7 @@ super(XWork2NuitonValidatorProvider.PROVIDER_NAME); } - /** - * La liste des classes avec validation. - */ + /** La liste des classes avec validation. */ protected static final Class<?>[] VALIDATOR_CLASSES = { Observation.class, Route.class, @@ -60,6 +61,7 @@ RegionUIModel.class, TransectUIModel.class }; + @Override protected File getRootDirectory(File basedir) { return new File(basedir,