From kmorin@users.forge.codelutin.com Mon Aug 18 16:34:21 2014
From: kmorin@users.forge.codelutin.com
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits] r572 - in
	trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing:	.
 content/demande
Date: Mon, 18 Aug 2014 16:34:21 +0200
Message-ID: <20140818143421.76FC7181DD1@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8335861730927694824=="

--===============8335861730927694824==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 =3D Maps.newHashMap();
         additionalStates.put(BeanFilterableComboBox.class, new BeanFilterabl=
eComboBoxState());
         additionalStates.put(BeanDoubleList.class, new BeanDoubleListState()=
);
-        this.swingSession =3D SwingSession.newSession(getConfig().getUIConfi=
gFile(), false, additionalStates);
+        this.swingSession =3D new SwingSession(getConfig().getUIConfigFile()=
, false, additionalStates);
+        swingSession.loadSafeStates();
=20
         this.errorHelper =3D new ApplicationErrorHelper(this) {
=20

Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui=
/swing/content/demande/DemandeUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"{JSplitPane.VERTICAL_SPLIT}"
                 id=3D"leftVerticalSplitPanel">
=20
-      <JScrollPane>
+      <JScrollPane id=3D"demandForm">
=20
         <Table fill=3D'horizontal'>
           <row>

Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui=
/swing/content/demande/DemandeUIHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 !=3D newRangePanelVisible) {
                     leftVerticalSplitPanel.setName("leftVerticalSplitPanel" =
+ newRangePanelVisible);
                     getContext().getSwingSession().add(leftVerticalSplitPane=
l, true);
-                    if (!oldRangePanelVisible) {
+                    if (oldRangePanelVisible) {
                         leftVerticalSplitPanel.setDividerLocation(leftVertic=
alSplitPanel.getHeight());
+                    } else {
+                        leftVerticalSplitPanel.setDividerLocation(getUI().ge=
tDemandForm().getPreferredSize().height);
                     }
                 }
             }


--===============8335861730927694824==--