[Coser-commits] r182 - in trunk/coser-ui/src/main/java/fr/ifremer/coser/ui: . control

8 Nov 2010

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
===================================================================

--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java	2010-11-08 10:22:45 UTC (rev 181)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java	2010-11-08 13:37:01 UTC (rev 182)
@@ -36,6 +36,7 @@
 import java.util.Locale;
 import java.util.Map;
 
+import javax.mail.Session;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
@@ -381,6 +382,11 @@
 
             ControlView controlView = new ControlView(view);
             controlView.setHandler(new ControlHandler());
+
+            // restore session size
+            SwingSession session = (SwingSession)view.getContextValue(SwingSession.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/ControlView.jaxx
===================================================================
--- 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="controlView">
     <script><![CDATA[
     void $afterCompleteSetup() {
         // bean validation
@@ -59,91 +59,90 @@
     </row>
     <row>
         <cell fill="both" weightx="1" weighty="1" columns="2">
-            <JScrollPane>
-                <fr.ifremer.coser.ui.control.ControlDataTableModel id="controlDataTableModel" constructorParams="this" />
-                <JTable id='controlDataTable' model="{controlDataTableModel}"
-                    onMouseClicked="getHandler().showDataTableContextMenu(this, event)"/>
-                <ListSelectionModel id="controlDataTableSelectionModel" javaBean="controlDataTable.getSelectionModel()"
-                    onValueChanged="getHandler().controlDataTableSelectionChanged(this, event)" />
-            </JScrollPane>
-        </cell>
-    </row>
-    <row>
-        <cell fill="both" weightx="1" weighty="1">
-            <JScrollPane id="editionScrollPane">
-                <Table>
-                    <row>
-                        <cell weightx="1" weighty="1" fill="both" columns="3">
-                            <JPanel id="editionPanel" layout="{new GridBagLayout()}"/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell weightx="1" anchor="east">
-                            <JButton id="controlDataValidButton" text="coser.ui.common.valid"
-                                onActionPerformed="getHandler().validDataModification(this)"
-                                enabled="false" />
-                        </cell>
-                        <cell>
-                            <JButton id="controlDataCancelButton" text="coser.ui.common.cancel"
-                                onActionPerformed="getHandler().cancelDataModification(this)"
-                                enabled="false" />
-                        </cell>
-                        <cell>
-                            <JButton id="controlDataDeleteButton" text="coser.ui.control.deleteLine"
-                                onActionPerformed="getHandler().deleteData(this)"
-                                enabled="false" />
-                        </cell>
-                    </row>
-                </Table>
+            <JSplitPane name="splitpaneDataDetails" orientation="{JSplitPane.VERTICAL_SPLIT}">
+                <JScrollPane>
+                    <fr.ifremer.coser.ui.control.ControlDataTableModel id="controlDataTableModel" constructorParams="this" />
+                    <JTable id='controlDataTable' model="{controlDataTableModel}"
+                        onMouseClicked="getHandler().showDataTableContextMenu(this, event)"/>
+                    <ListSelectionModel id="controlDataTableSelectionModel" javaBean="controlDataTable.getSelectionModel()"
+                        onValueChanged="getHandler().controlDataTableSelectionChanged(this, event)" />
+                </JScrollPane>
                 
-            </JScrollPane>
+                <JSplitPane name="splitpaneDetail" orientation="{JSplitPane.VERTICAL_SPLIT}">
+                    <JSplitPane name="splitpaneDataDetailError">
+                        <JScrollPane id="editionScrollPane">
+                            <Table>
+                                <row>
+                                    <cell weightx="1" fill="horizontal">
+                                        <JButton id="controlDataValidButton" text="coser.ui.common.valid"
+                                            onActionPerformed="getHandler().validDataModification(this)"
+                                            enabled="false" />
+                                    </cell>
+                                    <cell weightx="1" fill="horizontal">
+                                        <JButton id="controlDataCancelButton" text="coser.ui.common.cancel"
+                                            onActionPerformed="getHandler().cancelDataModification(this)"
+                                            enabled="false" />
+                                    </cell>
+                                    <cell weightx="1" fill="horizontal">
+                                        <JButton id="controlDataDeleteButton" text="coser.ui.control.deleteLine"
+                                            onActionPerformed="getHandler().deleteData(this)"
+                                            enabled="false" />
+                                    </cell>
+                                </row>
+                                <row>
+                                    <cell weightx="1" weighty="1" fill="both" columns="3">
+                                        <JPanel id="editionPanel" layout="{new GridBagLayout()}"/>
+                                    </cell>
+                                </row>
+                            </Table>
+                        </JScrollPane>
+                        
+                        <jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id='errorsTableModel' />
+                        <fr.ifremer.coser.data.Catch id="beanCatch" javaBean="null" />
+                        <fr.ifremer.coser.data.Haul id="beanHaul" javaBean="null" />
+                        <fr.ifremer.coser.data.Strata id="beanStrata" javaBean="null" />
+                        <fr.ifremer.coser.data.Length id="beanLength" javaBean="null" />
+                        <BeanValidator id='validatorCatch' bean='beanCatch'
+                            uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"
+                            errorTableModel="errorsTableModel" />
+                        <BeanValidator id='validatorHaul' bean='beanHaul'
+                            uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"
+                            errorTableModel="errorsTableModel" />
+                        <BeanValidator id='validatorStrata' bean='beanStrata'
+                            uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"
+                            errorTableModel="errorsTableModel" />
+                        <BeanValidator id='validatorLength' bean='beanLength'
+                            uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"
+                            errorTableModel="errorsTableModel" />
+                        <JScrollPane>
+                            <JTable id='validationMessagesTable' autoCreateRowSorter='true'
+                                rowSelectionAllowed='true'
+                                model='{errorsTableModel}' />
+                        </JScrollPane>
+                    </JSplitPane>
+                    
+                    <JSplitPane name="splitpaneGlobalErrorComment">
+                        <JScrollPane>
+                            <GlobalValidationModel id="globalValidationModel" />
+                            <JXTreeTable id='validationGlobalErrorsTable' treeTableModel="{globalValidationModel}"
+                                rootVisible="false" showsRootHandles="true"
+                                treeCellRenderer="{new ControlValidationRenderer()}"
+                                onMouseClicked="getHandler().showGlobalErrorTableContextMenu(this, event)"
+                                selectionMode="{ListSelectionModel.SINGLE_SELECTION}" />
+                            <javax.swing.tree.TreeSelectionModel id="globalValidationTableSelectionModel"
+                                javaBean="validationGlobalErrorsTable.getTreeSelectionModel()"
+                                onValueChanged="getHandler().showSelectedError(this, event)" />
+                        </JScrollPane>
+                        
+                        <JScrollPane>
+                            <JXTextArea constructorParams='_("coser.ui.common.comment")' rows="3" />
+                        </JScrollPane>
+                    </JSplitPane>
+                </JSplitPane>
+            </JSplitPane>
         </cell>
-        <cell fill="both" weightx="1" weighty="1">
-            <jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id='errorsTableModel' />
-            <fr.ifremer.coser.data.Catch id="beanCatch" javaBean="null" />
-            <fr.ifremer.coser.data.Haul id="beanHaul" javaBean="null" />
-            <fr.ifremer.coser.data.Strata id="beanStrata" javaBean="null" />
-            <fr.ifremer.coser.data.Length id="beanLength" javaBean="null" />
-            <BeanValidator id='validatorCatch' bean='beanCatch'
-                uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"
-                errorTableModel="errorsTableModel" />
-            <BeanValidator id='validatorHaul' bean='beanHaul'
-                uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"
-                errorTableModel="errorsTableModel" />
-            <BeanValidator id='validatorStrata' bean='beanStrata'
-                uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"
-                errorTableModel="errorsTableModel" />
-            <BeanValidator id='validatorLength' bean='beanLength'
-                uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI"
-                errorTableModel="errorsTableModel" />
-            <JScrollPane>
-                <JTable id='validationMessagesTable' autoCreateRowSorter='true'
-                    rowSelectionAllowed='true'
-                    model='{errorsTableModel}' />
-            </JScrollPane>
-        </cell>
     </row>
     <row>
-        <cell fill="both" weightx="1" weighty="1">
-            <JScrollPane>
-                <GlobalValidationModel id="globalValidationModel" />
-                <JXTreeTable id='validationGlobalErrorsTable' treeTableModel="{globalValidationModel}"
-                    rootVisible="false" showsRootHandles="true"
-                    treeCellRenderer="{new ControlValidationRenderer()}"
-                    onMouseClicked="getHandler().showGlobalErrorTableContextMenu(this, event)"
-                    selectionMode="{ListSelectionModel.SINGLE_SELECTION}" />
-                <javax.swing.tree.TreeSelectionModel id="globalValidationTableSelectionModel"
-                    javaBean="validationGlobalErrorsTable.getTreeSelectionModel()"
-                    onValueChanged="getHandler().showSelectedError(this, event)" />
-            </JScrollPane>
-        </cell>
-        <cell fill="both" weighty="1">
-            <JScrollPane>
-                <JXTextArea constructorParams='_("coser.ui.common.comment")' rows="3" />
-            </JScrollPane>
-        </cell>
-    </row>
-    <row>
         <cell anchor="center" weightx="1" fill="horizontal" columns="2">
             <ControlProgressBar id="checkProgressBar" stringPainted="true" />
         </cell>

    

[Coser-commits] r182 - in trunk/coser-ui/src/main/java/fr/ifremer/coser/ui: . control

chatellier＠users.labs.libre-entreprise.org