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

r625 - trunk
by tchemit＠users.forge.codelutin.com Oct. 11, 2012

Oct. 11, 2012

Author: tchemit Date: 2012-10-11 04:55:56 +0200 (Thu, 11 Oct 2012) New Revision: 625 Url: http://forge.codelutin.com/repositories/revision/sammoa/625 Log: Update mavenpom4redmine to 3.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-10 21:19:19 UTC (rev 624) +++ trunk/pom.xml 2012-10-11 02:55:56 UTC (rev 625) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.8</version> + <version>3.4</version> </parent> <groupId>fr.ulr</groupId>

1 0

r624 - in trunk/sammoa-ui-swing/src/main: java/fr/ulr/sammoa/ui/swing/home resources/i18n
by tchemit＠users.forge.codelutin.com Oct. 10, 2012

Oct. 10, 2012

Author: tchemit Date: 2012-10-10 23:19:19 +0200 (Wed, 10 Oct 2012) New Revision: 624 Url: http://forge.codelutin.com/repositories/revision/sammoa/624 Log: fixes #1588: Interdir de passer sur l'?\195?\169cran onBoard si la r?\195?\169gion ne contient pas d'esp?\195?\168ce. Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.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/home/HomeUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java 2012-10-10 21:18:07 UTC (rev 623) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIHandler.java 2012-10-10 21:19:19 UTC (rev 624) @@ -35,11 +35,13 @@ import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.Flights; import fr.ulr.sammoa.persistence.HasTopiaIdPredicate; +import fr.ulr.sammoa.persistence.Species; 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.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -278,6 +280,21 @@ // Save the campaignId in the config for next loading Campaign campaign = getModel().getCampaign(); Preconditions.checkNotNull(campaign); + + // check before that the region used has some species + // see http://forge.codelutin.com/issues/1588 + List<Species> allSpecies = + referentialService.getAllSpecies(campaign); + if (CollectionUtils.isEmpty(allSpecies)) { + + // can not authorize to go to this screen + SammoaUtil.showErrorMessage( + ui, _("sammoa.validator.no.species.in.region")); + return; + } + + // ok can continue + getConfig().setCampaignId(campaign.getTopiaId()); getConfig().save(); 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-10-10 21:18:07 UTC (rev 623) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-10-10 21:19:19 UTC (rev 624) @@ -283,6 +283,7 @@ sammoa.validator.campaign.endDate.required=The end date must be defined sammoa.validator.campaign.region.required=The region must be set sammoa.validator.campaign.uniqueKey=The campaign code '%1$s' already exists for the region '%2$s' +sammoa.validator.no.species.in.region=No species found for the campaign's region, please import then before. sammoa.validator.observation.age.unkownValue=The age must be \: J for "juvenile", I for "immature", A for "adult" and M for mixed groups sammoa.validator.observation.behaviour.unkownValue=The behaviour must be one of this value \: SW (normal), MI (milling), BR (breaching), LO (logging), FE (feeding), FA (feeding aggregation), SB (following boat), OT (other) sammoa.validator.observation.cue.unkownValue=The cue must be between 2 and 9 or U for underwater and A for surface

1 0

r623 - in trunk: . sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing
by tchemit＠users.forge.codelutin.com Oct. 10, 2012

Oct. 10, 2012

Author: tchemit Date: 2012-10-10 23:18:07 +0200 (Wed, 10 Oct 2012) New Revision: 623 Url: http://forge.codelutin.com/repositories/revision/sammoa/623 Log: refs #1589: Updates to jaxx 2.5.6 Modified: trunk/pom.xml trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-10 20:16:50 UTC (rev 622) +++ trunk/pom.xml 2012-10-10 21:18:07 UTC (rev 623) @@ -118,7 +118,7 @@ <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.5.5</jaxxVersion> + <jaxxVersion>2.5.6-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.4</xworkVersion> 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-10-10 20:16:50 UTC (rev 622) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-10-10 21:18:07 UTC (rev 623) @@ -48,7 +48,6 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.ErrorDialogUI; -import jaxx.runtime.swing.editor.config.ConfigUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; import org.nuiton.util.ApplicationConfig; import org.nuiton.widget.SwingSession; @@ -234,164 +233,134 @@ reloadSammoa(); } } - ); + ).registerCallBack( + "home", n_("sammoa.action.reload.home"), + SwingUtil.createActionIcon("config"), + new Runnable() { - // APPLICATION - { - helper.addCategory(n_("sammoa.config.category.applications"), - n_("sammoa.config.category.applications.description")); - 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(); + } + } + } + ).registerCallBack( + "actions", n_("sammoa.action.reload.actions"), + SwingUtil.createActionIcon("config"), + new Runnable() { - @Override - public void run() { - if (SammoaScreen.HOME == ui.getScreen()) { - HomeUI homeUI = (HomeUI) currentBody; - homeUI.getHandler().selectCampaign(); - } + @Override + public void run() { + + if (SammoaScreen.FLIGHT == ui.getScreen() + || SammoaScreen.VALIDATION == ui.getScreen()) { + + FlightUI flightUI = (FlightUI) currentBody; + flightUI.getHandler().initActions(); } } - ); - helper.addOption(SammoaConfig.SammoaConfigOption.SYSTEM_ID); - helper.setOptionCallBack("home"); - helper.addOption(SammoaConfig.SammoaConfigOption.DATA_DIRECTORY); - helper.setOptionCallBack("ui"); - helper.addOption(SammoaConfig.SammoaConfigOption.FLIGHT_NUMBER); - helper.addOption(SammoaConfig.SammoaConfigOption.BACKGROUND_SHAPE_FILE); - helper.setOptionCallBack("ui"); - helper.addOption(SammoaConfig.SammoaConfigOption.AUTO_COMMIT_DELAY); // milliseconds - helper.setOptionCallBack("ui"); - } + } + ).registerCallBack( + "audio", n_("sammoa.action.reload.audio"), + SwingUtil.createActionIcon("config"), + new Runnable() { - // SHORTCUT - { - helper.addCategory(n_("sammoa.config.category.shortcuts"), - n_("sammoa.config.category.shortcuts.description")); - helper.registerCallBack( - "actions", n_("sammoa.action.reload.actions"), - SwingUtil.createActionIcon("config"), - new Runnable() { + @Override + public void run() { - @Override - public void run() { + if (SammoaScreen.FLIGHT == ui.getScreen()) { - if (SammoaScreen.FLIGHT == ui.getScreen() - || SammoaScreen.VALIDATION == ui.getScreen()) { + reloadDevice((FlightUI) currentBody, AudioRecorder.class); - FlightUI flightUI = (FlightUI) currentBody; - flightUI.getHandler().initActions(); - } + } else if (SammoaScreen.VALIDATION == ui.getScreen()) { + + reloadDevice((FlightUI) currentBody, AudioReader.class); } } - ); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_START); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_STOP); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_BEGIN); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_END); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_NEXT); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_ADD); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_LEFT_OBSERVATION); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_CENTER_OBSERVATION); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_RIGHT_OBSERVATION); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_CIRCLE_BACK); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_VALID_FLIGHT); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_VALID_TRANSECT); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_VALID_OBSERVATION); - helper.setOptionCallBack("actions"); - helper.addOption(SammoaConfig.SammoaConfigOption.KEY_VALID_ROUTE); - helper.setOptionCallBack("actions"); - } + } + ).registerCallBack( + "gps", n_("sammoa.action.reload.gps"), + SwingUtil.createActionIcon("config"), + new Runnable() { - // GPS - { - helper.addCategory(n_("sammoa.config.category.gps"), - n_("sammoa.config.category.gps.description")); - helper.registerCallBack( - "gps", n_("sammoa.action.reload.gps"), - SwingUtil.createActionIcon("config"), - new Runnable() { + @Override + public void run() { - @Override - public void run() { + if (SammoaScreen.FLIGHT == ui.getScreen()) { - if (SammoaScreen.FLIGHT == ui.getScreen()) { - - reloadDevice((FlightUI) currentBody, GpsHandler.class); - } + reloadDevice((FlightUI) currentBody, GpsHandler.class); } } - ); - helper.addOption(GpsConfig.GpsConfigOption.GPS_HANDLER, - SammoaConfig.PROPERTY_GPS_CONFIG + "." + GpsConfig.PROPERTY_GPS_HNALDER_CLASS); - helper.setOptionCallBack("gps"); - helper.addOption(GpsConfig.GpsConfigOption.GPS_DEVICE); - helper.setOptionCallBack("gps"); - helper.addOption(GpsConfig.GpsConfigOption.GPS_SPEED); - helper.setOptionCallBack("gps"); - helper.addOption(GpsConfig.GpsConfigOption.GPS_CHECK_PERIOD); - helper.setOptionCallBack("gps"); - helper.addOption(GpsConfig.GpsConfigOption.GPS_TIMEOUT); - helper.setOptionCallBack("gps"); - } + } + ); - // AUDIO - { - helper.addCategory(n_("sammoa.config.category.audio"), - n_("sammoa.config.category.audio.description")); - helper.registerCallBack( - "audio", n_("sammoa.action.reload.audio"), - SwingUtil.createActionIcon("config"), - new Runnable() { + // APPLICATION - @Override - public void run() { + helper.addCategory(n_("sammoa.config.category.applications"), + n_("sammoa.config.category.applications.description")) + .addOption(SammoaConfig.SammoaConfigOption.SYSTEM_ID) + .setOptionCallBack("home") + .addOption(SammoaConfig.SammoaConfigOption.DATA_DIRECTORY) + .setOptionCallBack("ui") + .addOption(SammoaConfig.SammoaConfigOption.FLIGHT_NUMBER) + .addOption(SammoaConfig.SammoaConfigOption.BACKGROUND_SHAPE_FILE) + .setOptionCallBack("ui") + .addOption(SammoaConfig.SammoaConfigOption.AUTO_COMMIT_DELAY) // milliseconds + .setOptionCallBack("ui"); - if (SammoaScreen.FLIGHT == ui.getScreen()) { + // SHORTCUT - reloadDevice((FlightUI) currentBody, AudioRecorder.class); + helper.addCategory(n_("sammoa.config.category.shortcuts"), + n_("sammoa.config.category.shortcuts.description"), "actions") + .addOption(SammoaConfig.SammoaConfigOption.KEY_START) + .addOption(SammoaConfig.SammoaConfigOption.KEY_STOP) + .addOption(SammoaConfig.SammoaConfigOption.KEY_BEGIN) + .addOption(SammoaConfig.SammoaConfigOption.KEY_END) + .addOption(SammoaConfig.SammoaConfigOption.KEY_NEXT) + .addOption(SammoaConfig.SammoaConfigOption.KEY_ADD) + .addOption(SammoaConfig.SammoaConfigOption.KEY_LEFT_OBSERVATION) + .addOption(SammoaConfig.SammoaConfigOption.KEY_CENTER_OBSERVATION) + .addOption(SammoaConfig.SammoaConfigOption.KEY_RIGHT_OBSERVATION) + .addOption(SammoaConfig.SammoaConfigOption.KEY_CIRCLE_BACK) + .addOption(SammoaConfig.SammoaConfigOption.KEY_VALID_FLIGHT) + .addOption(SammoaConfig.SammoaConfigOption.KEY_VALID_TRANSECT) + .addOption(SammoaConfig.SammoaConfigOption.KEY_VALID_OBSERVATION) + .addOption(SammoaConfig.SammoaConfigOption.KEY_VALID_ROUTE); - } else if (SammoaScreen.VALIDATION == ui.getScreen()) { + // GPS - reloadDevice((FlightUI) currentBody, AudioReader.class); - } - } - } - ); - helper.addOption(AudioConfig.AudioConfigOption.SAMPLE_RATE); - helper.setOptionCallBack("audio"); - helper.addOption(AudioConfig.AudioConfigOption.SAMPLE_SIZE_IN_BITS); - helper.setOptionCallBack("audio"); - helper.addOption(AudioConfig.AudioConfigOption.RECORD_DELAY_IN_SECONDS); - helper.setOptionCallBack("audio"); - helper.addOption(AudioConfig.AudioConfigOption.COMPRESSION); - helper.setOptionCallBack("audio"); - } + helper.addCategory(n_("sammoa.config.category.gps"), + n_("sammoa.config.category.gps.description"), "gps") + .addOption(GpsConfig.GpsConfigOption.GPS_HANDLER, + SammoaConfig.PROPERTY_GPS_CONFIG + "." + GpsConfig.PROPERTY_GPS_HNALDER_CLASS) + .addOption(GpsConfig.GpsConfigOption.GPS_DEVICE) + .addOption(GpsConfig.GpsConfigOption.GPS_SPEED) + .addOption(GpsConfig.GpsConfigOption.GPS_CHECK_PERIOD) + .addOption(GpsConfig.GpsConfigOption.GPS_TIMEOUT); + // AUDIO + + helper.addCategory(n_("sammoa.config.category.audio"), + n_("sammoa.config.category.audio.description"), "audio") + .addOption(AudioConfig.AudioConfigOption.SAMPLE_RATE) + .addOption(AudioConfig.AudioConfigOption.SAMPLE_SIZE_IN_BITS) + .addOption(AudioConfig.AudioConfigOption.RECORD_DELAY_IN_SECONDS) + .addOption(AudioConfig.AudioConfigOption.COMPRESSION); + + // OTHER - { - helper.addCategory(n_("sammoa.config.category.other"), - n_("sammoa.config.category.other.description")); - helper.addOption(SammoaConfig.SammoaConfigOption.SITE_URL); - helper.addOption(SammoaConfig.SammoaConfigOption.UI_CONFIG_FILE); - helper.setOptionCallBack("ui"); - } - ConfigUI configUI = helper.buildUI(ui, "sammoa.config.category.applications"); + helper.addCategory(n_("sammoa.config.category.other"), + n_("sammoa.config.category.other.description")) + .addOption(SammoaConfig.SammoaConfigOption.SITE_URL) + .addOption(SammoaConfig.SammoaConfigOption.UI_CONFIG_FILE) + .setOptionCallBack("ui"); + + helper.buildUI(ui, "sammoa.config.category.applications"); + // FIXME-fdesbois-2012-09-10: Some issue with configUI, the dialog is // the ancestor, but the swingSession not always keep the same saved positions

1 0

r622 - in trunk/sammoa-ui-swing/src/main/resources: fr/ulr/sammoa/persistence i18n
by tchemit＠users.forge.codelutin.com Oct. 10, 2012

Oct. 10, 2012

Author: tchemit Date: 2012-10-10 22:16:50 +0200 (Wed, 10 Oct 2012) New Revision: 622 Url: http://forge.codelutin.com/repositories/revision/sammoa/622 Log: fixes #1586: Am?\195?\169liorer la validation du skyGlint refs #1587: Am?\195?\169liorer le controle du subjective condition Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-onBoard-error-validation.xml trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-validation-error-validation.xml trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-onBoard-error-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-onBoard-error-validation.xml 2012-10-10 15:43:42 UTC (rev 621) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-onBoard-error-validation.xml 2012-10-10 20:16:50 UTC (rev 622) @@ -74,7 +74,8 @@ <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <message>sammoa.validator.route.skyGlint.invalidMin##${min}</message> + <param name="max">2</param> + <message>sammoa.validator.route.skyGlint.invalidRange##${min}##${max}</message> </field-validator> </field> @@ -123,7 +124,7 @@ <field-validator type="regex" short-circuit="true"> <param name="expression"> - <![CDATA[ [EGMP]{2} ]]> + <![CDATA[ [EGMPLX]{2} ]]> </param> <message>sammoa.validator.route.subjectiveConditions.unkownValue</message> </field-validator> Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-validation-error-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-validation-error-validation.xml 2012-10-10 15:43:42 UTC (rev 621) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-validation-error-validation.xml 2012-10-10 20:16:50 UTC (rev 622) @@ -74,7 +74,8 @@ <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <message>sammoa.validator.route.skyGlint.invalidMin##${min}</message> + <param name="max">2</param> + <message>sammoa.validator.route.skyGlint.invalidRange##${min}##${max}</message> </field-validator> </field> @@ -122,9 +123,7 @@ </field-validator> <field-validator type="regex" short-circuit="true"> - <param name="expression"> - <![CDATA[ [EGMP]{2} ]]> - </param> + <param name="expression"><![CDATA[ [EGMPLX]{2} ]]></param> <message>sammoa.validator.route.subjectiveConditions.unkownValue</message> </field-validator> 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-10-10 15:43:42 UTC (rev 621) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-10-10 20:16:50 UTC (rev 622) @@ -298,7 +298,7 @@ sammoa.validator.route.glareSeverity.invalidRange=The glare severity must be between %1$s and %2$s (0 \: no glare, 3 \: strong glare) sammoa.validator.route.glareTo.invalidRange=The glare must be in degrees between %1$s and %2$s (plane nose is at 0°) sammoa.validator.route.seaState.invalidRange=The sea state must be between %1$s and %2$s (beaufort system) -sammoa.validator.route.skyGlint.invalidMin=The sky glint must be higher than %1$s +sammoa.validator.route.skyGlint.invalidRange=The sky glint must be between %1$s and %2$s sammoa.validator.route.subjectiveConditions.badLength=The subjective conditions must have %1$s characters (one letter for each side) sammoa.validator.route.subjectiveConditions.required=The subjective conditions is mandatory sammoa.validator.route.subjectiveConditions.unkownValue=The subjective conditions must be \: E for excellent, G for good, M for medium, P for poor

1 0

r621 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing
by tchemit＠users.forge.codelutin.com Oct. 10, 2012

Oct. 10, 2012

Author: tchemit Date: 2012-10-10 17:43:42 +0200 (Wed, 10 Oct 2012) New Revision: 621 Url: http://forge.codelutin.com/repositories/revision/sammoa/621 Log: fixes #1585: Am?\195?\169lioration du changement d'?\195?\169cran Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 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-10-03 14:05:01 UTC (rev 620) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-10-10 15:43:42 UTC (rev 621) @@ -59,7 +59,6 @@ import javax.swing.JOptionPane; import javax.swing.UIManager; import javax.swing.plaf.BorderUIResource; -import java.awt.BorderLayout; import java.awt.Color; import java.awt.Desktop; import java.io.File; @@ -131,93 +130,71 @@ @Override public void onCloseUI() { - if (currentBody != null) { - SammoaUI<?> body = (SammoaUI<?>) currentBody; - body.getHandler().onCloseUI(); - currentBody = null; - } + closeCurrentBody(); - context.getSwingSession().save(); - context.close(); } public void setScreen(SammoaScreen screen) { - if (screen.equals(ui.getScreen())) { - // do nothing + try { - } else { - + // busy ui SammoaUtil.updateBusyState(ui, true); - if (currentBody != null) { - SammoaUI<?> body = (SammoaUI<?>) currentBody; - body.getHandler().onCloseUI(); + // remove any screen + ui.setScreen(null); - context.getSwingSession().save(); -// context.getSwingSession().remove(currentBody); + closeCurrentBody(); - ui.getBody().remove(currentBody); - } - - ui.setScreen(screen); - switch (screen) { - default: case HOME: - currentBody = new HomeUI(context); - context.getSwingSession().add(currentBody); - ui.getBody().setTitle(_("sammoa.title.home")); - ui.getBody().add(currentBody); + changeScreen(new HomeUI(context), + _("sammoa.title.home")); break; - case VALIDATION: case FLIGHT: FlightUI flightUI = new FlightUI(context); Flight flight = flightUI.getModel().getFlight(); Campaign campaign = flight.getCampaign(); - currentBody = flightUI; - context.getSwingSession().add(currentBody); - ui.getBody().setTitle(_("sammoa.title.flight", - flight.getSystemId(), - campaign.getCode(), - campaign.getRegion().getCode(), - flight.getFlightNumber())); - ui.getBody().add(currentBody, BorderLayout.CENTER); + changeScreen(flightUI, + _("sammoa.title.flight", + flight.getSystemId(), + campaign.getCode(), + campaign.getRegion().getCode(), + flight.getFlightNumber())); break; - case CAMPAIGN: - currentBody = new CampaignUI(context); - context.getSwingSession().add(currentBody); - ui.getBody().setTitle(_("sammoa.title.campaign")); - ui.getBody().add(currentBody, BorderLayout.CENTER); + changeScreen(new CampaignUI(context), + _("sammoa.title.campaign")); break; - case EXPORT_MAP: - currentBody = new ExportMapUI(context); - context.getSwingSession().add(currentBody); - ui.getBody().setTitle(_("sammoa.title.exportshape")); - ui.getBody().add(currentBody); + changeScreen(new ExportMapUI(context), + _("sammoa.title.exportshape")); break; - case EXPORT_APPLICATION: - currentBody = new ExportApplicationUI(context); - context.getSwingSession().add(currentBody); - ui.getBody().setTitle(_("sammoa.title.exportApplication")); - ui.getBody().add(currentBody); + changeScreen(new ExportApplicationUI(context), + _("sammoa.title.exportApplication")); break; - case IMPORT_APPLICATION: - currentBody = new ImportApplicationUI(context); - context.getSwingSession().add(currentBody); - ui.getBody().setTitle(_("sammoa.title.importApplication")); - ui.getBody().add(currentBody); + changeScreen(new ImportApplicationUI(context), + _("sammoa.title.importApplication")); break; } + // set new screen only if everything is ok + ui.setScreen(screen); + } catch (Exception e) { + + ErrorDialogUI.showError(e); + + // go back to home + setScreen(SammoaScreen.HOME); + } finally { + + // free ui SammoaUtil.updateBusyState(ui, false); } } @@ -226,23 +203,6 @@ closeSammoa(true); } - protected void closeSammoa(boolean exit) { - - if (checkCurrentFlight(_("sammoa.confirmDialog.flightInProgress.message.exit"))) { - - context.getSwingSession().save(); - - ui.setVisible(false); - ui.dispose(); - - onCloseUI(); - - if (exit) { - System.exit(0); - } - } - } - public void reloadSammoa() { // Close the application @@ -461,13 +421,51 @@ frame.setVisible(true); } + protected void closeCurrentBody() { + if (currentBody != null) { + SammoaUI<?> body = (SammoaUI<?>) currentBody; + body.getHandler().onCloseUI(); + + context.getSwingSession().save(); + + ui.getBody().remove(currentBody); + + currentBody = null; + } + } + + protected void changeScreen(JComponent newBody, String title) { + currentBody = newBody; + context.getSwingSession().add(currentBody); + ui.getBody().setTitle(title); + ui.getBody().add(currentBody); + } + + protected void closeSammoa(boolean exit) { + + if (checkCurrentFlight( + _("sammoa.confirmDialog.flightInProgress.message.exit"))) { + + context.getSwingSession().save(); + + ui.setVisible(false); + ui.dispose(); + + onCloseUI(); + + if (exit) { + System.exit(0); + } + } + } + /** * Reload the given device identified by its {@code deviceManagerClass} for * {@code ui}. * - * @param ui FlightUI contains the controller that manage devices + * @param ui FlightUI contains the controller that manage devices * @param deviceManagerClass Class of the device to reload - * @param <T> Type of {@link DeviceManager} + * @param <T> Type of {@link DeviceManager} * @see FlightController#openDeviceManager(Class) */ protected <T extends DeviceManager> void reloadDevice(FlightUI ui, @@ -482,14 +480,16 @@ } public void showHome() { - if (checkCurrentFlight(_("sammoa.confirmDialog.flightInProgress.message.showHome"))) { + if (checkCurrentFlight( + _("sammoa.confirmDialog.flightInProgress.message.showHome"))) { setScreen(SammoaScreen.HOME); } } public void showAbout() { - ApplicationConfig applicationConfig = context.getConfig().getApplicationConfig(); + ApplicationConfig applicationConfig = + context.getConfig().getApplicationConfig(); String iconPath = applicationConfig.getOption("application.icon.path"); String name = "sammoa-ui-swing"; @@ -510,7 +510,10 @@ years = inceptionYear + ""; } - about.setBottomText(_("sammoa.about.bottomText", config.getOrganizationName(), years, config.getVersion())); + about.setBottomText(_("sammoa.about.bottomText", + config.getOrganizationName(), + years, + config.getVersion())); about.setIconPath(iconPath); about.setLicenseFile(licensePath); about.setThirdpartyFile(thirdPartyPath); @@ -532,7 +535,8 @@ if (logger.isDebugEnabled()) { logger.debug("goto " + siteURL); } - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + if (Desktop.isDesktopSupported() && + Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { try { Desktop.getDesktop().browse(siteURL.toURI()); } catch (Exception e) { @@ -543,7 +547,8 @@ } public void showLogs() { - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.OPEN)) { + if (Desktop.isDesktopSupported() && + Desktop.getDesktop().isSupported(Desktop.Action.OPEN)) { File logFile = context.getConfig().getLogFile(); try { Desktop.getDesktop().open(logFile);

1 0

r620 - trunk
by tchemit＠users.forge.codelutin.com Oct. 3, 2012

Oct. 3, 2012

Author: tchemit Date: 2012-10-03 16:05:01 +0200 (Wed, 03 Oct 2012) New Revision: 620 Url: http://forge.codelutin.com/repositories/revision/sammoa/620 Log: remove commented code Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-03 13:50:11 UTC (rev 619) +++ trunk/pom.xml 2012-10-03 14:05:01 UTC (rev 620) @@ -150,24 +150,12 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> -  </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> <version>${nuitonUtilsVersion}</version> -  </dependency> <dependency> @@ -186,24 +174,12 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> -  </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>${nuitonUtilsVersion}</version> -  </dependency> <dependency> @@ -211,12 +187,6 @@ <artifactId>nuiton-validator</artifactId> <version>${nuitonUtilsVersion}</version> <classifier>tests</classifier> -  </dependency> <dependency> @@ -230,37 +200,19 @@ <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> -  </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> <version>${jaxxVersion}</version> -  - </dependency> + </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> <version>${jaxxVersion}</version> -  - </dependency> + </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> @@ -268,12 +220,6 @@ <version>${jaxxVersion}</version> <scope>test</scope> <classifier>tests</classifier> -  </dependency> <dependency> @@ -288,12 +234,6 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-widgets</artifactId> <version>1.1.1</version> -  </dependency> <dependency> @@ -319,12 +259,6 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <version>${topiaVersion}</version> -  </dependency> <dependency> @@ -383,12 +317,6 @@ <artifactId>commons-beanutils</artifactId> <version>1.8.3</version> <scope>compile</scope> -  </dependency>

1 0

r619 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by tchemit＠users.forge.codelutin.com Oct. 3, 2012

Oct. 3, 2012

Author: tchemit Date: 2012-10-03 15:50:11 +0200 (Wed, 03 Oct 2012) New Revision: 619 Url: http://forge.codelutin.com/repositories/revision/sammoa/619 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-03 13:50:02 UTC (rev 618) +++ trunk/pom.xml 2012-10-03 13:50:11 UTC (rev 619) @@ -15,7 +15,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc4</version> + <version>1.0-rc5-SNAPSHOT</version> <modules> <module>sammoa-persistence</module> @@ -81,12 +81,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc4</url> + <url>http://svn.forge.codelutin.com/svn/sammoa/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc4 + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc4 + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk </developerConnection> </scm> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-10-03 13:50:02 UTC (rev 618) +++ trunk/sammoa-application/pom.xml 2012-10-03 13:50:11 UTC (rev 619) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc4</version> + <version>1.0-rc5-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-10-03 13:50:02 UTC (rev 618) +++ trunk/sammoa-persistence/pom.xml 2012-10-03 13:50:11 UTC (rev 619) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc4</version> + <version>1.0-rc5-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-10-03 13:50:02 UTC (rev 618) +++ trunk/sammoa-ui-swing/pom.xml 2012-10-03 13:50:11 UTC (rev 619) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc4</version> + <version>1.0-rc5-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r618 - tags
by tchemit＠users.forge.codelutin.com Oct. 3, 2012

Oct. 3, 2012

Author: tchemit Date: 2012-10-03 15:50:02 +0200 (Wed, 03 Oct 2012) New Revision: 618 Url: http://forge.codelutin.com/repositories/revision/sammoa/618 Log: [maven-release-plugin] copy for tag sammoa-1.0-rc4 Added: tags/sammoa-1.0-rc4/

1 0

r617 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by tchemit＠users.forge.codelutin.com Oct. 3, 2012

Oct. 3, 2012

Author: tchemit Date: 2012-10-03 15:49:43 +0200 (Wed, 03 Oct 2012) New Revision: 617 Url: http://forge.codelutin.com/repositories/revision/sammoa/617 Log: [maven-release-plugin] prepare release sammoa-1.0-rc4 Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-03 13:27:59 UTC (rev 616) +++ trunk/pom.xml 2012-10-03 13:49:43 UTC (rev 617) @@ -15,7 +15,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc4-SNAPSHOT</version> + <version>1.0-rc4</version> <modules> <module>sammoa-persistence</module> @@ -81,12 +81,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/sammoa/trunk</url> + <url>http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc4</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc4 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc4 </developerConnection> </scm> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-10-03 13:27:59 UTC (rev 616) +++ trunk/sammoa-application/pom.xml 2012-10-03 13:49:43 UTC (rev 617) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc4-SNAPSHOT</version> + <version>1.0-rc4</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-10-03 13:27:59 UTC (rev 616) +++ trunk/sammoa-persistence/pom.xml 2012-10-03 13:49:43 UTC (rev 617) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc4-SNAPSHOT</version> + <version>1.0-rc4</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-10-03 13:27:59 UTC (rev 616) +++ trunk/sammoa-ui-swing/pom.xml 2012-10-03 13:49:43 UTC (rev 617) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0-rc4-SNAPSHOT</version> + <version>1.0-rc4</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r616 - in trunk: . sammoa-persistence sammoa-ui-swing
by tchemit＠users.forge.codelutin.com Oct. 3, 2012

Oct. 3, 2012

Author: tchemit Date: 2012-10-03 15:27:59 +0200 (Wed, 03 Oct 2012) New Revision: 616 Url: http://forge.codelutin.com/repositories/revision/sammoa/616 Log: sanityze log config Modified: trunk/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-03 13:06:22 UTC (rev 615) +++ trunk/pom.xml 2012-10-03 13:27:59 UTC (rev 616) @@ -150,24 +150,24 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> - <exclusions> +  </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> <version>${nuitonUtilsVersion}</version> - <exclusions> +  </dependency> <dependency> @@ -186,24 +186,24 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> - <exclusions> +  </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>${nuitonUtilsVersion}</version> - <exclusions> +  </dependency> <dependency> @@ -211,12 +211,12 @@ <artifactId>nuiton-validator</artifactId> <version>${nuitonUtilsVersion}</version> <classifier>tests</classifier> - <exclusions> +  </dependency> <dependency> @@ -230,36 +230,36 @@ <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> - <exclusions> +  </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> <version>${jaxxVersion}</version> - <exclusions> +  </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> <version>${jaxxVersion}</version> - <exclusions> +  </dependency> <dependency> @@ -268,12 +268,12 @@ <version>${jaxxVersion}</version> <scope>test</scope> <classifier>tests</classifier> - <exclusions> +  </dependency> <dependency> @@ -288,12 +288,12 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-widgets</artifactId> <version>1.1.1</version> - <exclusions> +  </dependency> <dependency> @@ -319,12 +319,12 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <version>${topiaVersion}</version> - <exclusions> +  </dependency> <dependency> @@ -383,12 +383,12 @@ <artifactId>commons-beanutils</artifactId> <version>1.8.3</version> <scope>compile</scope> - <exclusions> +  </dependency>  Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-10-03 13:06:22 UTC (rev 615) +++ trunk/sammoa-persistence/pom.xml 2012-10-03 13:27:59 UTC (rev 616) @@ -56,11 +56,6 @@ <artifactId>nuiton-i18n</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </dependency> -  <dependency> <groupId>org.nuiton.topia</groupId> @@ -82,6 +77,12 @@  <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <scope>test</scope> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-10-03 13:06:22 UTC (rev 615) +++ trunk/sammoa-ui-swing/pom.xml 2012-10-03 13:27:59 UTC (rev 616) @@ -190,6 +190,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -203,6 +204,12 @@ <artifactId>logback-core</artifactId> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> +  <dependency>

1 0