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

r631 - trunk
by tchemit＠users.forge.codelutin.com 12 Oct '12

12 Oct '12

Author: tchemit Date: 2012-10-12 20:31:21 +0200 (Fri, 12 Oct 2012) New Revision: 631 Url: http://forge.codelutin.com/repositories/revision/sammoa/631 Log: fixes #1589: Updates to jaxx 2.5.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-12 12:00:41 UTC (rev 630) +++ trunk/pom.xml 2012-10-12 18:31:21 UTC (rev 631) @@ -118,7 +118,7 @@ <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.5.6-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.6</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.4</xworkVersion>

1 0

r630 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight
by tchemit＠users.forge.codelutin.com 12 Oct '12

12 Oct '12

Author: tchemit Date: 2012-10-12 14:00:41 +0200 (Fri, 12 Oct 2012) New Revision: 630 Url: http://forge.codelutin.com/repositories/revision/sammoa/630 Log: fixes #1598: Les raccourcis claviers ne fonctionnent plus (add log if shortcut not found) Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 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-10-12 11:57:59 UTC (rev 629) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-10-12 12:00:41 UTC (rev 630) @@ -961,6 +961,11 @@ protected void putAction(String actionName, Action action) { getActionMap().put(actionName, action); KeyStroke keyStroke = context.getConfig().getShortCut(actionName); + if (keyStroke == null) { + if (logger.isWarnEnabled()) { + logger.warn("Shortcut not found for action " + actionName); + } + } getInputMap().put(keyStroke, actionName); }

1 0

r629 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map
by tchemit＠users.forge.codelutin.com 12 Oct '12

12 Oct '12

Author: tchemit Date: 2012-10-12 13:57:59 +0200 (Fri, 12 Oct 2012) New Revision: 629 Url: http://forge.codelutin.com/repositories/revision/sammoa/629 Log: revert bad commit Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java 2012-10-12 11:57:32 UTC (rev 628) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java 2012-10-12 11:57:59 UTC (rev 629) @@ -59,7 +59,6 @@ public TransectImportModel() { super(';'); - newIgnoredColumn("Shape_Leng"); newMandatoryColumn("Length", Transect.PROPERTY_LENGTH, Common.DOUBLE_PRIMITIVE

1 0

r628 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight
by tchemit＠users.forge.codelutin.com 12 Oct '12

12 Oct '12

Author: tchemit Date: 2012-10-12 13:57:32 +0200 (Fri, 12 Oct 2012) New Revision: 628 Url: http://forge.codelutin.com/repositories/revision/sammoa/628 Log: fixes #1598: Les raccourcis claviers ne fonctionnent plus (with correct file it works better...) Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 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-10-12 11:30:58 UTC (rev 627) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-10-12 11:57:32 UTC (rev 628) @@ -960,8 +960,7 @@ protected void putAction(String actionName, Action action) { getActionMap().put(actionName, action); - ApplicationConfig applicationConfig = context.getConfig().getApplicationConfig(); - KeyStroke keyStroke = applicationConfig.getOptionAsKeyStroke("ui." + actionName); + KeyStroke keyStroke = context.getConfig().getShortCut(actionName); getInputMap().put(keyStroke, actionName); }

1 0

r627 - trunk/sammoa-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 12 Oct '12

12 Oct '12

Author: tchemit Date: 2012-10-12 13:30:58 +0200 (Fri, 12 Oct 2012) New Revision: 627 Url: http://forge.codelutin.com/repositories/revision/sammoa/627 Log: fixes #1587: Am?\195?\169liorer le controle du subjective condition Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 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-12 10:34:55 UTC (rev 626) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-10-12 11:30:58 UTC (rev 627) @@ -302,7 +302,7 @@ 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 +sammoa.validator.route.subjectiveConditions.unkownValue=The subjective conditions must be\: E for excellent, G for good, M for medium, P for poor, L for Land, X for exceptional sammoa.validator.route.swell.invalidRange=The swell must be between %1$s and %2$s (0 means no swell) sammoa.validator.route.turbidity.unkownValue=The turbidity must be between 0 (clear water) and 2 (turbid water) or 9 for unkown sammoa.validator.transect.name.required=The transect name must be defined

1 0

r626 - in trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application: . io/input/map
by tchemit＠users.forge.codelutin.com 12 Oct '12

12 Oct '12

Author: tchemit Date: 2012-10-12 12:34:55 +0200 (Fri, 12 Oct 2012) New Revision: 626 Url: http://forge.codelutin.com/repositories/revision/sammoa/626 Log: fixes #1598: Les raccourcis claviers ne fonctionnent plus Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-10-11 02:55:56 UTC (rev 625) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-10-12 10:34:55 UTC (rev 626) @@ -241,6 +241,12 @@ return result; } + public KeyStroke getShortCut(String actionName) { + KeyStroke result = applicationConfig.getOptionAsKeyStroke( + "sammoa.ui." + actionName); + return result; + } + /** * @param topiaId {@link SammoaConfigOption#CAMPAIGN_ID} value * @since 0.2 Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java 2012-10-11 02:55:56 UTC (rev 625) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/TransectImportModel.java 2012-10-12 10:34:55 UTC (rev 626) @@ -59,6 +59,7 @@ public TransectImportModel() { super(';'); + newIgnoredColumn("Shape_Leng"); newMandatoryColumn("Length", Transect.PROPERTY_LENGTH, Common.DOUBLE_PRIMITIVE

1 0

r625 - trunk
by tchemit＠users.forge.codelutin.com 11 Oct '12

11 Oct '12

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 10 Oct '12

10 Oct '12

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 10 Oct '12

10 Oct '12

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 10 Oct '12

10 Oct '12

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