[tutti] branch develop updated (03c7ed7 -> fd1abed)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 03c7ed7 fixes #5824: [CAPTURE] préciser un libellé dans l'onglet résumé de la capture : poids total vrac trié new fd1abed refs-80 #5827: Erreur à analyser The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit fd1abed7324a183e6e4b68babf1dc59c81b7256e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 23 18:51:36 2014 +0200 refs-80 #5827: Erreur à analyser Summary of changes: .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 8 +------ .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 26 +++++++++++++++++----- .../tutti/ui/swing/action/ShowAboutAction.java | 2 +- .../tutti/ui/swing/content/MainUIHandler.java | 8 ++----- 4 files changed, 24 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit fd1abed7324a183e6e4b68babf1dc59c81b7256e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 23 18:51:36 2014 +0200 refs-80 #5827: Erreur à analyser --- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 8 +------ .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 26 +++++++++++++++++----- .../tutti/ui/swing/action/ShowAboutAction.java | 2 +- .../tutti/ui/swing/content/MainUIHandler.java | 8 ++----- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java index 42ddd6d..7deb856 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java @@ -173,13 +173,7 @@ public class RunTutti { handler.onCloseUI(); //close context - try { - context.getSwingSession().save(); - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error("Could not save ui config file " + context.getSwingSession().getFile(), e); - } - } + context.saveSwingSession(); context.close(); if (exitCode != null) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index 06c5917..5997762 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -67,6 +67,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; +import org.nuiton.converter.ConverterUtil; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.i18n.init.UserI18nInitializer; @@ -81,7 +82,6 @@ import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; import org.nuiton.jaxx.application.swing.action.ApplicationUIAction; import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; -import org.nuiton.converter.ConverterUtil; import javax.swing.JOptionPane; import java.awt.Color; @@ -878,16 +878,30 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage this.actionUI = actionUI; } - public SwingSession getSwingSession() { - return swingSession; + public void addInSwingSession(Component c, boolean replace) { + + try { + + swingSession.add(c, replace); + + saveSwingSession(); + + } catch (Exception e) { + if (log.isWarnEnabled()) { + log.warn("Could not add component " + c + "in swingSession file: " + swingSession.getFile(), e); + } + } + } public void saveSwingSession() { try { - getSwingSession().save(); - } catch (IOException e) { - throw new ApplicationTechnicalException("Could not save ui config file: " + swingSession.getFile(), e); + swingSession.save(); + } catch (Exception e) { + if (log.isWarnEnabled()) { + log.warn("Could not save ui config file: " + swingSession.getFile(), e); + } } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java index 9dfdb84..1f0aa46 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java @@ -93,7 +93,7 @@ public class ShowAboutAction extends AbstractMainUITuttiAction { about.showInDialog(getUI(), true); // register on swing session - getContext().getSwingSession().add(about); + getContext().addInSwingSession(about, true); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java index 26a32cb..8fee581 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java @@ -194,11 +194,7 @@ public class MainUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, MainUI ui.applyDataBinding(MainUI.BINDING_MENU_CHANGE_LOCALE_UK_ENABLED); // Init SwingSession - SwingSession swingSession = getContext().getSwingSession(); - swingSession.add(ui); - getContext().saveSwingSession(); - - //SwingUtil.getLayer(ui.getBody()).setUI(new BetaLayerUI()); + getContext().addInSwingSession(ui, false); changeTitle(); @@ -473,7 +469,7 @@ public class MainUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, MainUI } rightDecoration.add(showHelp, 0); this.currentBody = screenUI; - context.getSwingSession().add(currentBody, true); + context.addInSwingSession(currentBody, true); ui.getBody().setTitle(screenTitle); ui.getBody().add(currentBody); ui.getBody().setLeftDecoration(new JLabel(icon)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm