From chatellier@users.labs.libre-entreprise.org Mon Jun 15 04:19:31 2026
From: chatellier@users.labs.libre-entreprise.org
To: coser-commits@list.forge.codelutin.com
Subject: [Coser-commits] r182 - in
	trunk/coser-ui/src/main/java/fr/ifremer/coser/ui: . control
Date: Mon, 08 Nov 2010 14:37:01 +0100
Message-ID: <20101108133701.EADDE2F224@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5960730850812243173=="

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

Author: chatellier
Date: 2010-11-08 13:37:01 +0000 (Mon, 08 Nov 2010)
New Revision: 182

Log:
Add split pane into control ui and restore ui state

Modified:
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.=
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/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java	2=
010-11-08 10:22:45 UTC (rev 181)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java	2=
010-11-08 13:37:01 UTC (rev 182)
@@ -36,6 +36,7 @@
 import java.util.Locale;
 import java.util.Map;
=20
+import javax.mail.Session;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
@@ -381,6 +382,11 @@
=20
             ControlView controlView =3D new ControlView(view);
             controlView.setHandler(new ControlHandler());
+
+            // restore session size
+            SwingSession session =3D (SwingSession)view.getContextValue(Swin=
gSession.class);
+            session.add(controlView);
+
             setMainComponent(controlView);
         } catch (CoserBusinessException ex) {
             throw new CoserException("Can't load control data", ex);

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlVie=
w.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/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx=
	2010-11-08 10:22:45 UTC (rev 181)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx=
	2010-11-08 13:37:01 UTC (rev 182)
@@ -22,7 +22,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<Table>
+<Table name=3D"controlView">
     <script><![CDATA[
     void $afterCompleteSetup() {
         // bean validation
@@ -59,91 +59,90 @@
     </row>
     <row>
         <cell fill=3D"both" weightx=3D"1" weighty=3D"1" columns=3D"2">
-            <JScrollPane>
-                <fr.ifremer.coser.ui.control.ControlDataTableModel id=3D"con=
trolDataTableModel" constructorParams=3D"this" />
-                <JTable id=3D'controlDataTable' model=3D"{controlDataTableMo=
del}"
-                    onMouseClicked=3D"getHandler().showDataTableContextMenu(=
this, event)"/>
-                <ListSelectionModel id=3D"controlDataTableSelectionModel" ja=
vaBean=3D"controlDataTable.getSelectionModel()"
-                    onValueChanged=3D"getHandler().controlDataTableSelection=
Changed(this, event)" />
-            </JScrollPane>
-        </cell>
-    </row>
-    <row>
-        <cell fill=3D"both" weightx=3D"1" weighty=3D"1">
-            <JScrollPane id=3D"editionScrollPane">
-                <Table>
-                    <row>
-                        <cell weightx=3D"1" weighty=3D"1" fill=3D"both" colu=
mns=3D"3">
-                            <JPanel id=3D"editionPanel" layout=3D"{new GridB=
agLayout()}"/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell weightx=3D"1" anchor=3D"east">
-                            <JButton id=3D"controlDataValidButton" text=3D"c=
oser.ui.common.valid"
-                                onActionPerformed=3D"getHandler().validDataM=
odification(this)"
-                                enabled=3D"false" />
-                        </cell>
-                        <cell>
-                            <JButton id=3D"controlDataCancelButton" text=3D"=
coser.ui.common.cancel"
-                                onActionPerformed=3D"getHandler().cancelData=
Modification(this)"
-                                enabled=3D"false" />
-                        </cell>
-                        <cell>
-                            <JButton id=3D"controlDataDeleteButton" text=3D"=
coser.ui.control.deleteLine"
-                                onActionPerformed=3D"getHandler().deleteData=
(this)"
-                                enabled=3D"false" />
-                        </cell>
-                    </row>
-                </Table>
+            <JSplitPane name=3D"splitpaneDataDetails" orientation=3D"{JSplit=
Pane.VERTICAL_SPLIT}">
+                <JScrollPane>
+                    <fr.ifremer.coser.ui.control.ControlDataTableModel id=3D=
"controlDataTableModel" constructorParams=3D"this" />
+                    <JTable id=3D'controlDataTable' model=3D"{controlDataTab=
leModel}"
+                        onMouseClicked=3D"getHandler().showDataTableContextM=
enu(this, event)"/>
+                    <ListSelectionModel id=3D"controlDataTableSelectionModel=
" javaBean=3D"controlDataTable.getSelectionModel()"
+                        onValueChanged=3D"getHandler().controlDataTableSelec=
tionChanged(this, event)" />
+                </JScrollPane>
                =20
-            </JScrollPane>
+                <JSplitPane name=3D"splitpaneDetail" orientation=3D"{JSplitP=
ane.VERTICAL_SPLIT}">
+                    <JSplitPane name=3D"splitpaneDataDetailError">
+                        <JScrollPane id=3D"editionScrollPane">
+                            <Table>
+                                <row>
+                                    <cell weightx=3D"1" fill=3D"horizontal">
+                                        <JButton id=3D"controlDataValidButto=
n" text=3D"coser.ui.common.valid"
+                                            onActionPerformed=3D"getHandler(=
).validDataModification(this)"
+                                            enabled=3D"false" />
+                                    </cell>
+                                    <cell weightx=3D"1" fill=3D"horizontal">
+                                        <JButton id=3D"controlDataCancelButt=
on" text=3D"coser.ui.common.cancel"
+                                            onActionPerformed=3D"getHandler(=
).cancelDataModification(this)"
+                                            enabled=3D"false" />
+                                    </cell>
+                                    <cell weightx=3D"1" fill=3D"horizontal">
+                                        <JButton id=3D"controlDataDeleteButt=
on" text=3D"coser.ui.control.deleteLine"
+                                            onActionPerformed=3D"getHandler(=
).deleteData(this)"
+                                            enabled=3D"false" />
+                                    </cell>
+                                </row>
+                                <row>
+                                    <cell weightx=3D"1" weighty=3D"1" fill=
=3D"both" columns=3D"3">
+                                        <JPanel id=3D"editionPanel" layout=
=3D"{new GridBagLayout()}"/>
+                                    </cell>
+                                </row>
+                            </Table>
+                        </JScrollPane>
+                       =20
+                        <jaxx.runtime.validator.swing.SwingValidatorMessageT=
ableModel id=3D'errorsTableModel' />
+                        <fr.ifremer.coser.data.Catch id=3D"beanCatch" javaBe=
an=3D"null" />
+                        <fr.ifremer.coser.data.Haul id=3D"beanHaul" javaBean=
=3D"null" />
+                        <fr.ifremer.coser.data.Strata id=3D"beanStrata" java=
Bean=3D"null" />
+                        <fr.ifremer.coser.data.Length id=3D"beanLength" java=
Bean=3D"null" />
+                        <BeanValidator id=3D'validatorCatch' bean=3D'beanCat=
ch'
+                            uiClass=3D"jaxx.runtime.validator.swing.ui.Trans=
lucentValidationUI"
+                            errorTableModel=3D"errorsTableModel" />
+                        <BeanValidator id=3D'validatorHaul' bean=3D'beanHaul'
+                            uiClass=3D"jaxx.runtime.validator.swing.ui.Trans=
lucentValidationUI"
+                            errorTableModel=3D"errorsTableModel" />
+                        <BeanValidator id=3D'validatorStrata' bean=3D'beanSt=
rata'
+                            uiClass=3D"jaxx.runtime.validator.swing.ui.Trans=
lucentValidationUI"
+                            errorTableModel=3D"errorsTableModel" />
+                        <BeanValidator id=3D'validatorLength' bean=3D'beanLe=
ngth'
+                            uiClass=3D"jaxx.runtime.validator.swing.ui.Trans=
lucentValidationUI"
+                            errorTableModel=3D"errorsTableModel" />
+                        <JScrollPane>
+                            <JTable id=3D'validationMessagesTable' autoCreat=
eRowSorter=3D'true'
+                                rowSelectionAllowed=3D'true'
+                                model=3D'{errorsTableModel}' />
+                        </JScrollPane>
+                    </JSplitPane>
+                   =20
+                    <JSplitPane name=3D"splitpaneGlobalErrorComment">
+                        <JScrollPane>
+                            <GlobalValidationModel id=3D"globalValidationMod=
el" />
+                            <JXTreeTable id=3D'validationGlobalErrorsTable' =
treeTableModel=3D"{globalValidationModel}"
+                                rootVisible=3D"false" showsRootHandles=3D"tr=
ue"
+                                treeCellRenderer=3D"{new ControlValidationRe=
nderer()}"
+                                onMouseClicked=3D"getHandler().showGlobalErr=
orTableContextMenu(this, event)"
+                                selectionMode=3D"{ListSelectionModel.SINGLE_=
SELECTION}" />
+                            <javax.swing.tree.TreeSelectionModel id=3D"globa=
lValidationTableSelectionModel"
+                                javaBean=3D"validationGlobalErrorsTable.getT=
reeSelectionModel()"
+                                onValueChanged=3D"getHandler().showSelectedE=
rror(this, event)" />
+                        </JScrollPane>
+                       =20
+                        <JScrollPane>
+                            <JXTextArea constructorParams=3D'_("coser.ui.com=
mon.comment")' rows=3D"3" />
+                        </JScrollPane>
+                    </JSplitPane>
+                </JSplitPane>
+            </JSplitPane>
         </cell>
-        <cell fill=3D"both" weightx=3D"1" weighty=3D"1">
-            <jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id=
=3D'errorsTableModel' />
-            <fr.ifremer.coser.data.Catch id=3D"beanCatch" javaBean=3D"null" =
/>
-            <fr.ifremer.coser.data.Haul id=3D"beanHaul" javaBean=3D"null" />
-            <fr.ifremer.coser.data.Strata id=3D"beanStrata" javaBean=3D"null=
" />
-            <fr.ifremer.coser.data.Length id=3D"beanLength" javaBean=3D"null=
" />
-            <BeanValidator id=3D'validatorCatch' bean=3D'beanCatch'
-                uiClass=3D"jaxx.runtime.validator.swing.ui.TranslucentValida=
tionUI"
-                errorTableModel=3D"errorsTableModel" />
-            <BeanValidator id=3D'validatorHaul' bean=3D'beanHaul'
-                uiClass=3D"jaxx.runtime.validator.swing.ui.TranslucentValida=
tionUI"
-                errorTableModel=3D"errorsTableModel" />
-            <BeanValidator id=3D'validatorStrata' bean=3D'beanStrata'
-                uiClass=3D"jaxx.runtime.validator.swing.ui.TranslucentValida=
tionUI"
-                errorTableModel=3D"errorsTableModel" />
-            <BeanValidator id=3D'validatorLength' bean=3D'beanLength'
-                uiClass=3D"jaxx.runtime.validator.swing.ui.TranslucentValida=
tionUI"
-                errorTableModel=3D"errorsTableModel" />
-            <JScrollPane>
-                <JTable id=3D'validationMessagesTable' autoCreateRowSorter=
=3D'true'
-                    rowSelectionAllowed=3D'true'
-                    model=3D'{errorsTableModel}' />
-            </JScrollPane>
-        </cell>
     </row>
     <row>
-        <cell fill=3D"both" weightx=3D"1" weighty=3D"1">
-            <JScrollPane>
-                <GlobalValidationModel id=3D"globalValidationModel" />
-                <JXTreeTable id=3D'validationGlobalErrorsTable' treeTableMod=
el=3D"{globalValidationModel}"
-                    rootVisible=3D"false" showsRootHandles=3D"true"
-                    treeCellRenderer=3D"{new ControlValidationRenderer()}"
-                    onMouseClicked=3D"getHandler().showGlobalErrorTableConte=
xtMenu(this, event)"
-                    selectionMode=3D"{ListSelectionModel.SINGLE_SELECTION}" =
/>
-                <javax.swing.tree.TreeSelectionModel id=3D"globalValidationT=
ableSelectionModel"
-                    javaBean=3D"validationGlobalErrorsTable.getTreeSelection=
Model()"
-                    onValueChanged=3D"getHandler().showSelectedError(this, e=
vent)" />
-            </JScrollPane>
-        </cell>
-        <cell fill=3D"both" weighty=3D"1">
-            <JScrollPane>
-                <JXTextArea constructorParams=3D'_("coser.ui.common.comment"=
)' rows=3D"3" />
-            </JScrollPane>
-        </cell>
-    </row>
-    <row>
         <cell anchor=3D"center" weightx=3D"1" fill=3D"horizontal" columns=3D=
"2">
             <ControlProgressBar id=3D"checkProgressBar" stringPainted=3D"tru=
e" />
         </cell>


--===============5960730850812243173==--