Author: kmorin Date: 2014-08-18 16:34:20 +0200 (Mon, 18 Aug 2014) New Revision: 572 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/572 Log: fix swingsession fix range panel size Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-08-18 14:00:32 UTC (rev 571) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-08-18 14:34:20 UTC (rev 572) @@ -238,7 +238,8 @@ Map<Class, State> additionalStates = Maps.newHashMap(); additionalStates.put(BeanFilterableComboBox.class, new BeanFilterableComboBoxState()); additionalStates.put(BeanDoubleList.class, new BeanDoubleListState()); - this.swingSession = SwingSession.newSession(getConfig().getUIConfigFile(), false, additionalStates); + this.swingSession = new SwingSession(getConfig().getUIConfigFile(), false, additionalStates); + swingSession.loadSafeStates(); this.errorHelper = new ApplicationErrorHelper(this) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-08-18 14:00:32 UTC (rev 571) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-08-18 14:34:20 UTC (rev 572) @@ -93,7 +93,7 @@ <JSplitPane orientation="{JSplitPane.VERTICAL_SPLIT}" id="leftVerticalSplitPanel"> - <JScrollPane> + <JScrollPane id="demandForm"> <Table fill='horizontal'> <row> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-08-18 14:00:32 UTC (rev 571) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-08-18 14:34:20 UTC (rev 572) @@ -399,8 +399,10 @@ if (oldRangePanelVisible != newRangePanelVisible) { leftVerticalSplitPanel.setName("leftVerticalSplitPanel" + newRangePanelVisible); getContext().getSwingSession().add(leftVerticalSplitPanel, true); - if (!oldRangePanelVisible) { + if (oldRangePanelVisible) { leftVerticalSplitPanel.setDividerLocation(leftVerticalSplitPanel.getHeight()); + } else { + leftVerticalSplitPanel.setDividerLocation(getUI().getDemandForm().getPreferredSize().height); } } }