Author: tchemit Date: 2014-05-30 13:13:50 +0200 (Fri, 30 May 2014) New Revision: 1822 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1822 Log: fixes #5153: [TECH] Fichier d'ui corrompu Modified: trunk/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-30 08:03:46 UTC (rev 1821) +++ trunk/pom.xml 2014-05-30 11:13:50 UTC (rev 1822) @@ -143,7 +143,7 @@ <nuitonI18nVersion>3.0</nuitonI18nVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <eugenePluginVersion>2.10-SNAPSHOT</eugenePluginVersion> - <jaxxVersion>2.8.5</jaxxVersion> + <jaxxVersion>2.8.6-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.5</slf4jVersion> <adagioVersion>3.5.5</adagioVersion> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-05-30 08:03:46 UTC (rev 1821) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-05-30 11:13:50 UTC (rev 1822) @@ -324,7 +324,7 @@ Map<Class, State> additionalStates = Maps.newHashMap(); additionalStates.put(BeanFilterableComboBox.class, new BeanFilterableComboBoxState()); additionalStates.put(BeanDoubleList.class, new BeanDoubleListState()); - this.swingSession = new SwingSession(getConfig().getUIConfigFile(), false, additionalStates); + this.swingSession = SwingSession.newSession(getConfig().getUIConfigFile(), false, additionalStates); //FIXME Push this to ifremer-shared this.errorHelper = new ApplicationErrorHelper(this) { @@ -454,7 +454,7 @@ i18nLocale, i18nDirectory)); } I18n.init(new UserI18nInitializer( - i18nDirectory, new DefaultI18nInitializer("tutti-i18n")), + i18nDirectory, new DefaultI18nInitializer("tutti-i18n")), i18nLocale); @@ -865,6 +865,16 @@ return swingSession; } + public void saveSwingSession() { + + try { + getSwingSession().save(); + } catch (IOException e) { + throw new ApplicationTechnicalException("Could not save ui config file: " + swingSession.getFile(), e); + } + + } + public TuttiScreen getScreen() { return screen; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2014-05-30 08:03:46 UTC (rev 1821) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2014-05-30 11:13:50 UTC (rev 1822) @@ -196,7 +196,7 @@ // Init SwingSession SwingSession swingSession = getContext().getSwingSession(); swingSession.add(ui); - swingSession.save(); + getContext().saveSwingSession(); //SwingUtil.getLayer(ui.getBody()).setUI(new BetaLayerUI()); @@ -358,7 +358,7 @@ TuttiUI<?, ?> body = (TuttiUI<?, ?>) currentBody; body.getHandler().onCloseUI(); - context.getSwingSession().save(); + context.saveSwingSession(); ui.getBody().remove(currentBody);