Author: kmorin Date: 2013-05-15 18:49:16 +0200 (Wed, 15 May 2013) New Revision: 950 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/950 Log: fixes #2424 [TRAIT] le tri sur la liste des traits n'est pas conserv?\195?\169 quand on ferme l'?\195?\169cran trait. Concerver le choix comme on conserve le choix des colonnes masqu?\195?\169es Modified: trunk/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-15 14:34:46 UTC (rev 949) +++ trunk/pom.xml 2013-05-15 16:49:16 UTC (rev 950) @@ -132,7 +132,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.19</jaxxVersion> + <jaxxVersion>2.5.20-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion> 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 2013-05-15 14:34:46 UTC (rev 949) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-05-15 16:49:16 UTC (rev 950) @@ -25,6 +25,7 @@ */ import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.tutti.PropagatePropertyChangeListener; import fr.ifremer.tutti.TuttiIOUtil; @@ -53,8 +54,11 @@ import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUI; import jaxx.runtime.JAXXContext; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.swing.help.JAXXHelpBroker; import jaxx.runtime.swing.help.JAXXHelpUIHandler; +import jaxx.runtime.swing.session.BeanFilterableComboBoxState; +import jaxx.runtime.swing.session.State; import jaxx.runtime.swing.session.SwingSession; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -72,6 +76,7 @@ import java.io.InputStream; import java.net.URI; import java.util.Locale; +import java.util.Map; import java.util.Properties; import java.util.Set; @@ -279,7 +284,11 @@ this.config = config; this.resourceLoader = new RessourceClassLoader(Thread.currentThread().getContextClassLoader()); this.serviceContext = new TuttiServiceContext(resourceLoader, config.getServiceConfig()); - this.swingSession = new SwingSession(getConfig().getUIConfigFile(), false); + + Map<Class, State> additionalStates = Maps.newHashMap(); + additionalStates.put(BeanFilterableComboBox.class, new BeanFilterableComboBoxState()); + this.swingSession = new SwingSession(getConfig().getUIConfigFile(), false, additionalStates); + this.errorHelper = new TuttiErrorHelper(this); this.dataContext = serviceContext.getDataContext(); PropagatePropertyChangeListener.listenAndPropagateAll(dataContext, this);