Author: fdesbois Date: 2012-08-29 17:37:14 +0200 (Wed, 29 Aug 2012) New Revision: 493 Url: http://forge.codelutin.com/repositories/revision/sammoa/493 Log: fixes #1433 : resolve issue with new campaign + problem with systemId change Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIModel.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-08-29 14:52:48 UTC (rev 492) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-08-29 15:37:14 UTC (rev 493) @@ -265,12 +265,27 @@ reloadSammoa(); } }); + helper.registerCallBack( + "home", + n_("sammoa.action.reload.home"), + SwingUtil.createActionIcon("config"), + new Runnable() { + @Override + public void run() { + if (SammoaScreen.HOME == ui.getScreen()) { + HomeUI homeUI = (HomeUI) currentBody; + homeUI.getHandler().selectCampaign(); + } + } + }); + // categorie applications helper.addCategory(n_("sammoa.config.category.applications"), n_("sammoa.config.category.applications.description")); helper.addOption(SammoaConfig.SammoaConfigOption.SYSTEM_ID); + helper.setOptionCallBack("home"); helper.addOption(SammoaConfig.SammoaConfigOption.DATA_DIRECTORY); helper.setOptionCallBack("ui"); // helper.addOption(SammoaConfig.SammoaConfigOption.CAMPAIGN_DIRECTORY); 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-29 14:52:48 UTC (rev 492) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java 2012-08-29 15:37:14 UTC (rev 493) @@ -154,6 +154,7 @@ } List<Flight> flights = flightService.getFlights(campaign); + ui.getModel().setFlights(flights); Set<String> systemIds = Sets.newTreeSet(Iterables.transform(flights, Flights.toSystemId())); @@ -163,17 +164,6 @@ if (logger.isDebugEnabled()) { - String flightsString = "[" + Joiner.on(";").join( - Iterables.transform(flights, Flights.toFlightNumber()) - ) + "]"; - - logger.debug("Init flights combobox = {}", flightsString); - } - - ui.getFlightListModel().setElements(flights); - - if (logger.isDebugEnabled()) { - String systemsIdString = "[" + Joiner.on(";").join( systemIds ) + "]"; @@ -211,7 +201,7 @@ getModel().setSystemId(systemId); - Collection<Flight> flights = ui.getFlightListModel().getElements(); + Collection<Flight> flights = ui.getModel().getFlights(); List<Flight> filteredFlights = Lists.newArrayList(Iterables.filter(flights, Flights.withSystemId(systemId))); @@ -260,6 +250,7 @@ } public void showNewCampaign() { + context.setCampaignId(null); context.changeScreen(SammoaScreen.CAMPAIGN); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIModel.java 2012-08-29 14:52:48 UTC (rev 492) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIModel.java 2012-08-29 15:37:14 UTC (rev 493) @@ -23,10 +23,14 @@ * #L% */ +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; import org.jdesktop.beans.AbstractSerializableBean; +import java.util.List; + /** * Created: 19/07/12 * @@ -38,6 +42,8 @@ public static final String PROPERTY_CAMPAIGN = "campaign"; + public static final String PROPERTY_FLIGHTS = "flights"; + public static final String PROPERTY_CAMPAIGN_FOUND = "campaignFound"; public static final String PROPERTY_SYSTEM_ID = "systemId"; @@ -48,6 +54,8 @@ protected Campaign campaign; + protected List<Flight> flights; + protected String systemId; protected Flight flight; @@ -65,6 +73,19 @@ firePropertyChange(PROPERTY_CAMPAIGN_FOUND, oldValue != null, campaign != null); } + public List<Flight> getFlights() { + if (flights == null) { + flights = Lists.newArrayList(); + } + return flights; + } + + public void setFlights(List<Flight> flights) { + List<Flight> oldValue = ImmutableList.copyOf(getFlights()); + this.flights = flights; + firePropertyChange(PROPERTY_FLIGHTS, oldValue, flights); + } + public boolean isCampaignFound() { return campaign != null; } 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-29 14:52:48 UTC (rev 492) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-29 15:37:14 UTC (rev 493) @@ -36,6 +36,7 @@ sammoa.action.quitExportMaps=Quit sammoa.action.quitImportApplication=Quit sammoa.action.reload.actions=Reload actions +sammoa.action.reload.campaign=Reload home screen sammoa.action.reload.gps=Reload GPS sammoa.action.reload.ui=Reload sammoa ui sammoa.action.right.tip=RIGHT \: create a new Observation for the observer on the right side