r42 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: . content/cruise content/operation - Tutti-commits

12 Dec 2012

Author: kmorin
Date: 2012-12-12 16:14:19 +0100 (Wed, 12 Dec 2012)
New Revision: 42

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/42

Log:
refs #1790

Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUIHandler.java

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java
===================================================================

--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java	2012-12-11 14:29:06 UTC (rev 41)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java	2012-12-12 15:14:19 UTC (rev 42)
@@ -62,6 +62,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import jaxx.runtime.swing.editor.bean.BeanDoubleList;
 
 /**
  * Contract of any UI handler.
@@ -188,11 +189,11 @@
      * @param listHeader le component graphique à initialiser
      */
     protected <E extends IdAware> void initBeanList(
-            BeanListHeader<E> listHeader,
+            BeanDoubleList<E> list,
             List<E> data,
             List<E> selectedData) {
 
-        Class<E> beanType = listHeader.getBeanType();
+        Class<E> beanType = list.getBeanType();
 
         DecoratorService decoratorService =
                 context.getService(DecoratorService.class);
@@ -204,15 +205,15 @@
         }
 
         // add data list to combo box
-        listHeader.init((JXPathDecorator<E>) decorator, data);
+        list.init((JXPathDecorator<E>) decorator, data, selectedData);
+        
+//        OneClicListSelectionModel.installModel(listHeader.getList());
 
-        OneClicListSelectionModel.installModel(listHeader.getList());
+//        updateIndices(listHeader.getList(), selectedData);
 
-        updateIndices(listHeader.getList(), selectedData);
-
         if (log.isDebugEnabled()) {
             log.debug("Jlist [" + beanType.getName() + "] : " +
-                      listHeader.getData().size());
+                      list.getUniverseList().getModel().getSize());
         }
     }
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css	2012-12-11 14:29:06 UTC (rev 41)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css	2012-12-12 15:14:19 UTC (rev 42)
@@ -32,9 +32,8 @@
   bean: {model};
 }
 
-BeanListHeader {
-  showReset: true;
-  i18nPrefix: "tutti.property.";
+BeanDoubleList {
+  bean: {model};
 }
 
 JList {
@@ -138,48 +137,24 @@
   numberPattern: {INT_1_DIGITS_PATTERN};
 }
 
-#vesselPane {
-  horizontalScrollBarPolicy: {JScrollPane.HORIZONTAL_SCROLLBAR_NEVER};
-  verticalScrollBarPolicy: {JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED};
-}
-
-#vesselHeader {
-  labelText: {_("tutti.label.list.vessel")};
-  list: {vesselList};
+#vesselList {
   beanType: {Vessel.class};
+  property: "vessel";
 }
 
-#gearPane {
-  horizontalScrollBarPolicy: {JScrollPane.HORIZONTAL_SCROLLBAR_NEVER};
-  verticalScrollBarPolicy: {JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED};
-}
-
-#gearHeader {
-  labelText: {_("tutti.label.list.gear")};
-  list: {gearList};
+#gearList {
   beanType: {Gear.class};
+  property: "gear";
 }
 
-#headOfMissionPane {
-  horizontalScrollBarPolicy: {JScrollPane.HORIZONTAL_SCROLLBAR_NEVER};
-  verticalScrollBarPolicy: {JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED};
-}
-
-#headOfMissionHeader {
-  labelText: {_("tutti.label.list.headOfMission")};
-  list: {headOfMissionList};
+#headOfMissionList {
   beanType: {Person.class};
+  property: "headOfMission";
 }
 
-#headOfSortRoomPane {
-  horizontalScrollBarPolicy: {JScrollPane.HORIZONTAL_SCROLLBAR_NEVER};
-  verticalScrollBarPolicy: {JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED};
-}
-
-#headOfSortRoomHeader {
-  labelText: {_("tutti.label.list.headOfSortRoom")};
-  list: {headOfSortRoomList};
+#headOfSortRoomList {
   beanType: {Person.class};
+  property: "headOfSortRoom";
 }
 
 #commentPane {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx	2012-12-11 14:29:06 UTC (rev 41)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx	2012-12-12 15:14:19 UTC (rev 42)
@@ -35,6 +35,7 @@
     jaxx.runtime.swing.editor.NumberEditor
     jaxx.runtime.swing.editor.bean.BeanComboBox
     jaxx.runtime.swing.editor.bean.BeanListHeader
+    jaxx.runtime.swing.editor.bean.BeanDoubleList
 
     jaxx.runtime.validator.swing.SwingValidatorUtil
     jaxx.runtime.validator.swing.SwingValidatorMessageTableModel
@@ -81,10 +82,10 @@
     <field name='country' component='countryComboBox'/>
     <field name='beginDate' component='beginDateField'/>
     <field name='endDate' component='endDateField'/>
-    <field name='vessel' component='vesselPane'/>
-    <field name='gear' component='gearPane'/>
-    <field name='headOfMission' component='headOfMissionPane'/>
-    <field name='headOfSortRoom' component='headOfSortRoomPane'/>
+    <field name='vessel' component='vesselList'/>
+    <field name='gear' component='gearList'/>
+    <field name='headOfMission' component='headOfMissionList'/>
+    <field name='headOfSortRoom' component='headOfSortRoomList'/>
     <field name='comment' component='commentField'/>
   </BeanValidator>
 
@@ -165,18 +166,20 @@
       <row weighty='0.3'>
         <cell columns='6'>
           <JPanel layout='{new GridLayout(1, 0)}'>
-            <JScrollPane id='vesselPane' columnHeaderView="{vesselHeader}"
+<!--            <JScrollPane id='vesselPane' columnHeaderView="{vesselHeader}"
                          onFocusGained='vesselList.requestFocus()'>
               <JList id='vesselList'
                      onValueChanged='handler.selectListData(event, "vessel")'/>
               <BeanListHeader id='vesselHeader' genericType='Vessel'/>
-            </JScrollPane>
-            <JScrollPane id='gearPane' columnHeaderView="{gearHeader}"
+            </JScrollPane>-->
+            <BeanDoubleList id='vesselList' genericType='Vessel'/>
+<!--            <JScrollPane id='gearPane' columnHeaderView="{gearHeader}"
                          onFocusGained='gearList.requestFocus()'>
               <JList id='gearList'
                      onValueChanged='handler.selectListData(event, "gear")'/>
               <BeanListHeader id='gearHeader' genericType='Gear'/>
-            </JScrollPane>
+            </JScrollPane>-->
+            <BeanDoubleList id='gearList' genericType='Gear'/>
           </JPanel>
         </cell>
       </row>
@@ -186,22 +189,24 @@
         <cell columns='6'>
           <JPanel layout='{new GridLayout(1, 0)}'>
 
-            <JScrollPane id='headOfMissionPane'
+<!--            <JScrollPane id='headOfMissionPane'
                          columnHeaderView="{headOfMissionHeader}"
                          onFocusGained='headOfMissionList.requestFocus()'>
               <JList id='headOfMissionList'
                      onValueChanged='handler.selectListData(event, "headOfMission")'/>
               <BeanListHeader id='headOfMissionHeader'
                               genericType='Person'/>
-            </JScrollPane>
-            <JScrollPane id='headOfSortRoomPane'
+            </JScrollPane>-->
+            <BeanDoubleList id='headOfMissionList' genericType='Person'/>
+<!--            <JScrollPane id='headOfSortRoomPane'
                          columnHeaderView="{headOfSortRoomHeader}"
                          onFocusGained='headOfSortRoomList.requestFocus()'>
               <JList id='headOfSortRoomList'
                      onValueChanged='handler.selectListData(event, "headOfSortRoom")'/>
               <BeanListHeader id='headOfSortRoomHeader'
                               genericType='Person'/>
-            </JScrollPane>
+            </JScrollPane>-->
+            <BeanDoubleList id='headOfSortRoomList' genericType='Person'/>
           </JPanel>
         </cell>
       </row>

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java	2012-12-11 14:29:06 UTC (rev 41)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java	2012-12-12 15:14:19 UTC (rev 42)
@@ -98,19 +98,19 @@
                          persistenceService.getAllCountry(),
                          model.getCountry());
 
-        initBeanList(ui.getVesselHeader(),
+        initBeanList(ui.getVesselList(),
                      persistenceService.getAllVessel(),
                      model.getVessel());
 
-        initBeanList(ui.getGearHeader(),
+        initBeanList(ui.getGearList(),
                      persistenceService.getAllGear(),
                      model.getGear());
 
-        initBeanList(ui.getHeadOfMissionHeader(),
+        initBeanList(ui.getHeadOfMissionList(),
                      users,
                      model.getHeadOfMission());
 
-        initBeanList(ui.getHeadOfSortRoomHeader(),
+        initBeanList(ui.getHeadOfSortRoomList(),
                      users,
                      model.getHeadOfSortRoom());
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.css	2012-12-11 14:29:06 UTC (rev 41)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.css	2012-12-12 15:14:19 UTC (rev 42)
@@ -32,9 +32,8 @@
   bean: {model};
 }
 
-BeanListHeader {
-  showReset: true;
-  i18nPrefix: "tutti.property.";
+BeanDoubleList {
+  bean: {model};
 }
 
 JList {
@@ -331,15 +330,9 @@
   numberPattern: {INT_6_DIGITS_PATTERN};
 }
 
-#saisisseurPane {
-  horizontalScrollBarPolicy: {JScrollPane.HORIZONTAL_SCROLLBAR_NEVER};
-  verticalScrollBarPolicy: {JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED};
-}
-
-#saisisseurHeader {
-  labelText: {_("tutti.label.list.saisisseur")};
-  list: {saisisseurList};
+#saisisseurList {
   beanType: {Person.class};
+  property: "saisisseur";
 }
 
 #commentPane {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.jaxx	2012-12-11 14:29:06 UTC (rev 41)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.jaxx	2012-12-12 15:14:19 UTC (rev 42)
@@ -35,6 +35,7 @@
 
     jaxx.runtime.swing.editor.bean.BeanComboBox
     jaxx.runtime.swing.editor.bean.BeanListHeader
+    jaxx.runtime.swing.editor.bean.BeanDoubleList
     jaxx.runtime.swing.editor.NumberEditor
     jaxx.runtime.swing.editor.TimeEditor
 
@@ -80,7 +81,7 @@
            component='fishingOperationNumberField'/>
     <field name='date' component='dateField'/>
     <field name='comment' component='commentField'/>
-    <field name='saisisseur' component='saisisseurPane'/>
+    <field name='saisisseur' component='saisisseurList'/>
   </BeanValidator>
 
   <JPanel id='traitPane' constraints='BorderLayout.CENTER'
@@ -272,13 +273,14 @@
           <!-- Saisisseur -->
           <row weighty='0.3'>
             <cell columns='6'>
-              <JScrollPane id='saisisseurPane'
+<!--              <JScrollPane id='saisisseurPane'
                            columnHeaderView="{saisisseurHeader}"
                            onFocusGained='saisisseurList.requestFocus()'>
                 <JList id='saisisseurList'
                        onValueChanged='handler.selectListData(event, "saisisseur")'/>
                 <BeanListHeader id='saisisseurHeader' genericType='Person'/>
-              </JScrollPane>
+              </JScrollPane>-->
+              <BeanDoubleList id='saisisseurList' genericType='Person'/>
             </cell>
           </row>
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUIHandler.java	2012-12-11 14:29:06 UTC (rev 41)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUIHandler.java	2012-12-12 15:14:19 UTC (rev 42)
@@ -102,7 +102,7 @@
 
         initUI(ui);
 
-        initBeanList(ui.getSaisisseurHeader(),
+        initBeanList(ui.getSaisisseurList(),
                      persistenceService.getAllPerson(),
                      model.getSaisisseur());
 
@@ -134,35 +134,35 @@
 
     public void selectFishingOperation(FishingOperation bean) {
 
-        boolean empty = bean == null;
-
-        FishingOperationTabUIModel model = getModel();
-
-        // clean previous selection
-        ui.getSaisisseurHeader().getList().clearSelection();
-
-        if (empty) {
-
-            model.fromBean(new FishingOperation());
-        } else {
-
-            model.fromBean(bean);
-        }
-
-        // update saisissuer selection
-        List<Person> saisisseur = model.getSaisisseur();
-        if (CollectionUtils.isNotEmpty(saisisseur)) {
-            updateIndices(ui.getSaisisseurList(), saisisseur);
-        }
-
-        // update model empty property
-        model.setEmpty(empty);
-
-        // reload bean in validator (? really mandatory?)
-//        ui.getValidator().reloadBean();
-
-        // if new fishingOperation can already cancel his creation
-        model.setModify(!empty && model.isCreate());
+//        boolean empty = bean == null;
+//
+//        FishingOperationTabUIModel model = getModel();
+//
+//        // clean previous selection
+//        ui.getSaisisseurList().getList().clearSelection();
+//
+//        if (empty) {
+//
+//            model.fromBean(new FishingOperation());
+//        } else {
+//
+//            model.fromBean(bean);
+//        }
+//
+//        // update saisissuer selection
+//        List<Person> saisisseur = model.getSaisisseur();
+//        if (CollectionUtils.isNotEmpty(saisisseur)) {
+//            updateIndices(ui.getSaisisseurList(), saisisseur);
+//        }
+//
+//        // update model empty property
+//        model.setEmpty(empty);
+//
+//        // reload bean in validator (? really mandatory?)
+////        ui.getValidator().reloadBean();
+//
+//        // if new fishingOperation can already cancel his creation
+//        model.setModify(!empty && model.isCreate());
     }
 
     public void cancel() {

    

r42 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: . content/cruise content/operation

kmorin＠users.forge.codelutin.com

tags

participants (1)