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