Author: tchemit Date: 2013-03-05 13:32:36 +0100 (Tue, 05 Mar 2013) New Revision: 538 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/538 Log: - fix attachment enable when cruise is created - change some log levels - make error panel always use the loading action ui ui as parent Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-03-05 12:28:40 UTC (rev 537) +++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-03-05 12:32:36 UTC (rev 538) @@ -32,7 +32,7 @@ # tutti levels log4j.logger.fr.ifremer.tutti=INFO log4j.logger.fr.ifremer.tutti.ui.swing.util=WARN -log4j.logger.fr.ifremer.tutti.ui.swing.util.action=DEBUG +#log4j.logger.fr.ifremer.tutti.ui.swing.util.action=DEBUG log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.file=${tutti.log.file} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-05 12:28:40 UTC (rev 537) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-05 12:32:36 UTC (rev 538) @@ -212,5 +212,5 @@ } #attachmentsButton { - enabled: {model.getObjectId() != null}; + enabled: {model.getId() != null}; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-03-05 12:28:40 UTC (rev 537) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-03-05 12:32:36 UTC (rev 538) @@ -66,6 +66,7 @@ if (TuttiEntities.isNew(bean)) { saved = persistenceService.createCruise(bean); + model.setId(saved.getId()); } else { saved = persistenceService.saveCruise(bean); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-03-05 12:28:40 UTC (rev 537) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-03-05 12:32:36 UTC (rev 538) @@ -68,7 +68,7 @@ cause, null, null); pane.setErrorInfo(info); pane.setErrorReporter(this); - JXErrorPane.showDialog(context.getMainUI(), pane); + JXErrorPane.showDialog(context.getActionUI(), pane); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-03-05 12:28:40 UTC (rev 537) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-03-05 12:32:36 UTC (rev 538) @@ -120,8 +120,8 @@ // udpate global label AbstractTuttiAction action = (AbstractTuttiAction) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("Action to use: " + action); + if (log.isDebugEnabled()) { + log.debug("Action to use: " + action); } if (action == null || action.isFailed()) { @@ -144,8 +144,8 @@ ProgressionModel oldValue = (ProgressionModel) evt.getOldValue(); ProgressionModel newValue = (ProgressionModel) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("progression model: " + newValue); + if (log.isDebugEnabled()) { + log.debug("progression model: " + newValue); } if (oldValue != null) { oldValue.removePropertyChangeListener(progressionListener);