From kmorin@users.forge.codelutin.com Tue Dec 18 14:07:34 2012
From: kmorin@users.forge.codelutin.com
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] r87 - in trunk/tutti-ui-swing/src/main:
	java/fr/ifremer/tutti/ui/swing/content/operation
	java/fr/ifremer/tutti/ui/swing/content/operation/fishing
	java/fr/ifremer/tutti/ui/swing/content/operation/species
	java/fr/ifremer/tutti/ui/swing/util/editor resources/i18n
Date: Tue, 18 Dec 2012 14:07:34 +0100
Message-ID: <20121218130734.9613F15A95@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9183711150791901465=="

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

Author: kmorin
Date: 2012-12-18 14:07:34 +0100 (Tue, 18 Dec 2012)
New Revision: 87

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

Log:
- use a table instead of a form in the environment tab
- keep the ofcus on the table after exiting an editor

Added:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/fishing/
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/fishing/EnvironmentRowModel.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/fishing/EnvironmentTabUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/fishing/EnvironmentTabUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/fishing/EnvironmentTabUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/fishing/EnvironmentTabUIModel.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/fishing/EnvironmentTableModel.java
Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/FishingOperationTabUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/FishingOperationTabUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/species/FrequencyCellComponent.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/A=
ttachmentCellComponent.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/A=
ttachmentEditorUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/A=
ttachmentEditorUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/L=
ongTextCellComponent.java
   trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properti=
es

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/FishingOperationTabUI.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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/FishingOperationTabUI.jaxx	2012-12-18 10:50:00 UTC (rev 86)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/FishingOperationTabUI.jaxx	2012-12-18 13:07:34 UTC (rev 87)
@@ -32,6 +32,7 @@
     fr.ifremer.tutti.persistence.entities.referential.Person
=20
     fr.ifremer.tutti.ui.swing.util.editor.SimpleTimeEditor
+    fr.ifremer.tutti.ui.swing.content.operation.fishing.EnvironmentTabUI
=20
     jaxx.runtime.swing.editor.bean.BeanComboBox
     jaxx.runtime.swing.editor.bean.BeanListHeader
@@ -43,6 +44,7 @@
     jaxx.runtime.validator.swing.SwingValidatorMessageTableModel
=20
     org.jdesktop.swingx.JXDatePicker
+    org.jdesktop.swingx.JXTable
=20
     java.awt.Dimension
=20
@@ -386,9 +388,10 @@
       <tab id=3D'environmentTab'
            title=3D'tutti.label.tab.fishingOperation.environment'>
=20
-        <Table fill=3D'both' id=3D'environmentForm'>
+        <EnvironmentTabUI id=3D'environmentTabContent' constructorParams=3D'=
this'/>
+<!--        <Table fill=3D'both' id=3D'environmentForm'>
=20
-          <!-- Beaufort scale -->
+           Beaufort scale=20
           <row>
             <cell anchor=3D'west'>
               <JLabel id=3D'beaufortScaleLabel'/>
@@ -399,7 +402,7 @@
             </cell>
           </row>
=20
-          <!-- Wind direction -->
+           Wind direction=20
           <row>
             <cell anchor=3D'west'>
               <JLabel id=3D'windDirectionLabel'/>
@@ -409,7 +412,7 @@
             </cell>
           </row>
=20
-          <!-- Sea state-->
+           Sea state
           <row>
             <cell anchor=3D'west'>
               <JLabel id=3D'seaStateLabel'/>
@@ -419,7 +422,7 @@
                             genericType=3D'SeaState'/>
             </cell>
           </row>
-        </Table>
+        </Table>-->
       </tab>
=20
       <tab id=3D'traitHydrologyTabContent'

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/FishingOperationTabUIHandler.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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/FishingOperationTabUIHandler.java	2012-12-18 10:50:00 UTC (rev 86)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/FishingOperationTabUIHandler.java	2012-12-18 13:07:34 UTC (rev 87)
@@ -105,18 +105,18 @@
                      persistenceService.getAllPerson(),
                      model.getSaisisseur());
=20
-        initBeanComboBox(ui.getBeaufortScaleComboBox(),
-                         persistenceService.getAllBeaufortScale(),
-                         model.getBeaufortScale());
+//        initBeanComboBox(ui.getBeaufortScaleComboBox(),
+//                         persistenceService.getAllBeaufortScale(),
+//                         model.getBeaufortScale());
+//
+//        initBeanComboBox(ui.getStrataComboBox(),
+//                         persistenceService.getAllStrata(),
+//                         model.getStrata());
+//
+//        initBeanComboBox(ui.getSeaStateComboBox(),
+//                         persistenceService.getAllSeaState(),
+//                         model.getSeaState());
=20
-        initBeanComboBox(ui.getStrataComboBox(),
-                         persistenceService.getAllStrata(),
-                         model.getStrata());
-
-        initBeanComboBox(ui.getSeaStateComboBox(),
-                         persistenceService.getAllSeaState(),
-                         model.getSeaState());
-
         model.setEmpty(true);
=20
         listenValidatorValid(ui.getValidator(), getModel());
@@ -154,6 +154,8 @@
=20
         // if new fishingOperation can already cancel his creation
         model.setModify(!empty && model.isCreate());
+       =20
+        ui.getEnvironmentTabContent().getHandler().afterInitUI();
     }
=20
     public void cancel() {

Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/fishing/EnvironmentRowModel.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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/fishing/EnvironmentRowModel.java	                        (rev 0)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/fishing/EnvironmentRowModel.java	2012-12-18 13:07:34 UTC (rev 87)
@@ -0,0 +1,70 @@
+package fr.ifremer.tutti.ui.swing.content.operation.fishing;
+
+import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel;
+import java.io.Serializable;
+import org.nuiton.util.beans.Binder;
+import org.nuiton.util.beans.BinderFactory;
+
+/**
+ *
+ * @author kmorin
+ * @since 0.3
+ */
+public class EnvironmentRowModel extends AbstractTuttiBeanUIModel<Object, En=
vironmentRowModel> {
+   =20
+    public static final String PROPERTY_KEY =3D "key";
+    public static final String PROPERTY_VALUE =3D "value";
+   =20
+    protected static final Binder<Object, EnvironmentRowModel> fromBeanBinde=
r =3D
+            BinderFactory.newBinder(Object.class,
+                                    EnvironmentRowModel.class);
+
+    protected static final Binder<EnvironmentRowModel, Object> toBeanBinder =
=3D
+            BinderFactory.newBinder(EnvironmentRowModel.class,
+                                    Object.class);
+   =20
+    protected String key;
+   =20
+    protected String value;
+
+    public EnvironmentRowModel() {
+        super(Object.class, fromBeanBinder, toBeanBinder);
+    }
+   =20
+    public EnvironmentRowModel(String key) {
+        this();
+        this.key =3D key;
+    }
+//
+//    public FishingOperationEnvironmentRowModel(Object o,
+//                                List<SpeciesBatchFrequency> frequencies) {
+//        this();
+//        fromBean(aBatch);
+//        List<SpeciesFrequencyRowModel> frequencyRows =3D
+//                SpeciesFrequencyRowModel.fromBeans(frequencies);
+//        frequency.addAll(frequencyRows);
+//        Collections.sort(frequency);
+//        updateTotalFromFrequencies();
+//    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        Object oldValue =3D getKey();
+        this.key =3D key;
+        firePropertyChange(PROPERTY_KEY, oldValue, key);
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        Object oldValue =3D getValue();
+        this.value =3D value;
+        firePropertyChange(PROPERTY_VALUE, oldValue, value);
+    }
+   =20
+}

Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/fishing/EnvironmentTabUI.css
=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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/fishing/EnvironmentTabUI.css	                        (rev 0)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/fishing/EnvironmentTabUI.css	2012-12-18 13:07:34 UTC (rev 87)
@@ -0,0 +1,6 @@
+#environmentTable {
+  selectionMode: {ListSelectionModel.SINGLE_SELECTION};
+  selectionBackground: {null};
+  selectionForeground: {Color.BLACK};
+  sortable: false;
+}
\ No newline at end of file

Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/fishing/EnvironmentTabUI.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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/fishing/EnvironmentTabUI.jaxx	                        (rev 0)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/fishing/EnvironmentTabUI.jaxx	2012-12-18 13:07:34 UTC (rev 87)
@@ -0,0 +1,46 @@
+<Table implements=3D'fr.ifremer.tutti.ui.swing.TuttiUI&lt;EnvironmentTabUIMo=
del, EnvironmentTabUIHandler&gt;'>
+ =20
+  <import>
+    org.jdesktop.swingx.JXTable
+    fr.ifremer.tutti.ui.swing.content.operation.FishingOperationTabUI
+    javax.swing.ListSelectionModel
+    java.awt.Color
+  </import>
+   =20
+  <EnvironmentTabUIHandler id=3D'handler'
+                         initializer=3D'getContextValue(EnvironmentTabUIHand=
ler.class)'/>
+
+  <EnvironmentTabUIModel id=3D'model'
+                       initializer=3D'getContextValue(EnvironmentTabUIModel.=
class)'/>
+ =20
+  <row fill=3D'both'>
+    <cell fill=3D'both' weightx=3D'1'>
+      <JComboBox id=3D'newRowKey'/>
+    </cell>
+    <cell fill=3D'both'>
+      <JButton id=3D'addRow' actionIcon=3D'add'
+               onActionPerformed=3D'handler.addRow()'/>
+    </cell>
+  </row>
+  <row fill=3D'both' weighty=3D'1'>
+    <cell fill=3D'both' columns=3D'2'>
+      <JScrollPane>
+        <JXTable id=3D'environmentTable'/>
+      </JScrollPane>
+    </cell>
+  </row>
+  <script><![CDATA[
+
+public EnvironmentTabUI(FishingOperationTabUI parentUI) {
+    EnvironmentTabUIHandler handler =3D new EnvironmentTabUIHandler(parentUI=
, this);
+    setContextValue(handler);
+    handler.beforeInitUI();
+}
+
+protected void $afterCompleteSetup() {
+    handler.afterInitUI();=20
+}
+
+  ]]></script>
+ =20
+</Table>
\ No newline at end of file

Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/fishing/EnvironmentTabUIHandler.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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/fishing/EnvironmentTabUIHandler.java	                        (rev 0)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/fishing/EnvironmentTabUIHandler.java	2012-12-18 13:07:34 UTC (rev 87)
@@ -0,0 +1,170 @@
+package fr.ifremer.tutti.ui.swing.content.operation.fishing;
+
+import com.google.common.collect.Lists;
+import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationTabUI;
+import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel;
+import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.List;
+import java.util.logging.Logger;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JComboBox;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
+import javax.swing.plaf.basic.BasicComboBoxUI.ListDataHandler;
+import javax.swing.table.TableColumnModel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jdesktop.swingx.JXTable;
+import org.jdesktop.swingx.table.DefaultTableColumnModelExt;
+
+/**
+ *
+ * @author kmorin
+ * @since 0.3
+ */
+public class EnvironmentTabUIHandler extends AbstractTuttiTableUIHandler<Env=
ironmentRowModel, EnvironmentTabUIModel> {
+
+    private final static Log log =3D LogFactory.getLog(EnvironmentTabUIHandl=
er.class);
+   =20
+    protected EnvironmentTabUI ui;
+   =20
+    public EnvironmentTabUIHandler(FishingOperationTabUI parentUi, Environme=
ntTabUI ui) {
+        super(parentUi.getHandler().getContext());
+        this.ui =3D ui;
+    }
+           =20
+    @Override
+    protected JXTable getTable() {
+        return ui.getEnvironmentTable();
+    }
+
+    @Override
+    protected AbstractTuttiTableModel<EnvironmentRowModel> getTableModel() {
+        return (EnvironmentTableModel) getTable().getModel();
+    }
+
+    @Override
+    protected TableColumnModel createTableColumnModel() {
+        DefaultTableColumnModelExt columnModel =3D
+                new DefaultTableColumnModelExt();
+
+        {
+
+            addColumnToModel(columnModel, EnvironmentTableModel.KEY);
+        }
+       =20
+        {
+
+            addColumnToModel(columnModel, EnvironmentTableModel.VALUE);
+        }
+
+
+        return columnModel;
+    }
+
+    @Override
+    protected void onRowModified(EnvironmentRowModel row, String propertyNam=
e, Object oldValue, Object newValue) {
+    }
+
+    @Override
+    protected void onRowValidStateChanged(EnvironmentRowModel row, Boolean o=
ldValue, Boolean newValue) {
+    }
+
+    @Override
+    protected void onRowModifyStateChanged(EnvironmentRowModel row, Boolean =
oldValue, Boolean newValue) {
+    }
+
+    @Override
+    public void beforeInitUI() {
+        EnvironmentTabUIModel model =3D new EnvironmentTabUIModel();
+        ui.setContextValue(model);
+    }
+
+    @Override
+    public void afterInitUI() {
+        initUI(ui);
+       =20
+        JXTable table =3D getTable();
+
+        // create table column model
+        TableColumnModel columnModel =3D createTableColumnModel();
+
+        // create table model
+        EnvironmentTableModel tableModel =3D
+                new EnvironmentTableModel(columnModel);
+
+        table.setModel(tableModel);
+        table.setColumnModel(columnModel);
+       =20
+        final JComboBox keyCombo =3D ui.getNewRowKey();
+        keyCombo.setModel(new DefaultComboBoxModel());
+       =20
+        keyCombo.addItemListener(new ItemListener() {
+
+            public void itemStateChanged(ItemEvent e) {
+                log.debug("item state changed " + e.paramString());
+            }
+        });
+        keyCombo.getModel().addListDataListener(new ListDataListener() {
+
+            public void intervalAdded(ListDataEvent e) {
+                keyCombo.setEnabled(true);
+                ui.getAddRow().setEnabled(true);
+            }
+
+            public void intervalRemoved(ListDataEvent e) {
+                if (keyCombo.getItemCount() =3D=3D 0) {
+                    keyCombo.setEnabled(false);
+                    ui.getAddRow().setEnabled(false);
+                }
+            }
+
+            public void contentsChanged(ListDataEvent e) {
+                keyCombo.setEnabled(true);
+                ui.getAddRow().setEnabled(true);
+            }
+        });
+       =20
+        reset();
+    }
+   =20
+    @Override
+    public void onCloseUI() {
+    }
+
+    @Override
+    protected EnvironmentTabUIModel getModel() {
+        return ui.getModel();
+    }
+   =20
+    public void addRow() {
+        JComboBox keyCombo =3D ui.getNewRowKey();
+        String key =3D (String) keyCombo.getSelectedItem();
+        EnvironmentRowModel row =3D new EnvironmentRowModel(key);
+        getTableModel().addNewRow(getTable().getRowCount(), row);
+       =20
+        keyCombo.removeItem(key);
+    }
+   =20
+    public void reset() {
+        List<EnvironmentRowModel> rows =3D Lists.newArrayList();
+        List<String> defaultKeys =3D Lists.newArrayList(ui.getModel().getDef=
aultKeys());
+        for (String key : defaultKeys) {
+            rows.add(new EnvironmentRowModel(key));
+        }
+       =20
+        AbstractTuttiTableModel<EnvironmentRowModel> tableModel =3D getTable=
Model();
+        tableModel.setRows(rows);
+       =20
+        JComboBox keyCombo =3D ui.getNewRowKey();
+        DefaultComboBoxModel keyComboModel =3D (DefaultComboBoxModel)keyComb=
o.getModel();
+        for (String key : ui.getModel().getKeys()) {
+            if (!defaultKeys.contains(key)) {
+                keyComboModel.addElement(key);
+            }
+        }
+    }
+   =20
+}

Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/fishing/EnvironmentTabUIModel.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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/fishing/EnvironmentTabUIModel.java	                        (rev 0)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/fishing/EnvironmentTabUIModel.java	2012-12-18 13:07:34 UTC (rev 87)
@@ -0,0 +1,59 @@
+package fr.ifremer.tutti.ui.swing.content.operation.fishing;
+
+import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
+import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel;
+import org.nuiton.util.beans.Binder;
+import org.nuiton.util.beans.BinderModelBuilder;
+
+import static org.nuiton.i18n.I18n._;
+
+/**
+ *
+ * @author kmorin
+ */
+public class EnvironmentTabUIModel extends AbstractTuttiTableUIModel<Fishing=
Operation, EnvironmentRowModel, EnvironmentTabUIModel> {
+   =20
+    protected FishingOperation fishingOperation;
+   =20
+    public static final String KEY_BEAUFORT_SCALE =3D "beaufortScale";
+    public static final String KEY_WIND_DIRECTION =3D "windDirection";
+    public static final String KEY_SEA_STATE =3D "seaState";
+   =20
+    protected static final Binder<FishingOperation, EnvironmentTabUIModel> f=
romBeanBinder =3D BinderModelBuilder.newEmptyBuilder(FishingOperation.class, =
EnvironmentTabUIModel.class)
+            .toBinder();
+
+    protected static final Binder<EnvironmentTabUIModel, FishingOperation> t=
oBeanBinder =3D BinderModelBuilder.newEmptyBuilder(EnvironmentTabUIModel.clas=
s, FishingOperation.class)
+            .toBinder();
+
+    public EnvironmentTabUIModel() {
+        super(FishingOperation.class, fromBeanBinder, toBeanBinder);
+    }
+   =20
+    public FishingOperation getFishingOperation() {
+        return fishingOperation;
+    }
+
+    public void setFishingOperation(FishingOperation fishingOperation) {
+        this.fishingOperation =3D fishingOperation;
+    }
+   =20
+    public String[] getKeys() {
+        return new String[] {
+            _("tutti.table.fishing.environment.keys." + KEY_BEAUFORT_SCALE),
+            _("tutti.table.fishing.environment.keys." + KEY_WIND_DIRECTION),
+            _("tutti.table.fishing.environment.keys." + KEY_SEA_STATE),
+            _("tutti.table.fishing.environment.keys." + "key3"),
+            _("tutti.table.fishing.environment.keys." + "key4"),
+            _("tutti.table.fishing.environment.keys." + "key5")
+        };
+    }
+   =20
+    public String[] getDefaultKeys() {
+        return new String[] {
+            _("tutti.table.fishing.environment.keys." + KEY_BEAUFORT_SCALE),
+            _("tutti.table.fishing.environment.keys." + KEY_WIND_DIRECTION),
+            _("tutti.table.fishing.environment.keys." + KEY_SEA_STATE)
+        };
+    }
+   =20
+}

Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/fishing/EnvironmentTableModel.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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/fishing/EnvironmentTableModel.java	                        (rev 0)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/fishing/EnvironmentTableModel.java	2012-12-18 13:07:34 UTC (rev 87)
@@ -0,0 +1,38 @@
+package fr.ifremer.tutti.ui.swing.content.operation.fishing;
+
+import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel;
+import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier;
+import javax.swing.table.TableColumnModel;
+
+import static org.nuiton.i18n.I18n.n_;
+
+/**
+ *
+ * @author kmorin
+ * since 0.3
+ */
+public class EnvironmentTableModel extends AbstractTuttiTableModel<Environme=
ntRowModel> {
+
+    public static final ColumnIdentifier<EnvironmentRowModel> KEY =3D Column=
Identifier.newId(
+            EnvironmentRowModel.PROPERTY_KEY,
+            n_("tutti.table.fishing.environment.header.key"),
+            n_("tutti.table.fishing.environment.header.key"));
+   =20
+    public static final ColumnIdentifier<EnvironmentRowModel> VALUE =3D Colu=
mnIdentifier.newId(
+            EnvironmentRowModel.PROPERTY_VALUE,
+            n_("tutti.table.fishing.environment.header.value"),
+            n_("tutti.table.fishing.environment.header.value"));
+   =20
+    public EnvironmentTableModel(TableColumnModel columnModel) {
+        super(columnModel);
+
+        setNoneEditableCols(KEY);
+    }
+   =20
+    @Override
+    protected EnvironmentRowModel createNewRow() {
+        EnvironmentRowModel result =3D new EnvironmentRowModel();
+        return result;
+    }
+   =20
+}

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/species/FrequencyCellComponent.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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/species/FrequencyCellComponent.java	2012-12-18 10:50:00 UTC (rev 86)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/species/FrequencyCellComponent.java	2012-12-18 13:07:34 UTC (rev 87)
@@ -158,6 +158,7 @@
=20
             // reselect this cell
             AbstractSelectTableAction.doSelectCell(table, r, c);
+            table.requestFocus();
         }
=20
         @Override

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/e=
ditor/AttachmentCellComponent.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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/=
AttachmentCellComponent.java	2012-12-18 10:50:00 UTC (rev 86)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/=
AttachmentCellComponent.java	2012-12-18 13:07:34 UTC (rev 87)
@@ -193,6 +193,7 @@
=20
             // reselect this cell
             AbstractSelectTableAction.doSelectCell(table, r, c);
+            table.requestFocus();
         }
=20
         @Override

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/e=
ditor/AttachmentEditorUI.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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/=
AttachmentEditorUI.jaxx	2012-12-18 10:50:00 UTC (rev 86)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/=
AttachmentEditorUI.jaxx	2012-12-18 13:07:34 UTC (rev 87)
@@ -26,6 +26,7 @@
   <import>
     fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel
     fr.ifremer.tutti.persistence.entities.data.Attachment
+    jaxx.runtime.swing.editor.FileEditor
   </import>
  =20
   <!-- bean property linked state -->
@@ -40,8 +41,6 @@
=20
   <AttachmentEditorUIHandler id=3D'handler' constructorParams=3D'this'/>
=20
-  <Attachment id=3D'model' javaBean=3D'null'/>
-
   <row fill=3D'both'>
     <cell fill=3D'both' weightx=3D'1' columns=3D'3'>
       <VBox id=3D'attachments'></VBox>
@@ -52,8 +51,7 @@
       <JLabel id=3D'fileLabel'/>
     </cell>
     <cell fill=3D'both' weightx=3D'1'>
-      <JTextField id=3D'file'
-               onMouseClicked=3D'handler.chooseFile()'/>
+      <FileEditor id=3D'file'/>
     </cell>
     <cell fill=3D'both' rows=3D'3'>
       <JButton id=3D'addButton'

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/e=
ditor/AttachmentEditorUIHandler.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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/=
AttachmentEditorUIHandler.java	2012-12-18 10:50:00 UTC (rev 86)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/=
AttachmentEditorUIHandler.java	2012-12-18 13:07:34 UTC (rev 87)
@@ -40,6 +40,7 @@
 import javax.swing.JLabel;
 import javax.swing.SwingConstants;
 import java.awt.Cursor;
+import java.awt.Font;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -62,8 +63,6 @@
=20
     private final AttachmentEditorUI ui;
=20
-    private JFileChooser fileChooser =3D new JFileChooser();
-
     public AttachmentEditorUIHandler(AttachmentEditorUI attachmentEditorUI) {
         ui =3D attachmentEditorUI;
=20
@@ -150,13 +149,13 @@
         SwingUtil.getParentContainer(ui, Window.class).dispose();
     }
=20
-    public void chooseFile() {
-        if (fileChooser.showOpenDialog(ui) =3D=3D JFileChooser.APPROVE_OPTIO=
N) {
-            File file =3D fileChooser.getSelectedFile();
-            ui.getModel().setFile(file);
-            ui.getFile().setText(file.getAbsolutePath());
-        }
-    }
+//    public void chooseFile() {
+//        if (fileChooser.showOpenDialog(ui) =3D=3D JFileChooser.APPROVE_OPT=
ION) {
+//            File file =3D fileChooser.getSelectedFile();
+//            ui.getModel().setFile(file);
+//            ui.getFile().setText(file.getAbsolutePath());
+//        }
+//    }
=20
     public void addAttachment() {
         AbstractTuttiBeanUIModel bean =3D ui.getBean();
@@ -165,9 +164,10 @@
         if (list =3D=3D null) {
             list =3D Lists.newArrayList();
         }
-        Attachment attachment =3D ui.getModel();
-        File file =3D attachment.getFile();
+        Attachment attachment =3D new Attachment();
+        File file =3D ui.getFile().getSelectedFile();
         if (file !=3D null) {
+            attachment.setFile(file);
             String name =3D ui.getFileName().getText();
             if (StringUtils.isEmpty(name)) {
                 name =3D file.getName();
@@ -186,9 +186,7 @@
     }
=20
     protected void resetFields() {
-        ui.setModel(new Attachment());
-        fileChooser.setSelectedFile(null);
-        ui.getFile().setText("");
+        ui.getFile().setSelectedFile((File)null);
         ui.getFileName().setText("");
         ui.getFileComment().setText("");
     }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/e=
ditor/LongTextCellComponent.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/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/=
LongTextCellComponent.java	2012-12-18 10:50:00 UTC (rev 86)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/=
LongTextCellComponent.java	2012-12-18 13:07:34 UTC (rev 87)
@@ -32,6 +32,7 @@
 import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction;
 import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel;
 import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier;
+import java.awt.event.FocusEvent;
 import jaxx.runtime.JAXXUtil;
 import jaxx.runtime.SwingUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -49,6 +50,7 @@
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Frame;
+import java.awt.event.FocusListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
@@ -156,7 +158,7 @@
             ComponentMover cm =3D new ComponentMover();
             cm.setDragInsets(cr.getDragInsets());
             cm.registerComponent(editor);
-
+           =20
             editor.addWindowListener(new WindowAdapter() {
=20
                 @Override
@@ -194,6 +196,7 @@
=20
             // reselect this cell
             AbstractSelectTableAction.doSelectCell(table, r, c);
+            table.requestFocus();
         }
=20
         @Override

Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.p=
roperties
=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/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert=
ies	2012-12-18 10:50:00 UTC (rev 86)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert=
ies	2012-12-18 13:07:34 UTC (rev 87)
@@ -161,6 +161,15 @@
 tutti.table.benthos.batch.header.speciesByGenusCode=3DEsp=C3=A8ce
 tutti.table.benthos.batch.header.toConfirm=3DA Confirmer
 tutti.table.benthos.batch.header.weight=3DPoids
+tutti.table.fishing.environment.header.key=3DCl=C3=A9
+tutti.table.fishing.environment.header.value=3DValeur
+tutti.table.fishing.environment.keys.=3D
+tutti.table.fishing.environment.keys.beaufortScale=3DForce du vent
+tutti.table.fishing.environment.keys.key3=3DCl=C3=A9 3
+tutti.table.fishing.environment.keys.key4=3DCl=C3=A9 4
+tutti.table.fishing.environment.keys.key5=3DCl=C3=A9 5
+tutti.table.fishing.environment.keys.seaState=3D=C3=89tat de la mer
+tutti.table.fishing.environment.keys.windDirection=3DDirection du vent
 tutti.table.macrowaste.batch.header.comment=3DCommentaire
 tutti.table.macrowaste.batch.header.file=3DPi=C3=A8ces jointes
 tutti.table.macrowaste.batch.header.macroWasteCategory=3DCat=C3=A9gorie


--===============9183711150791901465==--