Author: tchemit Date: 2013-05-30 14:39:31 +0200 (Thu, 30 May 2013) New Revision: 1037 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1037 Log: fixes #2515: [CONF] - Impossible de modifier le navire pour le carroussel Modified: trunk/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-30 10:10:45 UTC (rev 1036) +++ trunk/pom.xml 2013-05-30 12:39:31 UTC (rev 1037) @@ -132,7 +132,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.20</jaxxVersion> + <jaxxVersion>2.5.21-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.14.1</xworkVersion> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-05-30 10:10:45 UTC (rev 1036) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-05-30 12:39:31 UTC (rev 1037) @@ -147,7 +147,7 @@ protected File configFile; - protected File getConfigFile() { + public File getConfigFile() { if (configFile == null) { File dir = getTuttiBasedir(); if (dir == null || !dir.exists() || !isFullLaunchMode()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-05-30 10:10:45 UTC (rev 1036) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-05-30 12:39:31 UTC (rev 1037) @@ -88,7 +88,8 @@ TuttiApplicationConfig config = getConfig(); - ConfigUIHelper helper = new ConfigUIHelper(config.getApplicationConfig()); + ConfigUIHelper helper = new ConfigUIHelper(config.getApplicationConfig(), + config.getConfigFile()); helper.registerCallBack( CALLBACK_UI, n_("tutti.config.action.reload.ui"),