Author: tchemit Date: 2012-08-19 16:44:55 +0200 (Sun, 19 Aug 2012) New Revision: 437 Url: http://forge.codelutin.com/repositories/revision/sammoa/437 Log: SammoaContext is not the good place to keep service (is there any place for this ?) avoid Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/DbfImport.java trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 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.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/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/ExportApplicationUI.css trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUI.jaxx 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/main/resources/i18n/sammoa-ui-swing_en_GB.properties 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-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaContext.java 2012-08-19 14:44:55 UTC (rev 437) @@ -42,10 +42,6 @@ protected SammoaPersistence persistence; - protected FlightService flightService; - - protected ReferentialService referentialService; - public SammoaContext(SammoaConfig config) { this(config, new SammoaPersistence( config.getApplicationConfig().getFlatOptions(), @@ -80,20 +76,6 @@ } } - public FlightService getFlightService() { - if (flightService == null) { - flightService = newService(FlightService.class); - } - return flightService; - } - - public ReferentialService getReferentialService() { - if (referentialService == null) { - referentialService = newService(ReferentialService.class); - } - return referentialService; - } - public void open() { persistence.open( config.getApplicationConfig().getFlatOptions(), Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/DbfImport.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/DbfImport.java 2012-08-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/DbfImport.java 2012-08-19 14:44:55 UTC (rev 437) @@ -92,7 +92,7 @@ } catch (Exception e) { throw new ImportRuntimeException( - _("csv.import.error.unableToReadField", + _("sammoa.dbf.import.error.unableToReadField", field.getHeaderName(), lineNumber), e); } } Modified: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties =================================================================== --- trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-08-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-08-19 14:44:55 UTC (rev 437) @@ -1,27 +1,21 @@ -csv.import.error.unableToReadField= sammoa.config.admin.email=Administrator's email sammoa.config.application.site.url=Website URL of the application sammoa.config.application.version=Version of the application -sammoa.config.audio.directory=Directory where audio files are stored. -sammoa.config.background.shape.file= +sammoa.config.background.shape.file=Location of the Background shape file sammoa.config.campaign.directory=Directory where are stored campaign data (maps, flight audio files,...) -sammoa.config.campaign.id= -sammoa.config.csv.separator= +sammoa.config.campaign.id=Id of the default campaign to use +sammoa.config.csv.separator=Csv separator caracter to use sammoa.config.data.directory=Main directory where all data are stored. You can use ${data.directory} in other property values (ex\: ${data.directory}/audio). -sammoa.config.effort.number= -sammoa.config.flight.number= -sammoa.config.fly.mode= +sammoa.config.flight.number=Number of the default flight to use +sammoa.config.fly.mode=Default fly mode sammoa.config.gps.check.period=Time in seconds between each GPS capture sammoa.config.gps.device=GPS device port sammoa.config.gps.handler=GpsHandler class \: fr.ulr.sammoa.application.device.gps.GpsHandlerGpylon or fr.ulr.sammoa.application.device.gps.FakeGpsHandler sammoa.config.gps.speed=GPS speed for capture sammoa.config.gps.timeout=Time in seconds before GPS going to timeout (always the same data is received for this laps of time) and return error sammoa.config.log.file=Path for application log file -sammoa.config.observation.number= -sammoa.config.strate.shape.file= -sammoa.config.system.id= +sammoa.config.system.id=Id of the default system to use sammoa.config.tmp.directory=Temporary directory used for different task (import, export,...) -sammoa.config.transect.shape.file= sammoa.config.ui.add=Add sammoa.config.ui.begin=Begin sammoa.config.ui.centerObservation=Observation from the center place @@ -35,3 +29,4 @@ sammoa.config.ui.start=Start sammoa.config.ui.stop=Stop sammoa.copyright.text=Copyright CRMM 2012 +sammoa.dbf.import.error.unableToReadField=impossible to read value for column %s at line %s 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-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/campaign/CampaignUIHandler.java 2012-08-19 14:44:55 UTC (rev 437) @@ -23,6 +23,7 @@ */ package fr.ulr.sammoa.ui.swing.campaign; +import fr.ulr.sammoa.application.FlightService; import fr.ulr.sammoa.application.ReferentialService; import fr.ulr.sammoa.application.io.CampaignStorage; import fr.ulr.sammoa.application.io.CampaignStorages; @@ -80,21 +81,24 @@ protected final ImportCsvService importCsvService; + protected final ReferentialService referentialService; + + protected final FlightService flightService; + public CampaignUIHandler(SammoaUIContext context, CampaignUI ui) { this.context = context; this.ui = ui; this.uiImporter = new UIImporter(this.ui); - importMapService = context.newService(ImportMapService.class); - importCsvService = context.newService(ImportCsvService.class); - } + this.importMapService = context.newService(ImportMapService.class); + this.importCsvService = context.newService(ImportCsvService.class); + this.flightService = context.newService(FlightService.class); + this.referentialService = context.newService(ReferentialService.class); - public SammoaUIContext getContext() { - return context; } - public CampaignUIModel getModel() { + protected CampaignUIModel getModel() { return ui.getModel(); } @@ -106,27 +110,22 @@ return context.getDecoratorProvider(); } - protected ReferentialService getReferentialService() { - return context.getAppContext().getReferentialService(); - } - - @Override public void beforeInitUI() { CampaignUIModel model = new CampaignUIModel(); - List<Region> regions = getReferentialService().getRegions(); + List<Region> regions = referentialService.getRegions(); model.setRegionReferential(regions); String campaignId = context.getCampaignId(); if (campaignId == null) { - List<Campaign> campaigns = getReferentialService().getCampaigns(); + List<Campaign> campaigns = referentialService.getCampaigns(); model.prepareCreate(campaigns); } else { - Campaign campaign = getReferentialService().getCampaign(campaignId); + Campaign campaign = referentialService.getCampaign(campaignId); model.prepareUpdate(campaign); } @@ -186,11 +185,11 @@ SammoaUtil.updateBusyState(ui, true); - String campaignId = getReferentialService().saveCampaign(campaign); + String campaignId = referentialService.saveCampaign(campaign); getModel().setId(campaignId); CampaignStorage campaignStorage = CampaignStorages.getStorage( - getContext().getConfig(), campaignId); + context.getConfig(), campaignId); File strateFile = ui.getStrateFileEditor().getSelectedFile(); if (strateFile != null && strateFile.exists()) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUI.jaxx 2012-08-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUI.jaxx 2012-08-19 14:44:55 UTC (rev 437) @@ -55,6 +55,7 @@ public FlightUI(SammoaUIContext context) { FlightUIHandler handler = new FlightUIHandler(context, this); + setContextValue(context); setContextValue(handler); handler.beforeInitUI(); } @@ -183,7 +184,7 @@ </JSplitPane> - <EffortPanel id='effortSplitPane'/> + <EffortPanel id='effortSplitPane' constructorParams='this'/> </JSplitPane> 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-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java 2012-08-19 14:44:55 UTC (rev 437) @@ -61,32 +61,30 @@ // fire remove previous elements and put selection to null protected boolean comboIsAdjusting; - protected SammoaUIContext context; + protected final SammoaUIContext context; - protected HomeUI ui; + protected final HomeUI ui; + protected final ReferentialService referentialService; + + protected final FlightService flightService; + public HomeUIHandler(SammoaUIContext context, HomeUI ui) { this.context = context; this.ui = ui; + this.flightService = context.newService(FlightService.class); + this.referentialService = context.newService(ReferentialService.class); } - public HomeUIModel getModel() { + protected HomeUIModel getModel() { return ui.getModel(); } - protected FlightService getFlightService() { - return context.getAppContext().getFlightService(); - } - - protected ReferentialService getReferentialService() { - return context.getAppContext().getReferentialService(); - } - protected SammoaConfig getConfig() { return context.getConfig(); } - protected SammoaDecoratorProvider getDecoratorProvider() { + public SammoaDecoratorProvider getDecoratorProvider() { return context.getDecoratorProvider(); } @@ -97,7 +95,7 @@ @Override public void afterInitUI() { - List<Campaign> campaigns = getReferentialService().getCampaigns(); + List<Campaign> campaigns = referentialService.getCampaigns(); ui.getCampaignListModel().setElements(campaigns); if (campaigns.isEmpty()) { @@ -150,7 +148,7 @@ logger.debug("Get flights from campaign {}", campaign.getCode()); } - List<Flight> flights = getFlightService().getFlights(campaign); + List<Flight> flights = flightService.getFlights(campaign); Set<String> systemIds = Sets.newTreeSet(Iterables.transform(flights, Flights.toSystemId())); @@ -287,7 +285,7 @@ if (flight == null) { // Create a new Flight for the selected Campaign - flight = getFlightService().createFlight(campaign); + flight = flightService.createFlight(campaign); } context.changeScreen(SammoaScreen.FLIGHT, campaign, flight); } 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-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/sammoa/ImportApplicationUIHandler.java 2012-08-19 14:44:55 UTC (rev 437) @@ -2,7 +2,6 @@ import fr.ulr.sammoa.application.FlightService; import fr.ulr.sammoa.application.ReferentialService; -import fr.ulr.sammoa.application.SammoaContext; import fr.ulr.sammoa.application.io.input.sammoa.ImportApplicationModel; import fr.ulr.sammoa.application.io.input.sammoa.ImportApplicationService; import fr.ulr.sammoa.ui.swing.SammoaDecoratorProvider; @@ -32,7 +31,6 @@ protected final ImportApplicationService importService; - protected final ReferentialService referentialService; protected final FlightService flightService; @@ -43,11 +41,9 @@ ImportApplicationUI ui) { this.context = context; this.ui = ui; - SammoaContext appContext = context.getAppContext(); - this.importService = context.newService(ImportApplicationService.class); - this.flightService = appContext.getFlightService(); - this.referentialService = appContext.getReferentialService(); + this.flightService = context.newService(FlightService.class); + this.referentialService = context.newService(ReferentialService.class); this.decoratorProvider = context.getDecoratorProvider(); } 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-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2012-08-19 14:44:55 UTC (rev 437) @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ulr.sammoa.application.ReferentialService; -import fr.ulr.sammoa.application.SammoaContext; import fr.ulr.sammoa.application.io.output.map.ExportMapModel; import fr.ulr.sammoa.application.io.output.map.ExportMapService; import fr.ulr.sammoa.persistence.Campaign; @@ -87,20 +86,16 @@ protected final ReferentialService referentialService; - protected final SammoaDecoratorProvider decoratorProvider; - public ExportMapUIHandler(SammoaUIContext context, ExportMapUI ui) { this.context = context; this.ui = ui; - SammoaContext appContext = context.getAppContext(); - this.referentialService = appContext.getReferentialService(); + this.referentialService = context.newService(ReferentialService.class); this.exportService = context.newService(ExportMapService.class); - this.decoratorProvider = context.getDecoratorProvider(); } public SammoaDecoratorProvider getDecoratorProvider() { - return decoratorProvider; + return context.getDecoratorProvider(); } @Override @@ -207,7 +202,7 @@ // reset strates,... if (logger.isInfoEnabled()) { Decorator<Campaign> decorator = - decoratorProvider.getDecoratorByType(Campaign.class); + getDecoratorProvider().getDecoratorByType(Campaign.class); logger.info("New selected campain: {}", decorator.toString(newCampaign)); } @@ -505,7 +500,7 @@ OneClicListSelectionModel.installModel(jList); // init list - Decorator<E> decorator = decoratorProvider.getDecoratorByType(beanType); + Decorator<E> decorator = getDecoratorProvider().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/ExportApplicationUI.css =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUI.css 2012-08-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUI.css 2012-08-19 14:44:55 UTC (rev 437) @@ -22,9 +22,18 @@ * #L% */ +JRadioButton { + buttonGroup:"callbacks"; +} + #model { callback: {(ExportApplicationCallbackMode) callbacks.getSelectedValue()}; } + +#callbacks { + selectedValue:{model.getCallback()}; +} + #campaignLabel { text: "sammoa.label.campaign"; } @@ -76,28 +85,21 @@ #callbackNothing { text:"sammoa.label.exportApplication.callbackNothing"; - selected:{ExportApplicationCallbackMode.NOTHING == model.getCallback()}; - buttonGroup:"callbacks"; + selected:true; value:{ExportApplicationCallbackMode.NOTHING}; } #callbackRemoveFlightData { text:"sammoa.label.exportApplication.callbackRemoveFlightData"; - buttonGroup:"callbacks"; - selected:{ExportApplicationCallbackMode.REMOVE_FLIGHTS == model.getCallback()}; value:{ExportApplicationCallbackMode.REMOVE_FLIGHTS}; } #callbackRemoveCampaignData { text:"sammoa.label.exportApplication.callbackRemoveCampaignData"; - buttonGroup:"callbacks"; - selected:{ExportApplicationCallbackMode.REMOVE_CAMPAIGN == model.getCallback()}; value:{ExportApplicationCallbackMode.REMOVE_CAMPAIGN}; } #callbackRemoveAllData { text:"sammoa.label.exportApplication.callbackRemoveAllData"; - buttonGroup:"callbacks"; - selected:{ExportApplicationCallbackMode.REMOVE_ALL == model.getCallback()}; value:{ExportApplicationCallbackMode.REMOVE_ALL}; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUI.jaxx 2012-08-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUI.jaxx 2012-08-19 14:44:55 UTC (rev 437) @@ -58,7 +58,7 @@ <ExportApplicationUIHandler id='handler' initializer='getContextValue(ExportApplicationUIHandler.class)'/> - <JAXXButtonGroup id='callbacks' selectedVaue='{model.getCallback()}'/> + <JAXXButtonGroup id='callbacks'/> <Table fill='both' constraints='BorderLayout.CENTER'> <!-- Campaign filter --> 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-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/sammoa/ExportApplicationUIHandler.java 2012-08-19 14:44:55 UTC (rev 437) @@ -25,7 +25,6 @@ import fr.ulr.sammoa.application.FlightService; import fr.ulr.sammoa.application.ReferentialService; -import fr.ulr.sammoa.application.SammoaContext; import fr.ulr.sammoa.application.io.output.sammoa.ExportApplicationModel; import fr.ulr.sammoa.application.io.output.sammoa.ExportApplicationService; import fr.ulr.sammoa.persistence.Campaign; @@ -73,21 +72,17 @@ protected final FlightService flightService; - protected final SammoaDecoratorProvider decoratorProvider; - public ExportApplicationUIHandler(SammoaUIContext context, ExportApplicationUI ui) { this.context = context; this.ui = ui; - SammoaContext appContext = context.getAppContext(); - this.flightService = appContext.getFlightService(); - this.referentialService = appContext.getReferentialService(); + this.flightService = context.newService(FlightService.class); + this.referentialService = context.newService(ReferentialService.class); this.exportService = context.newService(ExportApplicationService.class); - this.decoratorProvider = context.getDecoratorProvider(); } public SammoaDecoratorProvider getDecoratorProvider() { - return decoratorProvider; + return context.getDecoratorProvider(); } @Override @@ -107,8 +102,6 @@ if (campaignId != null) { Campaign campaign = referentialService.getCampaign(campaignId); - - // selected cam model.setSelectedCampaign(campaign); } @@ -117,8 +110,6 @@ if (flightId != null) { Flight flight = flightService.getFlight(flightId); - - // selected cam model.setSelectedFlight(flight); } @@ -165,7 +156,6 @@ logger.info("Current directory to use: {}", currentDirectory); } model.setExportDirectory(currentDirectory); - model.setCallback(ExportApplicationCallbackMode.NOTHING); SwingUtil.fillComboBox(ui.getCampaignCombobox(), model.getCampaigns(), @@ -330,7 +320,7 @@ // reset flights,... if (logger.isInfoEnabled()) { Decorator<Campaign> decorator = - decoratorProvider.getDecoratorByType(Campaign.class); + getDecoratorProvider().getDecoratorByType(Campaign.class); logger.info("New selected campain: {}", decorator.toString(newCampaign)); } @@ -374,7 +364,7 @@ // reset flights,... if (logger.isInfoEnabled()) { Decorator<Flight> decorator = - decoratorProvider.getDecoratorByType(Flight.class); + getDecoratorProvider().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-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java 2012-08-19 14:44:55 UTC (rev 437) @@ -118,8 +118,12 @@ private final EffortPanel ui; + private final FlightService flightService; + public EffortPanelHandler(EffortPanel ui) { this.ui = ui; + SammoaUIContext context = ui.getContextValue(SammoaUIContext.class); + flightService = context.newService(FlightService.class); } public FlightUIModel getFlightUIModel() { @@ -510,8 +514,6 @@ logger.debug(String.format("Set observer %s for position %s", newValue, position)); } - - FlightService flightService = SammoaUIContext.getUIContext().getAppContext().getFlightService(); flightService.setRouteObserverByPosition(route, newValue, position); // the method setObserverByPosition could update other positions 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-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/SpeciesCodeValidator.java 2012-08-19 14:44:55 UTC (rev 437) @@ -24,6 +24,7 @@ */ import com.opensymphony.xwork2.validator.ValidationException; +import fr.ulr.sammoa.application.ReferentialService; import fr.ulr.sammoa.application.SammoaContext; import fr.ulr.sammoa.persistence.Species; import fr.ulr.sammoa.ui.swing.SammoaUIContext; @@ -45,7 +46,7 @@ protected Collection<?> getCollection(Object object) throws ValidationException { if (species == null) { SammoaContext appContext = SammoaUIContext.getUIContext().getAppContext(); - species = appContext.getReferentialService().getAllValidSpecies(); + species = appContext.newService(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-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/region/RegionUIHandler.java 2012-08-19 14:44:55 UTC (rev 437) @@ -24,10 +24,8 @@ package fr.ulr.sammoa.ui.swing.region; import fr.ulr.sammoa.application.ReferentialService; -import fr.ulr.sammoa.application.SammoaContext; import fr.ulr.sammoa.application.io.input.csv.ImportCsvService; import fr.ulr.sammoa.persistence.Region; -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.io.input.CsvImporter; @@ -56,33 +54,26 @@ private static final Logger logger = LoggerFactory.getLogger(RegionUIHandler.class); -// protected SammoaUIContext context; + protected final RegionUI ui; - protected RegionUI ui; - protected final UIImporter uiImporter; private final ImportCsvService importCsvService; + private final ReferentialService referentialService; public RegionUIHandler(SammoaUIContext context, RegionUI ui) { -// this.context = context; this.ui = ui; this.uiImporter = new UIImporter(ui); this.importCsvService = context.newService(ImportCsvService.class); - - referentialService = context.getAppContext().getReferentialService(); + this.referentialService = context.newService(ReferentialService.class); } public RegionUIModel getModel() { return ui.getModel(); } -// public SammoaDecoratorProvider getDecoratorProvider() { -// return context.getDecoratorProvider(); -// } - @Override public void beforeInitUI() { @@ -155,7 +146,6 @@ } - protected final CsvImporter speciesImporter = new CsvImporter() { @Override 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-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java 2012-08-19 14:44:55 UTC (rev 437) @@ -57,21 +57,20 @@ private static final Logger logger = LoggerFactory.getLogger(TransectUIHandler.class); - protected SammoaUIContext context; + protected final SammoaUIContext context; - protected TransectUI ui; + protected final TransectUI ui; + private final ReferentialService referentialService; + public TransectUIHandler(SammoaUIContext context, TransectUI ui) { this.context = context; this.ui = ui; + this.referentialService = context.newService(ReferentialService.class); } - public SammoaContext getAppContext() { - return context.getAppContext(); - } - - public TransectUIModel getModel() { + protected TransectUIModel getModel() { return ui.getModel(); } @@ -79,10 +78,6 @@ return context.getDecoratorProvider(); } - protected ReferentialService getReferentialService() { - return getAppContext().getReferentialService(); - } - @Override public void beforeInitUI() { @@ -170,7 +165,7 @@ Transect transect = getModel().newBean(); // Save the entity - String transectId = getReferentialService().createTransect(transect); + String transectId = referentialService.createTransect(transect); getModel().setId(transectId); // Close on success Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-19 12:06:02 UTC (rev 436) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-19 14:44:55 UTC (rev 437) @@ -1,12 +1,9 @@ SAMMOA=Sammoa -csv.import.error.unableToReadField=Unable to read value of column '%s' at line %s -sammo.export.inprogress=Export in progress... sammoa.about.message=About Sammoa sammoa.action.about=About sammoa.action.about.tip=About sammoa.action.add.tip=ADD \: create a new LEG route for the current Transect (the observation conditions have changed) sammoa.action.begin.tip=BEGIN \: begin effort to create a new LEG route for the next selected Transect -sammoa.action.break.tip=Break sammoa.action.cancel=Cancel sammoa.action.cancelExport=Cancel sammoa.action.center.tip=CENTER \: create a new Observation for the navigator's observer @@ -18,7 +15,6 @@ sammoa.action.create=Create sammoa.action.edit=Edit sammoa.action.end.tip=END \: end effort and create a new TRANSIT route -sammoa.action.export=Export sammoa.action.exportApplication=Export sammoa.action.exportEffortsMap=Export Efforts sammoa.action.exportGeoPointsMap=Export GPS Points @@ -26,19 +22,14 @@ sammoa.action.exportObservationsMap=Export Observations sammoa.action.home=Home sammoa.action.home.tip=Home -sammoa.action.import=Import sammoa.action.importApplication=Import sammoa.action.left.tip=LEFT \: create a new Observation for the observer on the left side -sammoa.action.locale.fr=fr -sammoa.action.locale.fr.tip=French -sammoa.action.locale.uk=en -sammoa.action.locale.uk.tip=English sammoa.action.new=New sammoa.action.next.tip=NEXT \: end previous effort and create a new LEG route for the next selected Transect sammoa.action.nextTransect.tip=NEXT TRANSECT \: choose this transect to be the next one sammoa.action.onBoard=On Board sammoa.action.quitExportMaps=Quit -sammoa.action.quitImportApplication= +sammoa.action.quitImportApplication=Quit sammoa.action.reload.actions=Reload actions sammoa.action.reload.gps=Reload GPS sammoa.action.reload.ui=Reload sammoa ui @@ -58,27 +49,22 @@ sammoa.config.category.other.description=Other sammoa.config.category.shortcuts=Shortcuts sammoa.config.category.shortcuts.description=List of all the shortcuts -sammoa.confirmDialog.campaignNotLoaded.message= -sammoa.confirmDialog.campaignNotLoaded.title= sammoa.confirmDialog.flightInProgress.message.exit=A flight is in progress, are you sure you want to quit ? -sammoa.confirmDialog.flightInProgress.message.showHome=A flight is in progress, are you sure you want to go back to the home screen ? +sammoa.confirmDialog.flightInProgress.message.showHome=A flight is in progress, are you sure you want to go back to the home screen ? sammoa.confirmDialog.flightInProgress.title=Flight in progress -sammoa.copyright.text=Version %1$s UMS 3462, Codelutin @ 2012 sammoa.datePattern=dd/MM/yyyy sammoa.dateTimePattern=dd/MM/yyyy HH\:mm\:ss -sammoa.dialog.title.importSammoaFile= +sammoa.dialog.title.importSammoaFile=Choose sammoa file to import sammoa.dialog.title.observerFile=Choose a csv file for observers sammoa.dialog.title.region=Region sammoa.dialog.title.speciesFile=Choose a csv file for species sammoa.dialog.title.strateFile=Choose a shape file for strates sammoa.dialog.title.transect=New Transect sammoa.dialog.title.transectFile=Choose a shape file for transects -sammoa.error.export.sammoa= sammoa.flight.decorator.flight=Flight %1$d sammoa.flight.decorator.newFlight=New flight sammoa.flight.decorator.notEnded=not ended sammoa.flight.decorator.notStarted=not started -sammoa.flightDialog.transecLbl=Transects / tracks\: sammoa.flightPanel.table.column.action=Next sammoa.flightPanel.table.column.crossingNumber=Crossing sammoa.flightPanel.table.column.deleted=Del @@ -107,11 +93,8 @@ sammoa.label.exportApplication.callbacks=Call back after export\: sammoa.label.exportApplicationDirectory=Export directory\: sammoa.label.exportApplicationFilename=Export filename\: -sammoa.label.exportEffortsFilename=Export filename (Efforts) -sammoa.label.exportGeoPointsFilename=Export filename (GeoPoints) sammoa.label.exportMapDirectory=Export directory sammoa.label.exportMapFilename=Export filename -sammoa.label.exportObservationsFilename=Export filename (Observations) sammoa.label.flight=Flight\: sammoa.label.flight.beginDate=Start sammoa.label.flight.comment=Comment\: @@ -119,7 +102,7 @@ sammoa.label.flight.immatriculation=Plane imma.\: sammoa.label.flight.period=Time\: sammoa.label.flight.platformType=Type\: -sammoa.label.importApplicationFile= +sammoa.label.importApplicationFile=Import filename\: sammoa.label.observers=Observers\: sammoa.label.region.code=Code\: sammoa.label.region.name=Name\: @@ -238,11 +221,9 @@ sammoa.title.exportshape=Export Maps sammoa.title.flight=System %1$s - Campaign %2$s - Region %3$s - Flight n°%4$d sammoa.title.home=Home -sammoa.title.importApplication= -sammoa.title.validation= +sammoa.title.importApplication=Application import sammoa.validator.campaign.beginDate.required=The begin date must be defined sammoa.validator.campaign.code.required=The campaign code must be defined -sammoa.validator.campaign.code.uniqueKey=The campaign code already exists sammoa.validator.campaign.endDate.anterior=The end date can't be anterior to the begin date sammoa.validator.campaign.endDate.required=The end date must be defined sammoa.validator.campaign.region.required=The region must be set