[Observe-commits] 02/08: Use lambda \o/

1 Aug 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 1f8ea21506c2895fbc618b28f3846ccdc2043542
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon Aug 1 10:31:33 2016 +0200

    Use lambda \o/
---
 .../ObserveSwingApplicationConfigOption.java       |   9 +-
 .../fr/ird/observe/ui/ObserveMainUIHandler.java    |  42 ++--
 .../src/main/java/fr/ird/observe/ui/UIHelper.java  |   8 +-
 .../fr/ird/observe/ui/actions/ShowAboutAction.java |  13 +-
 .../ird/observe/ui/actions/ShowConfigAction.java   |   8 +-
 .../ui/actions/shared/CancelCreateUIAction.java    |  26 +--
 .../ui/actions/shared/CloseAndCreateUIAction.java  | 128 ++++++-----
 .../ui/actions/shared/CloseOpenUIAction.java       | 146 ++++++-------
 .../ui/actions/shared/DeleteDataUIAction.java      |  33 ++-
 .../ui/actions/shared/DeleteReferenceUIAction.java |  29 ++-
 .../observe/ui/actions/shared/GoDownUIAction.java  |  22 +-
 .../observe/ui/actions/shared/GoUpUIAction.java    |  20 +-
 .../shared/MoveActivityLonglinesUIAction.java      |  62 +++---
 .../actions/shared/MoveActivitySeinesUIAction.java |  60 +++---
 .../ui/actions/shared/MoveRoutesUIAction.java      |  62 +++---
 .../ui/actions/shared/MoveTripsUIAction.java       |  52 +++--
 .../observe/ui/actions/shared/ReOpenUIAction.java  |  58 +++--
 .../ui/actions/shared/ResetEditUIAction.java       |  23 +-
 .../ui/actions/shared/SaveEditUIAction.java        |  23 +-
 .../fr/ird/observe/ui/admin/AdminUILauncher.java   |   7 +-
 .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 238 +++++++++------------
 .../ui/admin/consolidate/ConsolidateUIHandler.java |  37 +---
 .../observe/ui/admin/report/ReportUIHandler.java   | 121 ++++-------
 .../ui/admin/validate/ValidateUIHandler.java       |  96 ++++-----
 .../ird/observe/ui/content/ContentUIHandler.java   |  16 +-
 .../content/impl/longline/BranchlineUIHandler.java |  17 +-
 .../LonglineDetailCompositionUIHandler.java        | 222 +++++++------------
 ...onglineDetailCompositionUIValidationHelper.java |  16 +-
 .../impl/longline/SetLonglineUIHandler.java        |  45 ++--
 ...ngObjectTransmittingBuoyOperationUIHandler.java |   9 +-
 .../ui/content/impl/seine/SetSeineUIHandler.java   |  30 ++-
 .../impl/longline/ActivityLonglineUIModel.java     |  13 +-
 .../open/impl/longline/TripLonglineUIHandler.java  |  44 ++--
 .../open/impl/seine/ActivitySeineUIHandler.java    |  18 +-
 .../open/impl/seine/ActivitySeineUIModel.java      |  29 ++-
 .../open/impl/seine/TripSeineUIHandler.java        |  44 ++--
 .../ui/content/ref/ContentReferenceUIHandler.java  |  44 ++--
 .../observe/ui/content/ref/impl/GearUIHandler.java |  15 +-
 .../ref/impl/LengthWeightParameterUIHandler.java   |  15 +-
 .../ui/content/ref/impl/ProgramUIHandler.java      |  15 +-
 .../ui/content/ref/impl/SpeciesListUIHandler.java  |  15 +-
 .../ui/content/ref/impl/SpeciesUIHandler.java      |  15 +-
 .../ui/content/ref/impl/VesselUIHandler.java       |  15 +-
 .../observe/ui/content/table/ContentTableMeta.java |   7 +-
 .../ui/content/table/ContentTableUIHandler.java    |  23 +-
 .../content/table/ContentTableUIInitializer.java   |  97 ++++-----
 .../impl/longline/BaitsCompositionUIHandler.java   |  12 +-
 .../longline/BranchlinesCompositionUIHandler.java  |  11 +-
 .../CatchLonglineContentTableUIInitializer.java    |  11 +-
 .../impl/longline/CatchLonglineUIHandler.java      | 108 +++-------
 .../longline/FloatlinesCompositionUIHandler.java   |  12 +-
 .../longline/GearUseFeaturesLonglineUIHandler.java |  57 ++---
 .../impl/longline/HooksCompositionUIHandler.java   |  11 +-
 .../impl/longline/LonglinePositionHelper.java      |  17 +-
 .../content/table/impl/longline/TdrUIHandler.java  |  32 ++-
 .../impl/seine/GearUseFeaturesSeineUIHandler.java  |  57 ++---
 .../table/impl/seine/NonTargetCatchUIHandler.java  |  55 ++---
 .../table/impl/seine/NonTargetSampleUIHandler.java |  27 +--
 .../table/impl/seine/TargetCatchUIHandler.java     |  18 +-
 .../impl/seine/TargetDiscardCatchUIHandler.java    |  40 ++--
 .../table/impl/seine/TargetSampleUIHandler.java    |  27 +--
 .../ird/observe/ui/storage/StorageUIHandler.java   |  97 ++++-----
 .../fr/ird/observe/ui/storage/StorageUIModel.java  | 104 ++++-----
 .../ui/storage/tabs/StorageTabUIHandler.java       |  92 ++++----
 .../ui/tree/DataSelectionTreeCellRenderer.java     |   9 +-
 .../ui/util/table/EditableTableModelSupport.java   |  24 +--
 .../ui/util/tripMap/TripMapContentBuilder.java     |   8 +-
 pom.xml                                            |   2 +-
 68 files changed, 1156 insertions(+), 1762 deletions(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java
index 356dcd2..ba3fdc8 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java
@@ -34,7 +34,6 @@ import java.awt.Color;
 import java.io.File;
 import java.net.URL;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 
@@ -937,13 +936,7 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef {
     public static ImmutableList<ObserveSwingApplicationConfigOption> orderedByNameValues() {
 
         List<ObserveSwingApplicationConfigOption> values = Lists.newArrayList(values());
-        Collections.sort(values, new Comparator<ObserveSwingApplicationConfigOption>() {
-
-            @Override
-            public int compare(ObserveSwingApplicationConfigOption o1, ObserveSwingApplicationConfigOption o2) {
-                return o1.getKey().compareTo(o2.getKey());
-            }
-        });
+        Collections.sort(values, (o1, o2) -> o1.getKey().compareTo(o2.getKey()));
         return ImmutableList.copyOf(values);
 
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java
index e7e4215..3c06af7 100755
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java
@@ -23,8 +23,8 @@ package fr.ird.observe.ui;
 
 import fr.ird.observe.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.decoration.DecoratorService;
-import fr.ird.observe.db.DataContext;
 import fr.ird.observe.configuration.ObserveSwingApplicationConfig;
+import fr.ird.observe.db.DataContext;
 import fr.ird.observe.db.ObserveSwingDataSource;
 import fr.ird.observe.services.dto.AbstractObserveDto;
 import fr.ird.observe.services.dto.constants.ReferentialLocale;
@@ -48,16 +48,15 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.i18n.I18n;
 
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.SwingUtilities;
 import javax.swing.event.TreeExpansionEvent;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.event.TreeWillExpandListener;
 import javax.swing.tree.ExpandVetoException;
 import javax.swing.tree.TreePath;
-import java.awt.*;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
+import java.awt.Cursor;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -389,7 +388,7 @@ public class ObserveMainUIHandler {
 
             if (service.isLocal()) {
                 icon = (Icon) ui.storageStatus.getClientProperty("localIcon");
-            } else if (service.isRemote()){
+            } else if (service.isRemote()) {
                 icon = (Icon) ui.storageStatus.getClientProperty("remoteIcon");
             } else {
                 icon = (Icon) ui.storageStatus.getClientProperty("serverIcon");
@@ -475,20 +474,13 @@ public class ObserveMainUIHandler {
 
         // ajout d'un ecouteur sur la navigation pour toujours mettre la scrollbar
         // tout à droite a chaque selection
-        TreeSelectionListener listener = new TreeSelectionListener() {
-
-            @Override
-            public void valueChanged(TreeSelectionEvent e) {
-                changeNavigationNode(ui, e);
-                SwingUtilities.invokeLater(new Runnable() {
-
-                    @Override
-                    public void run() {
-                        ui.getNavigationScrollPane().getHorizontalScrollBar().setValue(0);
-                        ui.getSplitpane2().resetToPreferredSizes();
-                    }
-                });
-            }
+        TreeSelectionListener listener;
+        listener = e -> {
+            changeNavigationNode(ui, e);
+            SwingUtilities.invokeLater(() -> {
+                ui.getNavigationScrollPane().getHorizontalScrollBar().setValue(0);
+                ui.getSplitpane2().resetToPreferredSizes();
+            });
         };
         TreeWillExpandListener veteobableTreeWillExpand = new TreeWillExpandListener() {
             @Override
@@ -525,13 +517,9 @@ public class ObserveMainUIHandler {
         UIHelper.setLayerUI(ui.getBody(), ui.getBusyBlockLayerUI());
 
         // ecoute des changements de l'état busy
-        ui.addPropertyChangeListener(ObserveMainUI.PROPERTY_BUSY, new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                Boolean newvalue = (Boolean) evt.getNewValue();
-                updateBusyState(ui, newvalue != null && newvalue);
-            }
+        ui.addPropertyChangeListener(ObserveMainUI.PROPERTY_BUSY, evt -> {
+            Boolean newvalue = (Boolean) evt.getNewValue();
+            updateBusyState(ui, newvalue != null && newvalue);
         });
     }
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java
index 4469d90..d510064 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java
@@ -427,13 +427,7 @@ public class UIHelper extends SwingUtil {
         ui.getSplitpane2().revalidate();
 
         // affichage de l'interface graphique
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                ui.setVisible(true);
-            }
-        });
+        SwingUtilities.invokeLater(() -> ui.setVisible(true));
     }
 
     public static <E extends IdDto> E getEntity(List<E> list, E entity) {
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowAboutAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowAboutAction.java
index 539315e..a2b63f3 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowAboutAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowAboutAction.java
@@ -23,6 +23,8 @@ package fr.ird.observe.ui.actions;
  */
 
 import fr.ird.observe.ObserveRunner;
+import fr.ird.observe.ui.ObserveMainUI;
+import fr.ird.observe.ui.UIHelper;
 import jaxx.runtime.SwingUtil;
 import jaxx.runtime.swing.AboutPanel;
 import org.nuiton.util.Resource;
@@ -32,14 +34,12 @@ import javax.swing.Icon;
 import javax.swing.JEditorPane;
 import javax.swing.JLabel;
 import javax.swing.JScrollPane;
-import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.net.MalformedURLException;
 
-import static org.nuiton.i18n.I18n.t;import fr.ird.observe.ui.*;
+import static org.nuiton.i18n.I18n.t;
 
 /**
  * Created on 1/17/15.
@@ -115,12 +115,7 @@ public class ShowAboutAction extends AbstractAction {
         }
         translateArea.setText(translateText);
         translatePane.getViewport().add(translateArea);
-        translateArea.addHyperlinkListener(new HyperlinkListener() {
-            @Override
-            public void hyperlinkUpdate(HyperlinkEvent e) {
-                UIHelper.openLink(e);
-            }
-        });
+        translateArea.addHyperlinkListener(e -> UIHelper.openLink(e));
 
         about.getTabs().add(t("observe.about.translate.title"), translatePane);
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java
index f5ae63e..a43774d 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java
@@ -139,13 +139,7 @@ public class ShowConfigAction extends AbstractAction {
 
         helper.setFinalizer(new MainCallBackFinalizer(ObserveUICallback.application.name()));
 
-        helper.setCloseAction(new Runnable() {
-
-            @Override
-            public void run() {
-                ObserveMainUIHandler.restartEdit();
-            }
-        });
+        helper.setCloseAction(() -> ObserveMainUIHandler.restartEdit());
 
         // categorie repertoires
         addDirectoriesOptions(helper);
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CancelCreateUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CancelCreateUIAction.java
index 79d0b7e..79b6d18 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CancelCreateUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CancelCreateUIAction.java
@@ -55,22 +55,18 @@ public class CancelCreateUIAction extends AbstractUIAction {
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                JComponent c = (JComponent) e.getSource();
-                ContentUI<?> ui = (ContentUI<?>)
-                        c.getClientProperty("ui");
-                if (ui == null) {
-                    throw new IllegalStateException(
-                            "could not find client property " +
-                            "ui on component" + c);
-                }
-                ui.stopEdit();
-                ObserveNode parentNode = ui.getTreeHelper().removeNode(ui.getTreeHelper().getSelectedNode());
-                ui.getTreeHelper().selectNode(parentNode);
+        SwingUtilities.invokeLater(() -> {
+            JComponent c = (JComponent) e.getSource();
+            ContentUI<?> ui = (ContentUI<?>)
+                    c.getClientProperty("ui");
+            if (ui == null) {
+                throw new IllegalStateException(
+                        "could not find client property " +
+                        "ui on component" + c);
             }
+            ui.stopEdit();
+            ObserveNode parentNode = ui.getTreeHelper().removeNode(ui.getTreeHelper().getSelectedNode());
+            ui.getTreeHelper().selectNode(parentNode);
         });
     }
 }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java
index 0a9f397..912c66b 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java
@@ -65,97 +65,93 @@ public class CloseAndCreateUIAction extends AbstractUIAction {
     @Override
     public void actionPerformed(final ActionEvent e) {
 
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                JComponent c = (JComponent) e.getSource();
-                ContentUI<?> ui = (ContentUI<?>)
-                        c.getClientProperty("ui");
-                if (ui == null) {
-                    throw new IllegalStateException(
-                            "could not find client property " +
-                            "ui on component" + c);
-                }
-                if (ui instanceof ContentOpenableUI) {
-                    ((ContentOpenableUI<?>) ui).closeAndCreateData();
-                    return;
-                }
-
-                if (ui instanceof ActivitySeinesUI) {
+        SwingUtilities.invokeLater(() -> {
+            JComponent c = (JComponent) e.getSource();
+            ContentUI<?> ui = (ContentUI<?>)
+                    c.getClientProperty("ui");
+            if (ui == null) {
+                throw new IllegalStateException(
+                        "could not find client property " +
+                        "ui on component" + c);
+            }
+            if (ui instanceof ContentOpenableUI) {
+                ((ContentOpenableUI<?>) ui).closeAndCreateData();
+                return;
+            }
 
-                    // cas particulier pour l'écran des activitys
+            if (ui instanceof ActivitySeinesUI) {
 
-                    JTree tree = getMainUI().getNavigation();
-                    ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
+                // cas particulier pour l'écran des activitys
 
-                    boolean wasCollapsed = isOpenActivityNodeCollapsed(
-                            tree,
-                            treeHelper,
-                            getMainUI().getDataContext()
-                    );
+                JTree tree = getMainUI().getNavigation();
+                ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
 
-                    // selection du noeud de l'activity ouverte
-                    treeHelper.selectOpenNode(getMainUI(), ActivitySeineDto.class);
+                boolean wasCollapsed = isOpenActivityNodeCollapsed(
+                        tree,
+                        treeHelper,
+                        getMainUI().getDataContext()
+                );
 
-                    // on conserve le path de l'activity
-                    TreePath path = tree.getSelectionPath();
+                // selection du noeud de l'activity ouverte
+                treeHelper.selectOpenNode(getMainUI(), ActivitySeineDto.class);
 
-                    // recuperation de l'écran associé
-                    ActivitySeineUI selectedUI = (ActivitySeineUI)
-                            ObserveSwingApplicationContext.get().getSelectedContentUI();
+                // on conserve le path de l'activity
+                TreePath path = tree.getSelectionPath();
 
-                    // fermeture de l'activity et création d'une nouvelle
-                    selectedUI.closeAndCreateData();
+                // recuperation de l'écran associé
+                ActivitySeineUI selectedUI = (ActivitySeineUI)
+                        ObserveSwingApplicationContext.get().getSelectedContentUI();
 
-                    if (wasCollapsed) {
+                // fermeture de l'activity et création d'une nouvelle
+                selectedUI.closeAndCreateData();
 
-                        // on ferme le noeud de l'activity (qui a ete ouvert
-                        // lors de la selection de celle-ci)
-                        tree.collapsePath(path);
-                    }
+                if (wasCollapsed) {
 
-                    return;
+                    // on ferme le noeud de l'activity (qui a ete ouvert
+                    // lors de la selection de celle-ci)
+                    tree.collapsePath(path);
                 }
 
-                if (ui instanceof ActivityLonglinesUI) {
+                return;
+            }
 
-                    // cas particulier pour l'écran des activitys
+            if (ui instanceof ActivityLonglinesUI) {
 
-                    JTree tree = getMainUI().getNavigation();
-                    ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
+                // cas particulier pour l'écran des activitys
 
-                    boolean wasCollapsed = isOpenActivityNodeCollapsed(
-                            tree,
-                            treeHelper,
-                            getMainUI().getDataContext()
-                    );
+                JTree tree = getMainUI().getNavigation();
+                ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
 
-                    // selection du noeud de l'activity ouverte
-                    treeHelper.selectOpenNode(getMainUI(), ActivityLonglineDto.class);
+                boolean wasCollapsed = isOpenActivityNodeCollapsed(
+                        tree,
+                        treeHelper,
+                        getMainUI().getDataContext()
+                );
 
-                    // on conserve le path de l'activity
-                    TreePath path = tree.getSelectionPath();
+                // selection du noeud de l'activity ouverte
+                treeHelper.selectOpenNode(getMainUI(), ActivityLonglineDto.class);
 
-                    // recuperation de l'écran associé
-                    ActivityLonglineUI selectedUI = (ActivityLonglineUI)
-                            ObserveSwingApplicationContext.get().getSelectedContentUI();
+                // on conserve le path de l'activity
+                TreePath path = tree.getSelectionPath();
 
-                    // fermeture de l'activity et création d'une nouvelle
-                    selectedUI.closeAndCreateData();
+                // recuperation de l'écran associé
+                ActivityLonglineUI selectedUI = (ActivityLonglineUI)
+                        ObserveSwingApplicationContext.get().getSelectedContentUI();
 
-                    if (wasCollapsed) {
+                // fermeture de l'activity et création d'une nouvelle
+                selectedUI.closeAndCreateData();
 
-                        // on ferme le noeud de l'activity (qui a ete ouvert
-                        // lors de la selection de celle-ci)
-                        tree.collapsePath(path);
-                    }
+                if (wasCollapsed) {
 
-                    return;
+                    // on ferme le noeud de l'activity (qui a ete ouvert
+                    // lors de la selection de celle-ci)
+                    tree.collapsePath(path);
                 }
 
-                throw new IllegalStateException("Can not come here!");
+                return;
             }
+
+            throw new IllegalStateException("Can not come here!");
         });
     }
 }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java
index 5855416..28c6e02 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java
@@ -66,110 +66,106 @@ public class CloseOpenUIAction extends AbstractUIAction {
     @Override
     public void actionPerformed(final ActionEvent e) {
 
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                JComponent c = (JComponent) e.getSource();
-                ContentUI<?> ui = (ContentUI<?>)
-                        c.getClientProperty("ui");
-                if (ui == null) {
-                    throw new IllegalStateException(
-                            "could not find client property " +
-                            "ui on component" + c);
-                }
-
-                if (ui instanceof ContentOpenableUI) {
-                    ((ContentOpenableUI<?>) ui).closeData();
-                    return;
-                }
-
-                if (ui instanceof ActivitySeinesUI) {
+        SwingUtilities.invokeLater(() -> {
+            JComponent c = (JComponent) e.getSource();
+            ContentUI<?> ui = (ContentUI<?>)
+                    c.getClientProperty("ui");
+            if (ui == null) {
+                throw new IllegalStateException(
+                        "could not find client property " +
+                        "ui on component" + c);
+            }
 
-                    // cas particulier pour l'écran des activités
+            if (ui instanceof ContentOpenableUI) {
+                ((ContentOpenableUI<?>) ui).closeData();
+                return;
+            }
 
-                    JTree tree = getMainUI().getNavigation();
-                    ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
+            if (ui instanceof ActivitySeinesUI) {
 
-                    // recuperation du noeud courant (activitys)
-                    ObserveNode node = treeHelper.getSelectedNode();
+                // cas particulier pour l'écran des activités
 
-                    boolean wasCollapsed = isOpenActivityNodeCollapsed(
-                            tree,
-                            treeHelper,
-                            getMainUI().getDataContext()
-                    );
+                JTree tree = getMainUI().getNavigation();
+                ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
 
-                    // selection du noeud de l'activity ouverte
-                    treeHelper.selectOpenNode(getMainUI(), ActivitySeineDto.class);
+                // recuperation du noeud courant (activitys)
+                ObserveNode node = treeHelper.getSelectedNode();
 
-                    // on conserve le path de l'activity
-                    TreePath path = tree.getSelectionPath();
+                boolean wasCollapsed = isOpenActivityNodeCollapsed(
+                        tree,
+                        treeHelper,
+                        getMainUI().getDataContext()
+                );
 
-                    // recuperation de l'écran associé
-                    ActivitySeineUI selectedUI = (ActivitySeineUI)
-                            ObserveSwingApplicationContext.get().getSelectedContentUI();
+                // selection du noeud de l'activity ouverte
+                treeHelper.selectOpenNode(getMainUI(), ActivitySeineDto.class);
 
-                    // fermeture de l'activity
-                    selectedUI.closeData();
+                // on conserve le path de l'activity
+                TreePath path = tree.getSelectionPath();
 
-                    if (wasCollapsed) {
+                // recuperation de l'écran associé
+                ActivitySeineUI selectedUI = (ActivitySeineUI)
+                        ObserveSwingApplicationContext.get().getSelectedContentUI();
 
-                        // on ferme le noeud de l'activity (qui a ete ouvert
-                        // lors de la selection de celle-ci)                        
-                        tree.collapsePath(path);
-                    }
+                // fermeture de l'activity
+                selectedUI.closeData();
 
-                    // retour sur le noeud des activitys
-                    treeHelper.selectNode(node);
+                if (wasCollapsed) {
 
-                    return;
+                    // on ferme le noeud de l'activity (qui a ete ouvert
+                    // lors de la selection de celle-ci)
+                    tree.collapsePath(path);
                 }
 
-                if (ui instanceof ActivityLonglinesUI) {
+                // retour sur le noeud des activitys
+                treeHelper.selectNode(node);
 
-                    // cas particulier pour l'écran des activités
+                return;
+            }
 
-                    JTree tree = getMainUI().getNavigation();
-                    ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
+            if (ui instanceof ActivityLonglinesUI) {
 
-                    // recuperation du noeud courant (activitys)
-                    ObserveNode node = treeHelper.getSelectedNode();
+                // cas particulier pour l'écran des activités
 
-                    boolean wasCollapsed = isOpenActivityNodeCollapsed(
-                            tree,
-                            treeHelper,
-                            getMainUI().getDataContext()
-                    );
+                JTree tree = getMainUI().getNavigation();
+                ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
 
-                    // selection du noeud de l'activity ouverte
-                    treeHelper.selectOpenNode(getMainUI(), ActivityLonglineDto.class);
+                // recuperation du noeud courant (activitys)
+                ObserveNode node = treeHelper.getSelectedNode();
 
-                    // on conserve le path de l'activity
-                    TreePath path = tree.getSelectionPath();
+                boolean wasCollapsed = isOpenActivityNodeCollapsed(
+                        tree,
+                        treeHelper,
+                        getMainUI().getDataContext()
+                );
 
-                    // recuperation de l'écran associé
-                    ActivityLonglineUI selectedUI = (ActivityLonglineUI)
-                            ObserveSwingApplicationContext.get().getSelectedContentUI();
+                // selection du noeud de l'activity ouverte
+                treeHelper.selectOpenNode(getMainUI(), ActivityLonglineDto.class);
 
-                    // fermeture de l'activity
-                    selectedUI.closeData();
+                // on conserve le path de l'activity
+                TreePath path = tree.getSelectionPath();
 
-                    if (wasCollapsed) {
+                // recuperation de l'écran associé
+                ActivityLonglineUI selectedUI = (ActivityLonglineUI)
+                        ObserveSwingApplicationContext.get().getSelectedContentUI();
 
-                        // on ferme le noeud de l'activity (qui a ete ouvert
-                        // lors de la selection de celle-ci)
-                        tree.collapsePath(path);
-                    }
+                // fermeture de l'activity
+                selectedUI.closeData();
 
-                    // retour sur le noeud des activitys
-                    treeHelper.selectNode(node);
+                if (wasCollapsed) {
 
-                    return;
+                    // on ferme le noeud de l'activity (qui a ete ouvert
+                    // lors de la selection de celle-ci)
+                    tree.collapsePath(path);
                 }
 
-                throw new IllegalStateException("Can not come here!");
+                // retour sur le noeud des activitys
+                treeHelper.selectNode(node);
+
+                return;
             }
+
+            throw new IllegalStateException("Can not come here!");
         });
 
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteDataUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteDataUIAction.java
index 7957f2a..68188c7 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteDataUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteDataUIAction.java
@@ -57,29 +57,24 @@ public class DeleteDataUIAction extends AbstractUIAction {
 
         getMainUI().setBusy(true);
 
-        SwingUtilities.invokeLater(new Runnable() {
+        SwingUtilities.invokeLater(() -> {
+            try {
 
-            @Override
-            @SuppressWarnings("unchecked")
-            public void run() {
-                try {
-
-                    JComponent c = (JComponent) e.getSource();
-                    ContentUI<?> ui = (ContentUI<?>)
-                            c.getClientProperty("ui");
-                    if (ui == null) {
-                        throw new IllegalStateException(
-                                "could not find client property " +
-                                "ui on component" + c);
-                    }
-
-
-                    ui.delete();
-                } finally {
-                    getMainUI().setBusy(false);
+                JComponent c = (JComponent) e.getSource();
+                ContentUI<?> ui = (ContentUI<?>)
+                        c.getClientProperty("ui");
+                if (ui == null) {
+                    throw new IllegalStateException(
+                            "could not find client property " +
+                            "ui on component" + c);
                 }
 
+
+                ui.delete();
+            } finally {
+                getMainUI().setBusy(false);
             }
+
         });
     }
 }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteReferenceUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteReferenceUIAction.java
index 044a45b..744da68 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteReferenceUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteReferenceUIAction.java
@@ -54,25 +54,20 @@ public class DeleteReferenceUIAction extends AbstractUIAction {
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        SwingUtilities.invokeLater(new Runnable() {
+        SwingUtilities.invokeLater(() -> {
+            try {
+                JComponent c = (JComponent) e.getSource();
 
-            @Override
-            @SuppressWarnings("unchecked")
-            public void run() {
-                try {
-                    JComponent c = (JComponent) e.getSource();
-
-                    ContentUI<?> ui = (ContentUI<?>)
-                            c.getClientProperty("ui");
-                    if (ui == null) {
-                        throw new IllegalStateException(
-                                "could not find client property " +
-                                "ui on component" + c);
-                    }
-                    ui.delete();
-                } finally {
-                    getMainUI().setBusy(false);
+                ContentUI<?> ui = (ContentUI<?>)
+                        c.getClientProperty("ui");
+                if (ui == null) {
+                    throw new IllegalStateException(
+                            "could not find client property " +
+                            "ui on component" + c);
                 }
+                ui.delete();
+            } finally {
+                getMainUI().setBusy(false);
             }
         });
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoDownUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoDownUIAction.java
index 9fbf6bb..24a0124 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoDownUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoDownUIAction.java
@@ -65,20 +65,16 @@ public class GoDownUIAction extends AbstractUIAction {
     @Override
     public void actionPerformed(final ActionEvent e) {
 
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                JComponent c = (JComponent) e.getSource();
-                JPopupMenu p = (JPopupMenu)
-                        c.getClientProperty("popup");
-                if (p == null) {
-                    throw new IllegalStateException(
-                            "could not find client property " +
-                            "popup on component" + c);
-                }
-                p.show(c, 2, c.getHeight());
+        SwingUtilities.invokeLater(() -> {
+            JComponent c = (JComponent) e.getSource();
+            JPopupMenu p = (JPopupMenu)
+                    c.getClientProperty("popup");
+            if (p == null) {
+                throw new IllegalStateException(
+                        "could not find client property " +
+                        "popup on component" + c);
             }
+            p.show(c, 2, c.getHeight());
         });
     }
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoUpUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoUpUIAction.java
index 33ec231..880fde6 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoUpUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoUpUIAction.java
@@ -66,19 +66,15 @@ public class GoUpUIAction extends AbstractUIAction {
     @Override
     public void actionPerformed(final ActionEvent e) {
 
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                JComponent c = (JComponent) e.getSource();
-                JPopupMenu p = (JPopupMenu) c.getClientProperty("popup");
-                if (p == null) {
-                    throw new IllegalStateException(
-                            "could not find client property " +
-                            "popup on component" + c);
-                }
-                p.show(c, 2, c.getHeight());
+        SwingUtilities.invokeLater(() -> {
+            JComponent c = (JComponent) e.getSource();
+            JPopupMenu p = (JPopupMenu) c.getClientProperty("popup");
+            if (p == null) {
+                throw new IllegalStateException(
+                        "could not find client property " +
+                        "popup on component" + c);
             }
+            p.show(c, 2, c.getHeight());
         });
     }
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivityLonglinesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivityLonglinesUIAction.java
index 35c42cc..513cc93 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivityLonglinesUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivityLonglinesUIAction.java
@@ -78,46 +78,42 @@ public class MoveActivityLonglinesUIAction extends AbstractUIAction {
     @Override
     public void actionPerformed(final ActionEvent e) {
 
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                JComponent c = (JComponent) e.getSource();
-                ContentUI<?> ui = (ContentUI<?>)
-                        c.getClientProperty("ui");
-                if (ui == null) {
-                    throw new IllegalStateException(
-                            "could not find client property " +
-                            "ui on component" + c);
-                }
-
-                if (!(ui instanceof ActivityLonglinesUI)) {
-                    throw new IllegalStateException("Can not come here!");
-                }
-                ActivityLonglinesUI activityLonglinesUI = (ActivityLonglinesUI) ui;
+        SwingUtilities.invokeLater(() -> {
+            JComponent c = (JComponent) e.getSource();
+            ContentUI<?> ui = (ContentUI<?>)
+                    c.getClientProperty("ui");
+            if (ui == null) {
+                throw new IllegalStateException(
+                        "could not find client property " +
+                        "ui on component" + c);
+            }
 
+            if (!(ui instanceof ActivityLonglinesUI)) {
+                throw new IllegalStateException("Can not come here!");
+            }
+            ActivityLonglinesUI activityLonglinesUI = (ActivityLonglinesUI) ui;
 
-                // get current triplongline id
-                ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
-                ObserveNode oldActivitiesNode = treeHelper.getSelectedNode();
-                ObserveNode oldTripLonglineNode = oldActivitiesNode.getParent();
-                String oldTripLonglineId = oldTripLonglineNode.getId();
 
-                // choose the new tripLongline
-                String tripLonglineId = chooseNewTripLongline(ui, oldTripLonglineNode);
+            // get current triplongline id
+            ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
+            ObserveNode oldActivitiesNode = treeHelper.getSelectedNode();
+            ObserveNode oldTripLonglineNode = oldActivitiesNode.getParent();
+            String oldTripLonglineId = oldTripLonglineNode.getId();
 
-                if (tripLonglineId != null) {
-                    // change the tripLongline of the selected activities
-                    List<DataReference<ActivityLonglineDto>> selectedDatas = activityLonglinesUI.getModel().getSelectedDatas();
-                    List<String> activityIds = Lists.transform(selectedDatas, DataReference.getIdFunction());
-                    ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class);
-                    List<Integer> positions = service.moveActivityLonglinesToTripLongline(activityIds, tripLonglineId);
+            // choose the new tripLongline
+            String tripLonglineId = chooseNewTripLongline(ui, oldTripLonglineNode);
 
-                    // update the tree
-                    updateTree(oldActivitiesNode, oldTripLonglineId, tripLonglineId, activityIds, positions);
-                }
+            if (tripLonglineId != null) {
+                // change the tripLongline of the selected activities
+                List<DataReference<ActivityLonglineDto>> selectedDatas = activityLonglinesUI.getModel().getSelectedDatas();
+                List<String> activityIds = Lists.transform(selectedDatas, DataReference.getIdFunction());
+                ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class);
+                List<Integer> positions = service.moveActivityLonglinesToTripLongline(activityIds, tripLonglineId);
 
+                // update the tree
+                updateTree(oldActivitiesNode, oldTripLonglineId, tripLonglineId, activityIds, positions);
             }
+
         });
 
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java
index 7879784..3effde9 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java
@@ -79,44 +79,40 @@ public class MoveActivitySeinesUIAction extends AbstractUIAction {
     @Override
     public void actionPerformed(final ActionEvent e) {
 
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                JComponent c = (JComponent) e.getSource();
-                ContentUI<?> ui = (ContentUI<?>)
-                        c.getClientProperty("ui");
-                if (ui == null) {
-                    throw new IllegalStateException(
-                            "could not find client property " +
-                            "ui on component" + c);
-                }
-
-                if (!(ui instanceof ActivitySeinesUI)) {
-                    throw new IllegalStateException("Can not come here!");
-                }
+        SwingUtilities.invokeLater(() -> {
+            JComponent c = (JComponent) e.getSource();
+            ContentUI<?> ui = (ContentUI<?>)
+                    c.getClientProperty("ui");
+            if (ui == null) {
+                throw new IllegalStateException(
+                        "could not find client property " +
+                        "ui on component" + c);
+            }
 
-                // get current route id
-                ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
-                ObserveNode oldActivitiesNode = treeHelper.getSelectedNode();
-                ObserveNode oldRouteNode = oldActivitiesNode.getParent();
-                String oldRouteId = oldRouteNode.getId();
+            if (!(ui instanceof ActivitySeinesUI)) {
+                throw new IllegalStateException("Can not come here!");
+            }
 
-                // choose the new route
-                String routeId = chooseNewRoute(ui, oldRouteNode);
+            // get current route id
+            ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
+            ObserveNode oldActivitiesNode = treeHelper.getSelectedNode();
+            ObserveNode oldRouteNode = oldActivitiesNode.getParent();
+            String oldRouteId = oldRouteNode.getId();
 
-                if (routeId != null) {
-                    // change the route of the selected activities
-                    List<DataReference<ActivitySeineDto>> selectedDatas = ((ActivitySeinesUIModel) ui.getModel()).getSelectedDatas();
-                    List<String> activityIds = Lists.transform(selectedDatas, DataReference.getIdFunction());
-                    ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class);
-                    List<Integer> positions = service.moveActivitySeinesToRoute(activityIds, routeId);
+            // choose the new route
+            String routeId = chooseNewRoute(ui, oldRouteNode);
 
-                    // update the tree
-                    updateTree(oldActivitiesNode, oldRouteId, routeId, activityIds, positions);
-                }
+            if (routeId != null) {
+                // change the route of the selected activities
+                List<DataReference<ActivitySeineDto>> selectedDatas = ((ActivitySeinesUIModel) ui.getModel()).getSelectedDatas();
+                List<String> activityIds = Lists.transform(selectedDatas, DataReference.getIdFunction());
+                ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class);
+                List<Integer> positions = service.moveActivitySeinesToRoute(activityIds, routeId);
 
+                // update the tree
+                updateTree(oldActivitiesNode, oldRouteId, routeId, activityIds, positions);
             }
+
         });
 
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java
index 550af9c..c435d91 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java
@@ -78,46 +78,42 @@ public class MoveRoutesUIAction extends AbstractUIAction {
     @Override
     public void actionPerformed(final ActionEvent e) {
 
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                JComponent c = (JComponent) e.getSource();
-                ContentUI<?> ui = (ContentUI<?>)
-                        c.getClientProperty("ui");
-                if (ui == null) {
-                    throw new IllegalStateException(
-                            "could not find client property " +
-                            "ui on component" + c);
-                }
-
-                if (!(ui instanceof RoutesUI)) {
-                    throw new IllegalStateException("Can not come here!");
-                }
+        SwingUtilities.invokeLater(() -> {
+            JComponent c = (JComponent) e.getSource();
+            ContentUI<?> ui = (ContentUI<?>)
+                    c.getClientProperty("ui");
+            if (ui == null) {
+                throw new IllegalStateException(
+                        "could not find client property " +
+                        "ui on component" + c);
+            }
 
-                RoutesUI theUi = (RoutesUI) ui;
+            if (!(ui instanceof RoutesUI)) {
+                throw new IllegalStateException("Can not come here!");
+            }
 
-                // get current tripseine id
-                ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
-                ObserveNode oldRoutesNode = treeHelper.getSelectedNode();
-                ObserveNode oldTripSeineNode = oldRoutesNode.getParent();
-                String oldTripSeineId = oldTripSeineNode.getId();
+            RoutesUI theUi = (RoutesUI) ui;
 
-                // choose the new tripseine
-                String tripSeineId = chooseNewTripSeine(theUi, oldTripSeineNode);
+            // get current tripseine id
+            ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
+            ObserveNode oldRoutesNode = treeHelper.getSelectedNode();
+            ObserveNode oldTripSeineNode = oldRoutesNode.getParent();
+            String oldTripSeineId = oldTripSeineNode.getId();
 
-                if (tripSeineId != null) {
-                    // change the tripseine of the selected routes
-                    List<DataReference<RouteDto>> selectedDatas = theUi.getModel().getSelectedDatas();
-                    List<String> routeIds = Lists.transform(selectedDatas, DataReference.getIdFunction());
-                    RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class);
-                    List<Integer> positions = service.moveRoutesToTripSeine(routeIds, tripSeineId);
+            // choose the new tripseine
+            String tripSeineId = chooseNewTripSeine(theUi, oldTripSeineNode);
 
-                    // update the tree
-                    updateTree(oldRoutesNode, oldTripSeineId, tripSeineId, routeIds, positions);
-                }
+            if (tripSeineId != null) {
+                // change the tripseine of the selected routes
+                List<DataReference<RouteDto>> selectedDatas = theUi.getModel().getSelectedDatas();
+                List<String> routeIds = Lists.transform(selectedDatas, DataReference.getIdFunction());
+                RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class);
+                List<Integer> positions = service.moveRoutesToTripSeine(routeIds, tripSeineId);
 
+                // update the tree
+                updateTree(oldRoutesNode, oldTripSeineId, tripSeineId, routeIds, positions);
             }
+
         });
 
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java
index 9cc6e93..b4e3eff 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java
@@ -78,41 +78,37 @@ public abstract class MoveTripsUIAction<T extends DataDto> extends AbstractUIAct
     @Override
     public void actionPerformed(final ActionEvent e) {
 
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                JComponent c = (JComponent) e.getSource();
-                ContentUI<?> ui = (ContentUI<?>)
-                        c.getClientProperty("ui");
-                if (ui == null) {
-                    throw new IllegalStateException(
-                            "could not find client property " +
-                            "ui on component" + c);
-                }
+        SwingUtilities.invokeLater(() -> {
+            JComponent c = (JComponent) e.getSource();
+            ContentUI<?> ui = (ContentUI<?>)
+                    c.getClientProperty("ui");
+            if (ui == null) {
+                throw new IllegalStateException(
+                        "could not find client property " +
+                        "ui on component" + c);
+            }
 
-                checkUIClass(ui);
+            checkUIClass(ui);
 
-                // get current program id
-                ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
-                ObserveNode oldProgramNode = treeHelper.getSelectedNode();
-                String oldProgramId = oldProgramNode.getId();
+            // get current program id
+            ObserveTreeHelper treeHelper = getMainUI().getTreeHelper();
+            ObserveNode oldProgramNode = treeHelper.getSelectedNode();
+            String oldProgramId = oldProgramNode.getId();
 
-                // choose the new program
-                String programId = chooseNewProgram(ui, oldProgramId);
+            // choose the new program
+            String programId = chooseNewProgram(ui, oldProgramId);
 
-                if (programId != null) {
+            if (programId != null) {
 
-                    // change the program of the selected trips
-                    List<DataReference<T>> selectedDatas = ((ContentListUIModel) ui.getModel()).getSelectedDatas();
-                    List<String> tripIds = Lists.transform(selectedDatas, DataReference.getIdFunction());
-                    List<Integer> positions = getPositions(tripIds, programId);
-
-                    // update the tree
-                    updateTree(ui, oldProgramNode, oldProgramId, programId, tripIds, positions);
-                }
+                // change the program of the selected trips
+                List<DataReference<T>> selectedDatas = ((ContentListUIModel) ui.getModel()).getSelectedDatas();
+                List<String> tripIds = Lists.transform(selectedDatas, DataReference.getIdFunction());
+                List<Integer> positions = getPositions(tripIds, programId);
 
+                // update the tree
+                updateTree(ui, oldProgramNode, oldProgramId, programId, tripIds, positions);
             }
+
         });
 
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java
index e427021..1466597 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java
@@ -60,47 +60,43 @@ public class ReOpenUIAction extends AbstractUIAction {
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                JComponent c = (JComponent) e.getSource();
-                ContentUI<?> ui = (ContentUI<?>)
-                        c.getClientProperty("ui");
-
-                if (ui == null) {
-                    throw new IllegalStateException(
-                            "could not find client property ui " +
-                            "on component" + c);
-                }
+        SwingUtilities.invokeLater(() -> {
+            JComponent c = (JComponent) e.getSource();
+            ContentUI<?> ui = (ContentUI<?>)
+                    c.getClientProperty("ui");
+
+            if (ui == null) {
+                throw new IllegalStateException(
+                        "could not find client property ui " +
+                        "on component" + c);
+            }
 
-                ContentOpenableUI<?> openUI;
+            ContentOpenableUI<?> openUI;
 
-                if (ui instanceof ContentOpenableUI<?>) {
+            if (ui instanceof ContentOpenableUI<?>) {
 
-                    openUI = (ContentOpenableUI<?>) ui;
-                } else if (ui instanceof ContentListUI<?, ?>) {
+                openUI = (ContentOpenableUI<?>) ui;
+            } else if (ui instanceof ContentListUI<?, ?>) {
 
-                    DataReference<?> selectedData = ((ContentListUI<?, ?>) ui).getSelectedData();
+                DataReference<?> selectedData = ((ContentListUI<?, ?>) ui).getSelectedData();
 
-                    String id = selectedData.getId();
+                String id = selectedData.getId();
 
-                    ObserveTreeHelper treeHelper = ui.getTreeHelper();
-                    ObserveNode selectedNode = treeHelper.getSelectedNode();
-                    ObserveNode node = treeHelper.findNode(selectedNode, id);
+                ObserveTreeHelper treeHelper = ui.getTreeHelper();
+                ObserveNode selectedNode = treeHelper.getSelectedNode();
+                ObserveNode node = treeHelper.findNode(selectedNode, id);
 
-                    treeHelper.selectNode(node);
+                treeHelper.selectNode(node);
 
-                    openUI = (ContentOpenableUI<?>)
-                            ObserveSwingApplicationContext.get().getSelectedContentUI();
+                openUI = (ContentOpenableUI<?>)
+                        ObserveSwingApplicationContext.get().getSelectedContentUI();
 
-                } else {
-                    throw new IllegalStateException("The action " + ACTION_NAME + " can not be executed from ui " + ui);
-                }
+            } else {
+                throw new IllegalStateException("The action " + ACTION_NAME + " can not be executed from ui " + ui);
+            }
 
-                if (openUI != null) {
-                    openUI.openData();
-                }
+            if (openUI != null) {
+                openUI.openData();
             }
         });
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ResetEditUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ResetEditUIAction.java
index 7c31625..dc7bee7 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ResetEditUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ResetEditUIAction.java
@@ -54,21 +54,16 @@ public class ResetEditUIAction extends AbstractUIAction {
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            @SuppressWarnings("unchecked")
-            public void run() {
-                JComponent c = (JComponent) e.getSource();
-                ContentUI<?> ui = (ContentUI<?>)
-                        c.getClientProperty("ui");
-                if (ui == null) {
-                    throw new IllegalStateException(
-                            "could not find client property " +
-                            "ui on component" + c);
-                }
-                ui.resetEdit();
+        SwingUtilities.invokeLater(() -> {
+            JComponent c = (JComponent) e.getSource();
+            ContentUI<?> ui = (ContentUI<?>)
+                    c.getClientProperty("ui");
+            if (ui == null) {
+                throw new IllegalStateException(
+                        "could not find client property " +
+                        "ui on component" + c);
             }
+            ui.resetEdit();
         });
     }
 }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/SaveEditUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/SaveEditUIAction.java
index 706d5c1..f103fb8 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/SaveEditUIAction.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/SaveEditUIAction.java
@@ -54,21 +54,16 @@ public class SaveEditUIAction extends AbstractUIAction {
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            @SuppressWarnings("unchecked")
-            public void run() {
-                JComponent c = (JComponent) e.getSource();
-                ContentUI<?> ui = (ContentUI<?>)
-                        c.getClientProperty("ui");
-                if (ui == null) {
-                    throw new IllegalStateException(
-                            "could not find client property " +
-                            "ui on component" + c);
-                }
-                ui.save(true);
+        SwingUtilities.invokeLater(() -> {
+            JComponent c = (JComponent) e.getSource();
+            ContentUI<?> ui = (ContentUI<?>)
+                    c.getClientProperty("ui");
+            if (ui == null) {
+                throw new IllegalStateException(
+                        "could not find client property " +
+                        "ui on component" + c);
             }
+            ui.save(true);
         });
     }
 }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java
index c02d2bd..1630f7d 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java
@@ -206,12 +206,7 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad
             mainUI.setMode(ObserveUIMode.SYNCHRO);
 
             // refresh selected tab (otherwise it does NOT display (white screen...)
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    ui.getTabs().getSelectedComponent().validate();
-                }
-            });
+            SwingUtilities.invokeLater(() -> ui.getTabs().getSelectedComponent().validate());
         }
     }
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java
index a31455a..4f474a1 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java
@@ -60,7 +60,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
 
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.util.ArrayList;
@@ -125,10 +124,85 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
     /** la liste des modes disponibles en entrée */
     protected EnumSet<DbMode> availableIncomingModes;
 
-    PropertyChangeListener listenStepChanged = new PropertyChangeListener() {
+    private final PropertyChangeListener listenStepChanged;
 
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
+    private final PropertyChangeListener listenSelectModified;
+
+    private final PropertyChangeListener listenValidationModified;
+
+    private final PropertyChangeListener listenReportModified;
+
+    private final  PropertyChangeListener listenerSelectedDataForReport;
+
+    private final PropertyChangeListener listenConsolidateModified;
+
+    private final PropertyChangeListener listenSaveLocalChanged;
+
+
+    public AdminUIModel() {
+        super(AdminStep.class);
+
+        localSourceModel = new StorageUIModel() {
+
+            @Override
+            public String getLabel() {
+                String txt = n("observe.storage.label.synchro.incoming");
+                String params;
+
+                if (getDbMode() == DbMode.USE_SERVER) {
+                    params = t("observe.storage.server.db") + " " + getRemoteUrl();
+                } else if (getDbMode() == DbMode.USE_REMOTE) {
+                    params = t("observe.storage.remote.db") + " " + getRemoteUrl();
+                } else {
+                    params = t("observe.storage.locale.db") + " " + getH2Config().getDirectory().getAbsolutePath();
+                }
+                txt = t(txt, params);
+                return txt;
+            }
+
+            @Override
+            public void validate() {
+                super.validate();
+
+                // on declanche la revalidation du modèle
+                firePropertyChange(VALID_PROPERTY_NAME, isValid());
+            }
+
+        };
+
+        centralSourceModel = new StorageUIModel() {
+
+            @Override
+            public String getLabel() {
+                String txt;
+                String params;
+                txt = n("observe.storage.label.synchro.referentiel");
+                if (getDbMode() == DbMode.CREATE_LOCAL) {
+                    params = getH2Config().getDirectory().getAbsolutePath();
+                } else {
+                    params = getRemoteUrl();
+                }
+                txt = t(txt, params);
+                return txt;
+            }
+
+            @Override
+            public void validate() {
+                super.validate();
+
+                // on declanche la revalidation du modèle
+                firePropertyChange(VALID_PROPERTY_NAME, isValid());
+            }
+        };
+
+        selectionDataModel = new DataSelectionModel();
+
+        availableIncomingModes = EnumSet.noneOf(DbMode.class);
+
+        if (log.isDebugEnabled()) {
+            log.debug("model [" + this + "] is instanciate.");
+        }
+        listenStepChanged = evt -> {
 
             if (isWasStarted()) {
 
@@ -198,13 +272,8 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
 //            }
             ObserveSwingDataSource dataSource = getSafeLocalSource(true);
             populateSelectionModel(dataSource);
-        }
-    };
-
-    PropertyChangeListener listenSelectModified = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
+        };
+        listenSelectModified = evt -> {
             DataSelectionModel source = (DataSelectionModel) evt.getSource();
             if (log.isDebugEnabled()) {
                 log.debug("selection data model [" + source + "] changed on " +
@@ -219,13 +288,8 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
 
             // on declanche la revalidation du modèle
             firePropertyChange(VALID_STEP_PROPERTY_NAME, validStep);
-        }
-    };
-
-    PropertyChangeListener listenValidationModified = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
+        };
+        listenValidationModified = evt -> {
             ValidateModel source = (ValidateModel) evt.getSource();
             if (log.isDebugEnabled()) {
                 log.debug("validation model [" + source + "] changed on " +
@@ -239,13 +303,8 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
                 );
             }
             firePropertyChange(VALID_STEP_PROPERTY_NAME, validStep);
-        }
-    };
-
-    PropertyChangeListener listenReportModified = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
+        };
+        listenReportModified = evt -> {
             ReportModel source = (ReportModel) evt.getSource();
             if (log.isDebugEnabled()) {
                 log.debug("report model [" + source + "] changed on " +
@@ -254,13 +313,8 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
             }
             validate();
             firePropertyChange(VALID_STEP_PROPERTY_NAME, validStep);
-        }
-    };
-
-    PropertyChangeListener listenerSelectedDataForReport = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
+        };
+        listenerSelectedDataForReport = evt -> {
 
             // la modification de la sélection entraine la suppression d'un report sélectionné
             getReportModel().setSelectedReport(null);
@@ -268,13 +322,8 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
             // cela entraine aussi la modification de la marée sélectionnée
             firePropertyChange(SELECTED_TRIP_PROPERTY_NAME, getSelectedTrip());
 
-        }
-    };
-
-    PropertyChangeListener listenConsolidateModified = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
+        };
+        listenConsolidateModified = evt -> {
             ConsolidateModel source = (ConsolidateModel) evt.getSource();
             if (log.isDebugEnabled()) {
                 log.debug("consolidate model [" + source + "] changed on " +
@@ -283,13 +332,8 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
             }
             validate();
             firePropertyChange(VALID_STEP_PROPERTY_NAME, validStep);
-        }
-    };
-
-    PropertyChangeListener listenSaveLocalChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
+        };
+        listenSaveLocalChanged = evt -> {
 
             String propertyName = evt.getPropertyName();
 
@@ -312,73 +356,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
             if (log.isDebugEnabled()) {
                 log.debug("Skip property " + propertyName);
             }
-        }
-    };
-
-
-    public AdminUIModel() {
-        super(AdminStep.class);
-
-        localSourceModel = new StorageUIModel() {
-
-            @Override
-            public String getLabel() {
-                String txt = n("observe.storage.label.synchro.incoming");
-                String params;
-
-                if (getDbMode() == DbMode.USE_SERVER) {
-                    params = t("observe.storage.server.db") + " " + getRemoteUrl();
-                } else if (getDbMode() == DbMode.USE_REMOTE) {
-                    params = t("observe.storage.remote.db") + " " + getRemoteUrl();
-                } else {
-                    params = t("observe.storage.locale.db") + " " + getH2Config().getDirectory().getAbsolutePath();
-                }
-                txt = t(txt, params);
-                return txt;
-            }
-
-            @Override
-            public void validate() {
-                super.validate();
-
-                // on declanche la revalidation du modèle
-                firePropertyChange(VALID_PROPERTY_NAME, isValid());
-            }
-
         };
-
-        centralSourceModel = new StorageUIModel() {
-
-            @Override
-            public String getLabel() {
-                String txt;
-                String params;
-                txt = n("observe.storage.label.synchro.referentiel");
-                if (getDbMode() == DbMode.CREATE_LOCAL) {
-                    params = getH2Config().getDirectory().getAbsolutePath();
-                } else {
-                    params = getRemoteUrl();
-                }
-                txt = t(txt, params);
-                return txt;
-            }
-
-            @Override
-            public void validate() {
-                super.validate();
-
-                // on declanche la revalidation du modèle
-                firePropertyChange(VALID_PROPERTY_NAME, isValid());
-            }
-        };
-
-        selectionDataModel = new DataSelectionModel();
-
-        availableIncomingModes = EnumSet.noneOf(DbMode.class);
-
-        if (log.isDebugEnabled()) {
-            log.debug("model [" + this + "] is instanciate.");
-        }
     }
 
     public DataSelectionModel getSelectionDataModel() {
@@ -621,18 +599,14 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
         centralSourceModel.start(DbMode.USE_REMOTE);
 
         if (log.isDebugEnabled()) {
-            centralSourceModel.addPropertyChangeListener(new PropertyChangeListener() {
-
-                @Override
-                public void propertyChange(PropertyChangeEvent evt) {
-                    String name = evt.getPropertyName();
-                    Object oldValue = evt.getOldValue();
-                    Object newValue = evt.getNewValue();
-                    if (log.isDebugEnabled()) {
-                        log.debug(evt.getSource() + " - Property [" + name + "] has changed from  " + oldValue + " to " + newValue);
-                    }
-
+            centralSourceModel.addPropertyChangeListener(evt -> {
+                String name = evt.getPropertyName();
+                Object oldValue = evt.getOldValue();
+                Object newValue = evt.getNewValue();
+                if (log.isDebugEnabled()) {
+                    log.debug(evt.getSource() + " - Property [" + name + "] has changed from  " + oldValue + " to " + newValue);
                 }
+
             });
         }
 
@@ -744,18 +718,14 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
         localSourceModel.start(dbMode);
 
         if (log.isDebugEnabled()) {
-            localSourceModel.addPropertyChangeListener(new PropertyChangeListener() {
-
-                @Override
-                public void propertyChange(PropertyChangeEvent evt) {
-                    String name = evt.getPropertyName();
-                    Object oldValue = evt.getOldValue();
-                    Object newValue = evt.getNewValue();
-                    if (log.isDebugEnabled()) {
-                        log.debug(evt.getSource() + " - Property [" + name + "] has changed from  " + oldValue + " to " + newValue);
-                    }
-
+            localSourceModel.addPropertyChangeListener(evt -> {
+                String name = evt.getPropertyName();
+                Object oldValue = evt.getOldValue();
+                Object newValue = evt.getNewValue();
+                if (log.isDebugEnabled()) {
+                    log.debug(evt.getSource() + " - Property [" + name + "] has changed from  " + oldValue + " to " + newValue);
                 }
+
             });
         }
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java
index 92d26de..bc5ad7c 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java
@@ -40,11 +40,9 @@ import jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Date;
 import java.util.Set;
-import java.util.concurrent.Callable;
 
 import static org.nuiton.i18n.I18n.t;
 
@@ -84,21 +82,17 @@ public class ConsolidateUIHandler extends AdminTabUIHandler {
         final SelectDataUI selectTabUI = (SelectDataUI)
                 ui.getStepUI(AdminStep.SELECT_DATA);
 
-        PropertyChangeListener listener = new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                AdminUIModel model = (AdminUIModel) evt.getSource();
-                if (!model.containsStep(selectTabUI.getStep())) {
-                    // avoid multi-cast
-                    return;
-                }
-                DataSelectionModel value = (DataSelectionModel) evt.getNewValue();
-                if (log.isDebugEnabled()) {
-                    log.debug("selection model changed to " + value);
-                }
-                updateSelectionModel(selectTabUI);
+        PropertyChangeListener listener = evt -> {
+            AdminUIModel model1 = (AdminUIModel) evt.getSource();
+            if (!model1.containsStep(selectTabUI.getStep())) {
+                // avoid multi-cast
+                return;
+            }
+            DataSelectionModel value = (DataSelectionModel) evt.getNewValue();
+            if (log.isDebugEnabled()) {
+                log.debug("selection model changed to " + value);
             }
+            updateSelectionModel(selectTabUI);
         };
         tabUI.getModel().addPropertyChangeListener(
                 AdminUIModel.SELECTION_MODEL_CHANGED_PROPERTY_NAME,
@@ -108,16 +102,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler {
 
     public void startAction() {
 
-        addAdminWorker(
-                ((ConsolidateUI) ui).getStartButton().getToolTipText(),
-                new Callable<WizardState>() {
-
-                    @Override
-                    public WizardState call() throws Exception {
-                        return doAction();
-                    }
-                }
-        );
+        addAdminWorker(((ConsolidateUI) ui).getStartButton().getToolTipText(), () -> doAction());
     }
 
     public WizardState doAction() throws Exception {
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java
index 6e6b40b..704b093 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java
@@ -59,9 +59,6 @@ import javax.swing.table.DefaultTableCellRenderer;
 import java.awt.Component;
 import java.awt.Font;
 import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.util.List;
 import java.util.Map;
@@ -84,16 +81,11 @@ public class ReportUIHandler extends AdminTabUIHandler {
 
     private static final TimeLog timeLog = new TimeLog(ReportUIHandler.class, 0, 1000);
 
-    final Runnable revalidateTabUI = new Runnable() {
-
-        @Override
-        public void run() {
-            getUi().revalidate();
-        }
-    };
+    private final Runnable revalidateTabUI;
 
     public ReportUIHandler(AdminTabUI ui) {
         super(ui);
+        revalidateTabUI = () -> getUi().revalidate();
     }
 
     public void initTabUI(AdminUI ui, final ReportUI tabUI) {
@@ -109,44 +101,33 @@ public class ReportUIHandler extends AdminTabUIHandler {
         UIHelper.setLayerUI(tabUI.getContent(), ui.getConfigBlockLayerUI());
 
         ReportModel stepModel = getStepModel();
-        stepModel.addPropertyChangeListener(new PropertyChangeListener() {
+        stepModel.addPropertyChangeListener(evt -> {
 
-            @SuppressWarnings({"unchecked"})
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
+            if (getModel().getModelState() == WizardState.CANCELED) {
 
-                if (getModel().getModelState() == WizardState.CANCELED) {
-
-                    // action annulée, on ne declanche plus rien
-                    return;
-                }
-                String propertyName = evt.getPropertyName();
-                Object newValue = evt.getNewValue();
-
-                final ReportModel source = (ReportModel) evt.getSource();
-
-                if (ReportModel.REPORTS_PROPERTY_NAME.equals(propertyName)) {
-                    List<?> reports = (List<?>) newValue;
-                    onReportsChanged(tabUI, reports);
-                } else if (ReportModel.SELECTED_REPORT_PROPERTY_NAME.equals(propertyName)) {
-                    Report report = (Report) newValue;
-                    onSelectedReportChanged(tabUI, source, report);
-                } else if (ReportModel.VARIABLES_PROPERTY_NAME.equals(propertyName)) {
-                    Map<String, Object> variables =
-                            (Map<String, Object>) newValue;
-                    onVariablesChanges(source, variables);
-                } else if (ReportModel.VALID_PROPERTY_NAME.equals(propertyName)) {
-                    final Boolean valid = (Boolean) newValue;
-                    SwingUtilities.invokeLater(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            onValidChanged(source, valid != null && valid);
-                        }
-                    });
+                // action annulée, on ne declanche plus rien
+                return;
+            }
+            String propertyName = evt.getPropertyName();
+            Object newValue = evt.getNewValue();
+
+            final ReportModel source = (ReportModel) evt.getSource();
+
+            if (ReportModel.REPORTS_PROPERTY_NAME.equals(propertyName)) {
+                List<?> reports = (List<?>) newValue;
+                onReportsChanged(tabUI, reports);
+            } else if (ReportModel.SELECTED_REPORT_PROPERTY_NAME.equals(propertyName)) {
+                Report report = (Report) newValue;
+                onSelectedReportChanged(tabUI, source, report);
+            } else if (ReportModel.VARIABLES_PROPERTY_NAME.equals(propertyName)) {
+                Map<String, Object> variables =
+                        (Map<String, Object>) newValue;
+                onVariablesChanges(source, variables);
+            } else if (ReportModel.VALID_PROPERTY_NAME.equals(propertyName)) {
+                final Boolean valid = (Boolean) newValue;
+                SwingUtilities.invokeLater(() -> onValidChanged(source, valid != null && valid));
 
 
-                }
             }
         });
 
@@ -217,24 +198,20 @@ public class ReportUIHandler extends AdminTabUIHandler {
         configUI.getExtraConfig().add(extraConfig);
 
         final SelectDataUI selectTabUI = (SelectDataUI) ui.getStepUI(AdminStep.SELECT_DATA);
-        ui.getModel().addPropertyChangeListener(AdminUIModel.SELECTION_MODEL_CHANGED_PROPERTY_NAME, new PropertyChangeListener() {
+        ui.getModel().addPropertyChangeListener(AdminUIModel.SELECTION_MODEL_CHANGED_PROPERTY_NAME, evt -> {
+            AdminUIModel model1 = (AdminUIModel) evt.getSource();
+            if (!model1.containsStep(selectTabUI.getStep())) {
 
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                AdminUIModel model = (AdminUIModel) evt.getSource();
-                if (!model.containsStep(selectTabUI.getStep())) {
-
-                    // avoid multi-cast
-                    return;
-                }
+                // avoid multi-cast
+                return;
+            }
 
-                DataSelectionModel value = (DataSelectionModel) evt.getNewValue();
-                if (log.isDebugEnabled()) {
-                    log.debug("selection model changed to " + value.getDatas());
-                    log.debug("IS USE DATA ? : " + value.isUseData());
-                }
-                updateSelectionModel(selectTabUI);
+            DataSelectionModel value = (DataSelectionModel) evt.getNewValue();
+            if (log.isDebugEnabled()) {
+                log.debug("selection model changed to " + value.getDatas());
+                log.debug("IS USE DATA ? : " + value.isUseData());
             }
+            updateSelectionModel(selectTabUI);
         });
     }
 
@@ -374,27 +351,23 @@ public class ReportUIHandler extends AdminTabUIHandler {
                     combo.init((JXPathDecorator<Object>) decorator, universe);
                     JComboBox jComboBox = combo.getCombobox();
                     jComboBox.putClientProperty(VARIABLE_NAME, variableName);
-                    jComboBox.addItemListener(new ItemListener() {
-
-                        @Override
-                        public void itemStateChanged(ItemEvent e) {
+                    jComboBox.addItemListener(e -> {
 
-                            JComboBox comboBox = (JComboBox) e.getSource();
+                        JComboBox comboBox = (JComboBox) e.getSource();
 
-                            if (e.getStateChange() == ItemEvent.DESELECTED) {
+                        if (e.getStateChange() == ItemEvent.DESELECTED) {
 
-                                // ne rien faire de l'évènement de déselection
-                                // sauf si le modèle devient vide
+                            // ne rien faire de l'évènement de déselection
+                            // sauf si le modèle devient vide
 
-                                if (comboBox.getSelectedItem() == null) {
-                                    updateVariable(comboBox, null);
-                                }
-                                return;
+                            if (comboBox.getSelectedItem() == null) {
+                                updateVariable(comboBox, null);
                             }
-
-                            Object o = e.getItem();
-                            updateVariable(comboBox, o);
+                            return;
                         }
+
+                        Object o = e.getItem();
+                        updateVariable(comboBox, o);
                     });
                 }
             }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java
index 48bdea7..a8818f4 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java
@@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import fr.ird.observe.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.decoration.DecoratorService;
 import fr.ird.observe.db.ObserveSwingDataSource;
 import fr.ird.observe.services.dto.AbstractReference;
 import fr.ird.observe.services.dto.DataReference;
@@ -42,7 +43,6 @@ import fr.ird.observe.services.service.actions.validate.ValidateResultForDtos;
 import fr.ird.observe.services.service.actions.validate.ValidateService;
 import fr.ird.observe.services.service.actions.validate.ValidationMessage;
 import fr.ird.observe.services.service.actions.validate.ValidatorDto;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
 import fr.ird.observe.ui.UIHelper;
 import fr.ird.observe.ui.admin.AdminStep;
 import fr.ird.observe.ui.admin.AdminTabUI;
@@ -70,8 +70,6 @@ import javax.swing.JCheckBox;
 import javax.swing.JTable;
 import javax.swing.RowSorter;
 import javax.swing.SortOrder;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
@@ -80,7 +78,6 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.Callable;
 
 import static org.nuiton.i18n.I18n.n;
 import static org.nuiton.i18n.I18n.t;
@@ -155,54 +152,46 @@ public class ValidateUIHandler extends AdminTabUIHandler {
 
         final SelectDataUI selectTabUI = (SelectDataUI) ui.getStepUI(AdminStep.SELECT_DATA);
 
-        getModel().getValidateModel().addPropertyChangeListener(ValidateModel.PROPERTY_MODEL_MODE, new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                ValidationModelMode value = (ValidationModelMode) evt.getNewValue();
-                if (value == null) {
-                    // rien a faire pour le moment...
-                    return;
-                }
-                DataSelectionModel selectDataModel;
-                selectDataModel = selectTabUI.getSelectDataModel();
-                if (log.isDebugEnabled()) {
-                    log.debug("validation model changed to " + value);
-                }
-                switch (value) {
-                    case REFERENTIEL:
-
-                        selectDataModel.setUseData(false);
-                        selectDataModel.setUseReferentiel(true);
-                        break;
-                    case DATA:
-                        selectDataModel.setUseData(true);
-                        selectDataModel.setUseReferentiel(false);
-                        break;
-                    case ALL:
-                        selectDataModel.setUseData(true);
-                        selectDataModel.setUseReferentiel(true);
-                        break;
-                }
-                //updateModel();
+        getModel().getValidateModel().addPropertyChangeListener(ValidateModel.PROPERTY_MODEL_MODE, evt -> {
+            ValidationModelMode value = (ValidationModelMode) evt.getNewValue();
+            if (value == null) {
+                // rien a faire pour le moment...
+                return;
+            }
+            DataSelectionModel selectDataModel;
+            selectDataModel = selectTabUI.getSelectDataModel();
+            if (log.isDebugEnabled()) {
+                log.debug("validation model changed to " + value);
+            }
+            switch (value) {
+                case REFERENTIEL:
+
+                    selectDataModel.setUseData(false);
+                    selectDataModel.setUseReferentiel(true);
+                    break;
+                case DATA:
+                    selectDataModel.setUseData(true);
+                    selectDataModel.setUseReferentiel(false);
+                    break;
+                case ALL:
+                    selectDataModel.setUseData(true);
+                    selectDataModel.setUseReferentiel(true);
+                    break;
             }
+            //updateModel();
         });
 
-        selectTabUI.getModel().addPropertyChangeListener(AdminUIModel.SELECTION_MODEL_CHANGED_PROPERTY_NAME, new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                AdminUIModel model = (AdminUIModel) evt.getSource();
-                if (!model.containsStep(selectTabUI.getStep())) {
-                    // avoid multi-cast
-                    return;
-                }
-                DataSelectionModel value = (DataSelectionModel) evt.getNewValue();
-                if (log.isInfoEnabled()) {
-                    log.info("selection model changed to " + value);
-                }
-                updateSelectionModel(selectTabUI);
+        selectTabUI.getModel().addPropertyChangeListener(AdminUIModel.SELECTION_MODEL_CHANGED_PROPERTY_NAME, evt -> {
+            AdminUIModel model1 = (AdminUIModel) evt.getSource();
+            if (!model1.containsStep(selectTabUI.getStep())) {
+                // avoid multi-cast
+                return;
+            }
+            DataSelectionModel value = (DataSelectionModel) evt.getNewValue();
+            if (log.isInfoEnabled()) {
+                log.info("selection model changed to " + value);
             }
+            updateSelectionModel(selectTabUI);
         });
 
         ImmutableSet<ValidatorDto> validators = ObserveSwingApplicationContext.get().getValidators();
@@ -332,16 +321,7 @@ public class ValidateUIHandler extends AdminTabUIHandler {
 
     public void startAction() {
 
-        addAdminWorker(
-                ((ValidateUI) ui).getStartButton().getToolTipText(),
-                new Callable<WizardState>() {
-
-                    @Override
-                    public WizardState call() throws Exception {
-                        return doAction();
-                    }
-                }
-        );
+        addAdminWorker(((ValidateUI) ui).getStartButton().getToolTipText(), this::doAction);
     }
 
     public WizardState doAction() throws Exception {
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java
index 4084704..3c657ee 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java
@@ -27,6 +27,9 @@ import com.google.common.collect.Lists;
 import fr.ird.observe.ObserveOpenDataManager;
 import fr.ird.observe.ObserveSwingApplicationContext;
 import fr.ird.observe.ObserveSwingTechnicalException;
+import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator;
+import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.db.DataContext;
 import fr.ird.observe.db.ObserveSwingDataSource;
 import fr.ird.observe.db.constants.DataContextType;
@@ -42,15 +45,12 @@ import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
 import fr.ird.observe.services.dto.referential.ReferentialReferenceSet;
 import fr.ird.observe.services.dto.referential.ReferentialReferences;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
 import fr.ird.observe.ui.UIHelper;
 import fr.ird.observe.ui.actions.shared.AbstractUIAction;
 import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.ui.tree.AbstractObserveTreeCellRenderer;
 import fr.ird.observe.ui.tree.ObserveNode;
 import fr.ird.observe.ui.tree.ObserveTreeHelper;
-import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator;
-import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.validation.ValidationContext;
 import jaxx.runtime.JAXXContext;
 import jaxx.runtime.swing.JAXXButtonGroup;
@@ -77,8 +77,6 @@ import javax.swing.JOptionPane;
 import javax.swing.JToolBar;
 import javax.swing.UIManager;
 import java.awt.Component;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -290,13 +288,7 @@ public abstract class ContentUIHandler<E extends IdDto> {
         final ContentUIInitializer<E, ObserveContentUI<E>> uiInitializer = new ContentUIInitializer<>(ui);
         uiInitializer.initUI();
 
-        getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                updateUiWithReferenceSetsFromModel();
-            }
-        });
+        getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, evt -> updateUiWithReferenceSetsFromModel());
 
     }
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java
index c88ac61..b695eb1 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java
@@ -40,7 +40,6 @@ import org.nuiton.i18n.I18n;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.JOptionPane;
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import java.util.HashSet;
 import java.util.Set;
@@ -57,20 +56,18 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> {
     static private Log log = LogFactory.getLog(BranchlineUIHandler.class);
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
-        @Override
-        public void tableChanged(TableModelEvent e) {
-
-            SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
-            computeTabValidState(source);
-
-        }
-    };
+    protected final TableModelListener computeTabValidStateListener;
 
     private Decorator<BranchlineDto> branchlineDecorator;
 
     public BranchlineUIHandler(BranchlineUI ui) {
         super(ui, DataContextType.SetLongline, null);
+        computeTabValidStateListener = e -> {
+
+            SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
+            computeTabValidState(source);
+
+        };
     }
 
     public void edit(BranchlineDto branchline) {
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java
index c03c0f8..b422328 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java
@@ -28,14 +28,14 @@ import fr.ird.observe.ObserveSwingApplicationContext;
 import fr.ird.observe.db.DataContext;
 import fr.ird.observe.db.ObserveSwingDataSource;
 import fr.ird.observe.db.constants.DataContextType;
-import fr.ird.observe.services.dto.longline.SectionTemplate;
-import fr.ird.observe.services.dto.longline.SectionWithTemplate;
-import fr.ird.observe.services.dto.longline.SectionWithTemplates;
 import fr.ird.observe.services.dto.Form;
 import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
 import fr.ird.observe.services.dto.longline.BasketDto;
 import fr.ird.observe.services.dto.longline.BranchlineDto;
 import fr.ird.observe.services.dto.longline.SectionDto;
+import fr.ird.observe.services.dto.longline.SectionTemplate;
+import fr.ird.observe.services.dto.longline.SectionWithTemplate;
+import fr.ird.observe.services.dto.longline.SectionWithTemplates;
 import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto;
 import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDtos;
 import fr.ird.observe.services.dto.result.SaveResultDto;
@@ -54,11 +54,8 @@ import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.JComboBox;
 import javax.swing.JOptionPane;
-import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -81,107 +78,27 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong
     /** Logger */
     static private Log log = LogFactory.getLog(LonglineDetailCompositionUIHandler.class);
 
-    private final PropertyChangeListener sectionTemplatesTableModelModified = new PropertyChangeListener() {
+    private final PropertyChangeListener sectionTemplatesTableModelModified;
 
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            Boolean newValue = (Boolean) evt.getNewValue();
-            onSectionTemplatesTableModelModified(newValue);
-        }
-    };
+    private final PropertyChangeListener sectionsTableModelModified;
 
-    private final PropertyChangeListener sectionsTableModelModified = new PropertyChangeListener() {
+    private final TableModelListener sectionsTableModelChanged;
 
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            Boolean newValue = (Boolean) evt.getNewValue();
-            onSectionsTableModelModified(newValue);
-        }
-    };
+    private final PropertyChangeListener branchlineDetailChanged;
 
-    private final TableModelListener sectionsTableModelChanged = new TableModelListener() {
+    private final PropertyChangeListener selectedSectionTemplateChanged;
 
-        @Override
-        public void tableChanged(TableModelEvent e) {
-            SectionsTableModel source = (SectionsTableModel) e.getSource();
-            onSectionsTableModelChanged(source.getData());
-        }
-    };
+    private final PropertyChangeListener basketsTableModelModified;
 
-    private final PropertyChangeListener branchlineDetailChanged = new PropertyChangeListener() {
+    private final TableModelListener basketsTableModelChanged;
 
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
+    private final PropertyChangeListener branchinesTableModelModified;
 
-            getUi().getValidator().setChanged(true);
+    private final TableModelListener branchinesTableModelChanged;
 
-        }
-    };
-
-    private final PropertyChangeListener selectedSectionTemplateChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            SectionTemplate newValue = (SectionTemplate) evt.getNewValue();
-            onSelectedSectionTemplateChanged(newValue);
-        }
-    };
-
-    private final PropertyChangeListener basketsTableModelModified = new PropertyChangeListener() {
+    private final PropertyChangeListener selectedBranchlineChanged;
 
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            Boolean newValue = (Boolean) evt.getNewValue();
-            onBasketsTableModelModified(newValue);
-        }
-    };
-
-    private final TableModelListener basketsTableModelChanged = new TableModelListener() {
-
-        @Override
-        public void tableChanged(TableModelEvent e) {
-            BasketsTableModel source = (BasketsTableModel) e.getSource();
-            onBasketsTableModelChanged(source.getData());
-        }
-    };
-
-    private final PropertyChangeListener branchinesTableModelModified = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            onBranchlinesTableModelModified((Boolean) evt.getNewValue());
-        }
-    };
-
-    private final TableModelListener branchinesTableModelChanged = new TableModelListener() {
-
-        @Override
-        public void tableChanged(TableModelEvent e) {
-            BranchlinesTableModel source = (BranchlinesTableModel) e.getSource();
-            onBranchlinesTableModelChanged(source.getData());
-        }
-    };
-
-    private final PropertyChangeListener selectedBranchlineChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            BranchlineDto previousValue = (BranchlineDto) evt.getOldValue();
-            BranchlineDto newValue = (BranchlineDto) evt.getNewValue();
-            onSelectedBranchlineChanged(previousValue, newValue);
-        }
-    };
-
-    private final ChangeListener tabbedPaneChanged = new ChangeListener() {
-
-        @Override
-        public void stateChanged(ChangeEvent e) {
-            JVetoableTabbedPane source = (JVetoableTabbedPane) e.getSource();
-            int previousIndex = source.getPreviousIndex();
-            int selectedIndex = source.getSelectedIndex();
-            onTabChanged(previousIndex, selectedIndex);
-        }
-    };
+    private final ChangeListener tabbedPaneChanged;
 
     private Decorator<SectionDto> sectionDecorator;
 
@@ -209,10 +126,70 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong
      */
     private boolean sectionAdjusting;
 
-    private final PropertyChangeListener modelCanGenerateChanged = new PropertyChangeListener() {
+    private final PropertyChangeListener modelCanGenerateChanged;
+
+    private final PropertyChangeListener selectedSectionChanged;
+
+    /**
+     * To avoid branchline flush when basket is adjusting (used when changing selected basket).
+     */
+    private boolean basketAdjusting;
+
+    private final PropertyChangeListener selectedBasketChanged;
+
+    private LonglineDetailCompositionUIValidationHelper validationHelper;
+
+    /**
+     * To avoid some checks while opening ui.
+     */
+    private boolean onOpen;
 
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
+    private JVetoableTabbedPane.ChangeSelectedIndex tabbedPaneWillChanged;
+
+    public LonglineDetailCompositionUIHandler(LonglineDetailCompositionUI ui) {
+        super(ui, DataContextType.ActivityLongline, DataContextType.SetLongline);
+        sectionTemplatesTableModelModified = evt -> {
+            Boolean newValue = (Boolean) evt.getNewValue();
+            onSectionTemplatesTableModelModified(newValue);
+        };
+        sectionsTableModelModified = evt -> {
+            Boolean newValue = (Boolean) evt.getNewValue();
+            onSectionsTableModelModified(newValue);
+        };
+        sectionsTableModelChanged = e -> {
+            SectionsTableModel source = (SectionsTableModel) e.getSource();
+            onSectionsTableModelChanged(source.getData());
+        };
+        branchlineDetailChanged = evt -> getUi().getValidator().setChanged(true);
+        selectedSectionTemplateChanged = evt -> {
+            SectionTemplate newValue = (SectionTemplate) evt.getNewValue();
+            onSelectedSectionTemplateChanged(newValue);
+        };
+        basketsTableModelModified = evt -> {
+            Boolean newValue = (Boolean) evt.getNewValue();
+            onBasketsTableModelModified(newValue);
+        };
+        basketsTableModelChanged = e -> {
+            BasketsTableModel source = (BasketsTableModel) e.getSource();
+            onBasketsTableModelChanged(source.getData());
+        };
+        branchinesTableModelModified = evt -> onBranchlinesTableModelModified((Boolean) evt.getNewValue());
+        branchinesTableModelChanged = e -> {
+            BranchlinesTableModel source = (BranchlinesTableModel) e.getSource();
+            onBranchlinesTableModelChanged(source.getData());
+        };
+        selectedBranchlineChanged = evt -> {
+            BranchlineDto previousValue = (BranchlineDto) evt.getOldValue();
+            BranchlineDto newValue = (BranchlineDto) evt.getNewValue();
+            onSelectedBranchlineChanged(previousValue, newValue);
+        };
+        tabbedPaneChanged = e -> {
+            JVetoableTabbedPane source = (JVetoableTabbedPane) e.getSource();
+            int previousIndex = source.getPreviousIndex();
+            int selectedIndex = source.getSelectedIndex();
+            onTabChanged(previousIndex, selectedIndex);
+        };
+        modelCanGenerateChanged = evt -> {
 
             sectionAdjusting = true;
 
@@ -223,13 +200,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong
 
                 sectionAdjusting = false;
             }
-        }
-    };
-
-    private final PropertyChangeListener selectedSectionChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
+        };
+        selectedSectionChanged = evt -> {
 
             sectionAdjusting = true;
 
@@ -241,18 +213,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong
 
                 sectionAdjusting = false;
             }
-        }
-    };
-
-    /**
-     * To avoid branchline flush when basket is adjusting (used when changing selected basket).
-     */
-    private boolean basketAdjusting;
-
-    private final PropertyChangeListener selectedBasketChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
+        };
+        selectedBasketChanged = evt -> {
 
             basketAdjusting = true;
 
@@ -264,26 +226,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong
 
                 basketAdjusting = false;
             }
-        }
-    };
-
-    private LonglineDetailCompositionUIValidationHelper validationHelper;
-
-    /**
-     * To avoid some checks while opening ui.
-     */
-    private boolean onOpen;
-
-    private JVetoableTabbedPane.ChangeSelectedIndex tabbedPaneWillChanged = new JVetoableTabbedPane.ChangeSelectedIndex() {
-
-        @Override
-        public boolean canChangeTab(int currentSelectedIndex, int newSelectedIndex) {
-            return onTabWillChanged(currentSelectedIndex, newSelectedIndex);
-        }
-    };
-
-    public LonglineDetailCompositionUIHandler(LonglineDetailCompositionUI ui) {
-        super(ui, DataContextType.ActivityLongline, DataContextType.SetLongline);
+        };
+        tabbedPaneWillChanged = this::onTabWillChanged;
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java
index 6a4e926..ef26032 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java
@@ -22,14 +22,13 @@ package fr.ird.observe.ui.content.impl.longline;
  * #L%
  */
 
-import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import fr.ird.observe.services.dto.longline.SectionWithTemplate;
+import fr.ird.observe.application.swing.decoration.DecoratorService;
 import fr.ird.observe.services.dto.longline.BasketDto;
 import fr.ird.observe.services.dto.longline.BranchlineDto;
 import fr.ird.observe.services.dto.longline.SectionDto;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.services.dto.longline.SectionWithTemplate;
 import fr.ird.observe.ui.util.ObserveSwingValidatorMessageTableModel;
 import jaxx.runtime.validator.swing.SwingValidator;
 import jaxx.runtime.validator.swing.SwingValidatorMessage;
@@ -158,13 +157,10 @@ public class LonglineDetailCompositionUIValidationHelper {
     }
 
     public void removeOldMessages() {
-        errorTableModel.removeMessages(new Predicate<SwingValidatorMessage>() {
-            @Override
-            public boolean apply(SwingValidatorMessage input) {
-                SimpleBeanValidator<?> validator = input.getValidator();
-                boolean remove = validators.contains(validator);
-                return remove;
-            }
+        errorTableModel.removeMessages(input -> {
+            SimpleBeanValidator<?> validator = input.getValidator();
+            boolean remove = validators.contains(validator);
+            return remove;
         });
     }
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java
index e736167..dc8d10a 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java
@@ -48,9 +48,7 @@ import org.nuiton.jaxx.widgets.gis.CoordinateFormat;
 import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditorModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.HashSet;
 import java.util.Set;
@@ -69,36 +67,13 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> {
     static private Log log = LogFactory.getLog(SetLonglineUIHandler.class);
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
-
-        @Override
-        public void tableChanged(TableModelEvent e) {
-
-            SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
-            computeTabValidState(source);
-
-        }
-    };
+    protected final TableModelListener computeTabValidStateListener;
 
     // Change toogle target visible on all TimeEditors
-    protected final PropertyChangeListener onToogleTimeEditorSliderChangedListener = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            Boolean newValue = (Boolean) evt.getNewValue();
-            onToogleTimeEditorSliderChanged(newValue);
-        }
-    };
+    protected final PropertyChangeListener onToogleTimeEditorSliderChangedListener;
 
     // Change toogle target visible on all TimeEditors
-    protected final PropertyChangeListener onCoordinateFormatChangedListener = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            CoordinateFormat newValue = (CoordinateFormat) evt.getNewValue();
-            onCoordinateFormatChanged(newValue);
-        }
-    };
+    protected final PropertyChangeListener onCoordinateFormatChangedListener;
 
 //    private final LogPropertyChanges logCoordinatesChanges;
 
@@ -123,6 +98,20 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> {
     public SetLonglineUIHandler(SetLonglineUI ui) {
         super(ui, DataContextType.ActivityLongline, DataContextType.SetLongline);
 //        this.logCoordinatesChanges = new LogPropertyChanges(COORDINATES_PROPERTIES);
+        computeTabValidStateListener = e -> {
+
+            SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
+            computeTabValidState(source);
+
+        };
+        onToogleTimeEditorSliderChangedListener = evt -> {
+            Boolean newValue = (Boolean) evt.getNewValue();
+            onToogleTimeEditorSliderChanged(newValue);
+        };
+        onCoordinateFormatChangedListener = evt -> {
+            CoordinateFormat newValue = (CoordinateFormat) evt.getNewValue();
+            onCoordinateFormatChanged(newValue);
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java
index 0d4681c..f6bfced 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java
@@ -308,13 +308,10 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH
                 break;
         }
 
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
+        SwingUtilities.invokeLater(() -> {
 
-                // recalcul de la disposition
-                getUi().revalidate();
-            }
+            // recalcul de la disposition
+            getUi().revalidate();
         });
 
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java
index fbf03ab..4611e2c 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java
@@ -50,9 +50,7 @@ import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.DateUtil;
 import org.nuiton.validator.NuitonValidatorScope;
 
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Date;
 import java.util.HashSet;
@@ -70,29 +68,25 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> {
     static private Log log = LogFactory.getLog(SetSeineUIHandler.class);
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
-        @Override
-        public void tableChanged(TableModelEvent e) {
-
-            SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
-            computeTabValidState(source);
-
-        }
-    };
+    protected final TableModelListener computeTabValidStateListener;
 
     // Change toogle target visible on all TimeEditors
-    protected final PropertyChangeListener onToogleTimeEditorSliderChangedListener = new PropertyChangeListener() {
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            Boolean newValue = (Boolean) evt.getNewValue();
-            onToogleTimeEditorSliderChanged(newValue);
-        }
-    };
+    protected final PropertyChangeListener onToogleTimeEditorSliderChangedListener;
 
     protected boolean toogleTimeEditorSliderIsChanging;
 
     public SetSeineUIHandler(SetSeineUI ui) {
         super(ui, DataContextType.ActivitySeine, DataContextType.SetSeine);
+        computeTabValidStateListener = e -> {
+
+            SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
+            computeTabValidState(source);
+
+        };
+        onToogleTimeEditorSliderChangedListener = evt -> {
+            Boolean newValue = (Boolean) evt.getNewValue();
+            onToogleTimeEditorSliderChanged(newValue);
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java
index 7f450c0..7978825 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java
@@ -29,8 +29,6 @@ import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDt
 import fr.ird.observe.ui.content.open.ContentOpenableUIModel;
 import org.nuiton.util.DateUtil;
 
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.Date;
 
 /**
@@ -52,13 +50,10 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong
     public ActivityLonglineUIModel() {
         super(ActivityLonglineDto.class);
 
-        getBean().addPropertyChangeListener(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, new PropertyChangeListener() {
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                boolean oldValue = VesselActivityLonglineDtos.isSetOperation((ReferentialReference<VesselActivityLonglineDto>) evt.getOldValue());
-                boolean newValue = VesselActivityLonglineDtos.isSetOperation((ReferentialReference<VesselActivityLonglineDto>) evt.getNewValue());
-                firePropertyChange(PROPERTY_SET_OPERATION, oldValue, newValue);
-            }
+        getBean().addPropertyChangeListener(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, evt -> {
+            boolean oldValue = VesselActivityLonglineDtos.isSetOperation((ReferentialReference<VesselActivityLonglineDto>) evt.getOldValue());
+            boolean newValue = VesselActivityLonglineDtos.isSetOperation((ReferentialReference<VesselActivityLonglineDto>) evt.getNewValue());
+            firePropertyChange(PROPERTY_SET_OPERATION, oldValue, newValue);
         });
     }
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java
index 62e4374..113daa5 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java
@@ -46,8 +46,6 @@ import org.nuiton.util.DateUtil;
 
 import javax.swing.JTabbedPane;
 import javax.swing.SwingUtilities;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import java.util.Collection;
 import java.util.Date;
 import java.util.LinkedList;
@@ -100,36 +98,28 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline
 
         tripMap.getHandler().setConfig(config);
 
-        getUi().getTripLonglineTabPane().addChangeListener(new ChangeListener() {
+        getUi().getTripLonglineTabPane().addChangeListener(e -> {
+            JTabbedPane tripLonglineTabPane = (JTabbedPane) e.getSource();
+            TripLonglineUI ui1 = getUi();
+            TripMapUI tripMap1 = ui1.getTripMap();
+            if (tripLonglineTabPane.getSelectedComponent().equals(tripMap1)) {
+                ui1.getActions().setVisible(false);
 
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                JTabbedPane tripLonglineTabPane = (JTabbedPane) e.getSource();
-                TripLonglineUI ui = getUi();
-                TripMapUI tripMap = ui.getTripMap();
-                if (tripLonglineTabPane.getSelectedComponent().equals(tripMap)) {
-                    ui.getActions().setVisible(false);
+                if (buildTripMap) {
+                    SwingUtilities.invokeLater(() -> {
 
-                    if (buildTripMap) {
-                        SwingUtilities.invokeLater(new Runnable() {
+                        TripLonglineUI ui11 = getUi();
+                        TripMapUI tripMap11 = ui11.getTripMap();
 
-                            @Override
-                            public void run() {
+                        TripMapDto tripLonglineMap = getTripLonglineService().getTripLonglineMap(getSelectedId());
 
-                                TripLonglineUI ui = getUi();
-                                TripMapUI tripMap = ui.getTripMap();
-
-                                TripMapDto tripLonglineMap = getTripLonglineService().getTripLonglineMap(getSelectedId());
-
-                                tripMap.getHandler().doOpenMap(tripLonglineMap);
-                            }
-                        });
-                        buildTripMap = false;
-                    }
-
-                } else {
-                    ui.getActions().setVisible(true);
+                        tripMap11.getHandler().doOpenMap(tripLonglineMap);
+                    });
+                    buildTripMap = false;
                 }
+
+            } else {
+                ui1.getActions().setVisible(true);
             }
         });
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java
index cbcdceb..4e52fbd 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java
@@ -42,7 +42,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
 
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import java.util.HashSet;
 import java.util.Set;
@@ -60,16 +59,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei
     static private Log log = LogFactory.getLog(ActivitySeineUIHandler.class);
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
-
-        @Override
-        public void tableChanged(TableModelEvent e) {
-
-            SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
-            computeTabValidState(source);
-
-        }
-    };
+    protected final TableModelListener computeTabValidStateListener;
 
 //    static ImmutableSet<String> COORDINATES_PROPERTIES = ImmutableSet.of(ActivitySeine.PROPERTY_QUADRANT,
 //                                                                         ActivitySeine.PROPERTY_LATITUDE,
@@ -84,6 +74,12 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei
               DataContextType.ActivitySeine,
               n("observe.activitySeine.message.not.open"));
 //        this.logCoordinatesChanges = new LogPropertyChanges(COORDINATES_PROPERTIES);
+        computeTabValidStateListener = e -> {
+
+            SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
+            computeTabValidState(source);
+
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java
index 27b97cd..912a676 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java
@@ -29,8 +29,6 @@ import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDtos;
 import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.ui.content.open.ContentOpenableUIModel;
 
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.Set;
 
 /**
@@ -75,21 +73,18 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt
 
     public ActivitySeineUIModel() {
         super(ActivitySeineDto.class);
-        getBean().addPropertyChangeListener(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, new PropertyChangeListener() {
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                ReferentialReference<VesselActivitySeineDto> oldActivitySeine = (ReferentialReference<VesselActivitySeineDto>) evt.getOldValue();
-                ReferentialReference<VesselActivitySeineDto> newActivitySeine = (ReferentialReference<VesselActivitySeineDto>) evt.getNewValue();
-                {
-                    boolean oldValue = VesselActivitySeineDtos.isSetOperation(oldActivitySeine);
-                    boolean newValue = VesselActivitySeineDtos.isSetOperation(newActivitySeine);
-                    firePropertyChange(PROPERTY_SET_OPERATION, oldValue, newValue);
-                }
-                {
-                    boolean oldValue = VesselActivitySeineDtos.isChangedZoneOperation(oldActivitySeine);
-                    boolean newValue = VesselActivitySeineDtos.isChangedZoneOperation(newActivitySeine);
-                    firePropertyChange(PROPERTY_CHANGED_ZONE_OPERATION, oldValue, newValue);
-                }
+        getBean().addPropertyChangeListener(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, evt -> {
+            ReferentialReference<VesselActivitySeineDto> oldActivitySeine = (ReferentialReference<VesselActivitySeineDto>) evt.getOldValue();
+            ReferentialReference<VesselActivitySeineDto> newActivitySeine = (ReferentialReference<VesselActivitySeineDto>) evt.getNewValue();
+            {
+                boolean oldValue = VesselActivitySeineDtos.isSetOperation(oldActivitySeine);
+                boolean newValue = VesselActivitySeineDtos.isSetOperation(newActivitySeine);
+                firePropertyChange(PROPERTY_SET_OPERATION, oldValue, newValue);
+            }
+            {
+                boolean oldValue = VesselActivitySeineDtos.isChangedZoneOperation(oldActivitySeine);
+                boolean newValue = VesselActivitySeineDtos.isChangedZoneOperation(newActivitySeine);
+                firePropertyChange(PROPERTY_CHANGED_ZONE_OPERATION, oldValue, newValue);
             }
         });
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java
index fca0e9f..b466d5b 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java
@@ -45,8 +45,6 @@ import org.nuiton.util.DateUtil;
 
 import javax.swing.JTabbedPane;
 import javax.swing.SwingUtilities;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import java.util.Collection;
 import java.util.Date;
 import java.util.LinkedList;
@@ -98,36 +96,28 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> {
 
         tripMap.getHandler().setConfig(config);
 
-        getUi().getTripSeineTabPane().addChangeListener(new ChangeListener() {
+        getUi().getTripSeineTabPane().addChangeListener(e -> {
+            JTabbedPane tripSeineTabPane = (JTabbedPane) e.getSource();
+            TripSeineUI ui1 = getUi();
+            TripMapUI tripMap1 = ui1.getTripMap();
+            if (tripSeineTabPane.getSelectedComponent().equals(tripMap1)) {
+                ui1.getActions().setVisible(false);
 
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                JTabbedPane tripSeineTabPane = (JTabbedPane) e.getSource();
-                TripSeineUI ui = getUi();
-                TripMapUI tripMap = ui.getTripMap();
-                if (tripSeineTabPane.getSelectedComponent().equals(tripMap)) {
-                    ui.getActions().setVisible(false);
+                if (buildTripMap) {
+                    SwingUtilities.invokeLater(() -> {
 
-                    if (buildTripMap) {
-                        SwingUtilities.invokeLater(new Runnable() {
+                        TripSeineUI ui11 = getUi();
+                        TripMapUI tripMap11 = ui11.getTripMap();
+                        TripMapDto tripSeineMap = getTripSeineService().getTripSeineMap(getSelectedId());
 
-                            @Override
-                            public void run() {
 
-                                TripSeineUI ui = getUi();
-                                TripMapUI tripMap = ui.getTripMap();
-                                TripMapDto tripSeineMap = getTripSeineService().getTripSeineMap(getSelectedId());
-
-
-                                tripMap.getHandler().doOpenMap(tripSeineMap);
-                            }
-                        });
-                        buildTripMap = false;
-                    }
-
-                } else {
-                    ui.getActions().setVisible(true);
+                        tripMap11.getHandler().doOpenMap(tripSeineMap);
+                    });
+                    buildTripMap = false;
                 }
+
+            } else {
+                ui1.getActions().setVisible(true);
             }
         });
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java
index c4b8264..f8d412d 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java
@@ -102,29 +102,11 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content
     private static final Log log =
             LogFactory.getLog(ContentReferenceUIHandler.class);
 
-    final private Runnable revalidate = new Runnable() {
+    private final Runnable revalidate;
 
-        @Override
-        public void run() {
+    private final ReferentialContentUIInitializer<E, ContentReferenceUI<E>> uiInitializer;
 
-            // revalidate ui layout
-            ContentReferenceUI<E> ui = getUi();
-            Container parent = ui.getParent();
-            if (parent == null) {
-
-                // plus de parent donc rien a faire
-                return;
-            }
-            if (log.isDebugEnabled()) {
-                log.debug("Will revalidate " + parent.getName());
-            }
-            ui.revalidate();
-        }
-    };
-
-    private ReferentialContentUIInitializer<E, ContentReferenceUI<E>> uiInitializer;
-
-    protected final FastDateFormat dateFormat;
+    private final FastDateFormat dateFormat;
 
     public ContentReferenceUIHandler(ContentReferenceUI<E> ui) {
         super(ui, null, null);
@@ -136,6 +118,21 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content
             dateFormat = FastDateFormat.getInstance("dd/MM/yyyy");
         }
 
+        revalidate = () -> {
+
+            // revalidate ui layout
+            ContentReferenceUI<E> ui1 = getUi();
+            Container parent = ui1.getParent();
+            if (parent == null) {
+
+                // plus de parent donc rien a faire
+                return;
+            }
+            if (log.isDebugEnabled()) {
+                log.debug("Will revalidate " + parent.getName());
+            }
+            ui1.revalidate();
+        };
     }
 
     public static <E extends IdDto> void showUsagesForDelete(JAXXContext tx,
@@ -146,10 +143,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content
         Decorator<?> decorator = service.getDecoratorByType(entity.getClass());
         String type = DecoratorService.getEntityLabel(entity.getClass());
         type = t(type);
-        String message = t("observe.message.show.usage.for.delete",
-                           type,
-                           decorator.toString(entity)
-        );
+        String message = t("observe.message.show.usage.for.delete", type, decorator.toString(entity));
         String message2 = t("observe.message.show.usage.for.delete2");
 
         UsagesUI usagesUI = new UsagesUI(tx);
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java
index 56a0367..1670939 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java
@@ -30,7 +30,6 @@ import jaxx.runtime.validator.swing.SwingValidatorMessage;
 import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import java.util.HashSet;
 import java.util.Set;
@@ -44,18 +43,16 @@ import java.util.Set;
 public class GearUIHandler extends ContentReferenceUIHandler<GearDto> {
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
-        @Override
-        public void tableChanged(TableModelEvent e) {
+    protected final TableModelListener computeTabValidStateListener;
+
+    public GearUIHandler(ContentReferenceUI<GearDto> ui) {
+        super(ui);
+        computeTabValidStateListener = e -> {
 
             SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
             computeTabValidState(source);
 
-        }
-    };
-
-    public GearUIHandler(ContentReferenceUI<GearDto> ui) {
-        super(ui);
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java
index 7399a05..02321e3 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java
@@ -30,7 +30,6 @@ import jaxx.runtime.validator.swing.SwingValidatorMessage;
 import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import java.util.HashSet;
 import java.util.Set;
@@ -44,18 +43,16 @@ import java.util.Set;
 public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<LengthWeightParameterDto> {
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
-        @Override
-        public void tableChanged(TableModelEvent e) {
+    protected final TableModelListener computeTabValidStateListener;
+
+    public LengthWeightParameterUIHandler(ContentReferenceUI<LengthWeightParameterDto> ui) {
+        super(ui);
+        computeTabValidStateListener = e -> {
 
             SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
             computeTabValidState(source);
 
-        }
-    };
-
-    public LengthWeightParameterUIHandler(ContentReferenceUI<LengthWeightParameterDto> ui) {
-        super(ui);
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java
index 589755f..8b66371 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java
@@ -30,7 +30,6 @@ import jaxx.runtime.validator.swing.SwingValidatorMessage;
 import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import java.util.HashSet;
 import java.util.Set;
@@ -44,18 +43,16 @@ import java.util.Set;
 public class ProgramUIHandler extends ContentReferenceUIHandler<ProgramDto> {
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
-        @Override
-        public void tableChanged(TableModelEvent e) {
+    protected final TableModelListener computeTabValidStateListener;
+
+    public ProgramUIHandler(ContentReferenceUI<ProgramDto> ui) {
+        super(ui);
+        computeTabValidStateListener = e -> {
 
             SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
             computeTabValidState(source);
 
-        }
-    };
-
-    public ProgramUIHandler(ContentReferenceUI<ProgramDto> ui) {
-        super(ui);
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java
index 0368219..a2e36e9 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java
@@ -30,7 +30,6 @@ import jaxx.runtime.validator.swing.SwingValidatorMessage;
 import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import java.util.HashSet;
 import java.util.Set;
@@ -44,18 +43,16 @@ import java.util.Set;
 public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesListDto> {
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
-        @Override
-        public void tableChanged(TableModelEvent e) {
+    protected final TableModelListener computeTabValidStateListener;
+
+    public SpeciesListUIHandler(ContentReferenceUI<SpeciesListDto> ui) {
+        super(ui);
+        computeTabValidStateListener = e -> {
 
             SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
             computeTabValidState(source);
 
-        }
-    };
-
-    public SpeciesListUIHandler(ContentReferenceUI<SpeciesListDto> ui) {
-        super(ui);
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java
index a27368d..5e33dbc 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java
@@ -30,7 +30,6 @@ import jaxx.runtime.validator.swing.SwingValidatorMessage;
 import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import java.util.HashSet;
 import java.util.Set;
@@ -44,18 +43,16 @@ import java.util.Set;
 public class SpeciesUIHandler extends ContentReferenceUIHandler<SpeciesDto> {
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
-        @Override
-        public void tableChanged(TableModelEvent e) {
+    protected final TableModelListener computeTabValidStateListener;
+
+    public SpeciesUIHandler(ContentReferenceUI<SpeciesDto> ui) {
+        super(ui);
+        computeTabValidStateListener = e -> {
 
             SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
             computeTabValidState(source);
 
-        }
-    };
-
-    public SpeciesUIHandler(ContentReferenceUI<SpeciesDto> ui) {
-        super(ui);
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java
index 2cd4968..593d502 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java
@@ -30,7 +30,6 @@ import jaxx.runtime.validator.swing.SwingValidatorMessage;
 import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import java.util.HashSet;
 import java.util.Set;
@@ -44,18 +43,16 @@ import java.util.Set;
 public class VesselUIHandler extends ContentReferenceUIHandler<VesselDto> {
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
-        @Override
-        public void tableChanged(TableModelEvent e) {
+    protected final TableModelListener computeTabValidStateListener;
+
+    public VesselUIHandler(ContentReferenceUI<VesselDto> ui) {
+        super(ui);
+        computeTabValidStateListener = e -> {
 
             SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
             computeTabValidState(source);
 
-        }
-    };
-
-    public VesselUIHandler(ContentReferenceUI<VesselDto> ui) {
-        super(ui);
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableMeta.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableMeta.java
index f91df9c..100bb68 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableMeta.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableMeta.java
@@ -144,12 +144,7 @@ public class ContentTableMeta<B> implements Serializable {
         if (propertyDescriptor == null) {
             Predicate<PropertyDescriptor> predicate = Predicates.and(
                     BeanUtil.IS_READ_DESCRIPTOR,
-                    new Predicate<PropertyDescriptor>() {
-                        @Override
-                        public boolean apply(PropertyDescriptor input) {
-                            return name.equals(input.getName());
-                        }
-                    });
+                    input -> name.equals(input.getName()));
             Set<PropertyDescriptor> descriptors = BeanUtil.getDescriptors(klass, predicate);
             Preconditions.checkState(!descriptors.isEmpty(),
                                      "could not find readable property " + name + " for bean " + klass);
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java
index 0777d3b..86764d1 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java
@@ -52,7 +52,6 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.TableModelEvent;
 import javax.swing.table.DefaultTableCellRenderer;
 import java.awt.Rectangle;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.Serializable;
 import java.util.List;
@@ -166,15 +165,11 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex
             return;
         }
 
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (!ui.getSelectionModel().isSelectionEmpty()) {
-                    // on veut toujours que la ligne sélectionnée soit visible
-                    Rectangle rect = ui.getTable().getCellRect(ui.getSelectionModel().getAnchorSelectionIndex(), 0, false);
-                    ui.getTable().scrollRectToVisible(rect);
-                }
+        SwingUtilities.invokeLater(() -> {
+            if (!ui.getSelectionModel().isSelectionEmpty()) {
+                // on veut toujours que la ligne sélectionnée soit visible
+                Rectangle rect = ui.getTable().getCellRect(ui.getSelectionModel().getAnchorSelectionIndex(), 0, false);
+                ui.getTable().scrollRectToVisible(rect);
             }
         });
 
@@ -255,13 +250,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex
                 new ContentTableUIInitializer<>(getUi());
         uiInitializer.initUI();
 
-        getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                updateUiWithReferenceSetsFromModel();
-            }
-        });
+        getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, evt -> updateUiWithReferenceSetsFromModel());
 
     }
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java
index 795652c..4b3cf1a 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java
@@ -30,17 +30,17 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil;
 
-import javax.swing.*;
+import javax.swing.AbstractButton;
+import javax.swing.ActionMap;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
 import javax.swing.table.DefaultTableCellRenderer;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.awt.BorderLayout;
 import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 
 /**
  * To initialize ui.
@@ -106,48 +106,40 @@ public class ContentTableUIInitializer<E extends IdDto, D extends IdDto, UI exte
         // ajout d'un listener pour preparer l'éditeur d'une entrée selectionnée
         tableModel.addPropertyChangeListener(
                 ContentTableModel.SELECTED_ROW_PROPERTY,
-                new PropertyChangeListener() {
-
-                    @SuppressWarnings("unchecked")
-                    @Override
-                    public void propertyChange(PropertyChangeEvent evt) {
-                        ContentTableModel<E, D> model;
-                        model = (ContentTableModel<E, D>) evt.getSource();
-                        D bean = model.getRowBean();
-                        boolean create = bean.getId() == null;
-                        Integer selectedRow = (Integer) evt.getNewValue();
+                evt -> {
+                    ContentTableModel<E, D> model;
+                    model = (ContentTableModel<E, D>) evt.getSource();
+                    D bean = model.getRowBean();
+                    boolean create = bean.getId() == null;
+                    Integer selectedRow = (Integer) evt.getNewValue();
+                    if (log.isDebugEnabled()) {
+                        log.debug("callback new selectedRow : " + selectedRow + " : " + bean.getId());
+                    }
+                    getHandler().onSelectedRowChanged(selectedRow, bean, create);
+                    getModel().setRowSaved(!create);
+                    if (selectedRow == -1) {
                         if (log.isDebugEnabled()) {
-                            log.debug("callback new selectedRow : " + selectedRow + " : " + bean.getId());
+                            log.debug(">>>>>>>>>> will clear selection...");
                         }
-                        getHandler().onSelectedRowChanged(selectedRow, bean, create);
-                        getModel().setRowSaved(!create);
-                        if (selectedRow == -1) {
-                            if (log.isDebugEnabled()) {
-                                log.debug(">>>>>>>>>> will clear selection...");
-                            }
-                            // on supprime la selection
-                            ui.getSelectionModel().clearSelection();
-                            if (log.isDebugEnabled()) {
-                                log.debug("<<<<<<<<<< has clear selection...");
-                            }
-                        } else {
-                            // on met a jour le modele de selection
-                            ui.getSelectionModel().setSelectionInterval(
-                                    selectedRow, selectedRow);
+                        // on supprime la selection
+                        ui.getSelectionModel().clearSelection();
+                        if (log.isDebugEnabled()) {
+                            log.debug("<<<<<<<<<< has clear selection...");
                         }
+                    } else {
+                        // on met a jour le modele de selection
+                        ui.getSelectionModel().setSelectionInterval(
+                                selectedRow, selectedRow);
                     }
                 });
 
         getModel().addPropertyChangeListener(
                 ContentTableUIModel.PROPERTY_SHOW_DATA,
-                new PropertyChangeListener() {
-                    @Override
-                    public void propertyChange(PropertyChangeEvent evt) {
+                evt -> {
 
-                        Boolean newValue = (Boolean) evt.getNewValue();
-                        onShowDataChanged(newValue);
+                    Boolean newValue = (Boolean) evt.getNewValue();
+                    onShowDataChanged(newValue);
 
-                    }
                 });
 
     }
@@ -187,12 +179,7 @@ public class ContentTableUIInitializer<E extends IdDto, D extends IdDto, UI exte
 
             final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_RESET_TABLE_PROPERTY_NAME);
             if (propertyName != null) {
-                editor.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        JavaBeanObjectUtil.setProperty(getTableEditBean(), propertyName, null);
-                    }
-                });
+                editor.addActionListener(e -> JavaBeanObjectUtil.setProperty(getTableEditBean(), propertyName, null));
             }
 
         }
@@ -242,12 +229,9 @@ public class ContentTableUIInitializer<E extends IdDto, D extends IdDto, UI exte
 
         final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_TABLE_PROPERTY_NAME);
         if (propertyName != null) {
-            editor.addItemListener(new ItemListener() {
-                @Override
-                public void itemStateChanged(ItemEvent event) {
-                    Boolean newValue = ((JCheckBox) event.getSource()).isSelected();
-                    JavaBeanObjectUtil.setProperty(getTableEditBean(), propertyName, newValue);
-                }
+            editor.addItemListener(event -> {
+                Boolean newValue = ((JCheckBox) event.getSource()).isSelected();
+                JavaBeanObjectUtil.setProperty(getTableEditBean(), propertyName, newValue);
             });
         }
 
@@ -260,14 +244,11 @@ public class ContentTableUIInitializer<E extends IdDto, D extends IdDto, UI exte
 
         final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_TABLE_PROPERTY_NAME);
         if (propertyName != null) {
-            editor.addItemListener(new ItemListener() {
-                @Override
-                public void itemStateChanged(ItemEvent event) {
-                    if (event.getStateChange() == ItemEvent.SELECTED) {
+            editor.addItemListener(event -> {
+                if (event.getStateChange() == ItemEvent.SELECTED) {
 
-                        Boolean newValue = ((BooleanEditor) event.getSource()).getBooleanValue();
-                        JavaBeanObjectUtil.setProperty(getTableEditBean(), propertyName, newValue);
-                    }
+                    Boolean newValue = ((BooleanEditor) event.getSource()).getBooleanValue();
+                    JavaBeanObjectUtil.setProperty(getTableEditBean(), propertyName, newValue);
                 }
             });
         }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java
index 9b55b32..01ba8a9 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java
@@ -33,8 +33,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import javax.swing.JTable;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableCellRenderer;
 
 import static org.nuiton.i18n.I18n.n;
@@ -96,13 +94,9 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline
         UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer));
 
         // when model change in table, let's recompute the proportion sum
-        table.getModel().addTableModelListener(new TableModelListener() {
-
-            @Override
-            public void tableChanged(TableModelEvent e) {
-                int proportionSum = getBean().getBaitsCompositionProportionSum();
-                getBean().setBaitsCompositionProportionSum(proportionSum);
-            }
+        table.getModel().addTableModelListener(e -> {
+            int proportionSum = getBean().getBaitsCompositionProportionSum();
+            getBean().setBaitsCompositionProportionSum(proportionSum);
         });
 
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java
index 98d6423..ff6c9bf 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java
@@ -33,8 +33,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import javax.swing.JTable;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableCellRenderer;
 
 import static org.nuiton.i18n.I18n.n;
@@ -93,12 +91,9 @@ public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLo
         UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer));
 
         // when model change in table, let's recompute the proportion sum
-        table.getModel().addTableModelListener(new TableModelListener() {
-            @Override
-            public void tableChanged(TableModelEvent e) {
-                int proportionSum = getBean().getBranchlinesCompositionProportionSum();
-                getBean().setBranchlinesCompositionProportionSum(proportionSum);
-            }
+        table.getModel().addTableModelListener(e -> {
+            int proportionSum = getBean().getBranchlinesCompositionProportionSum();
+            getBean().setBranchlinesCompositionProportionSum(proportionSum);
         });
 
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java
index 2fe0e15..20be675 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java
@@ -31,8 +31,6 @@ import org.apache.commons.logging.LogFactory;
 import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil;
 
 import javax.swing.JCheckBox;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 
 /**
  * Created on 3/17/15.
@@ -57,12 +55,9 @@ public class CatchLonglineContentTableUIInitializer extends ContentTableUIInitia
         super.init(editor);
         final String propertyName = (String) editor.getClientProperty("branchlineBeanPropertyName");
         if (propertyName != null) {
-            editor.addItemListener(new ItemListener() {
-                @Override
-                public void itemStateChanged(ItemEvent event) {
-                    Boolean newValue = ((JCheckBox) event.getSource()).isSelected();
-                    JavaBeanObjectUtil.setProperty(ui.getBranchlineBean(), propertyName, newValue);
-                }
+            editor.addItemListener(event -> {
+                Boolean newValue = ((JCheckBox) event.getSource()).isSelected();
+                JavaBeanObjectUtil.setProperty(ui.getBranchlineBean(), propertyName, newValue);
             });
         }
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java
index 37e1932..c22d055 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java
@@ -24,6 +24,8 @@ package fr.ird.observe.ui.content.table.impl.longline;
 
 import com.google.common.collect.Lists;
 import fr.ird.observe.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.db.constants.DataContextType;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.Form;
@@ -48,14 +50,12 @@ import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.service.longline.BranchlineService;
 import fr.ird.observe.services.service.longline.SetLonglineCatchService;
 import fr.ird.observe.services.service.longline.TripLonglineService;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
 import fr.ird.observe.ui.ObserveMainUI;
 import fr.ird.observe.ui.UIHelper;
 import fr.ird.observe.ui.content.ContentUIInitializer;
 import fr.ird.observe.ui.content.ContentUIModel;
 import fr.ird.observe.ui.content.table.ContentTableModel;
 import fr.ird.observe.ui.content.table.ContentTableUIHandler;
-import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import jaxx.runtime.context.JAXXContextEntryDef;
 import jaxx.runtime.validator.swing.SwingValidator;
 import jaxx.runtime.validator.swing.SwingValidatorMessage;
@@ -68,10 +68,8 @@ import org.nuiton.validator.NuitonValidatorScope;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableCellRenderer;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Collection;
 import java.util.Collections;
@@ -95,62 +93,34 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat
     static private Log log = LogFactory.getLog(CatchLonglineUIHandler.class);
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
+    protected final TableModelListener computeTabValidStateListener;
 
-        @Override
-        public void tableChanged(TableModelEvent e) {
+    private final PropertyChangeListener catchFateChanged;
 
-            SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
-            computeTabValidState(source);
-
-        }
-    };
+    private final PropertyChangeListener branchlineChanged;
 
-    private final PropertyChangeListener catchFateChanged = new PropertyChangeListener() {
+    private final PropertyChangeListener depredatedChanged;
 
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            onCatchFateChanged((ReferentialReference<CatchFateLonglineDto>) evt.getNewValue(), (CatchLonglineDto) evt.getSource());
-        }
-    };
+    private final PropertyChangeListener sizeTableModelModified;
 
-    private final PropertyChangeListener branchlineChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            onBranchlineChanged((DataReference<BranchlineDto>) evt.getNewValue());
-        }
-    };
-
-    private final PropertyChangeListener depredatedChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            onDepretadedChanged((Boolean) evt.getNewValue(), (CatchLonglineDto) evt.getSource());
-        }
-    };
-
-    private final PropertyChangeListener sizeTableModelModified = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            onSizeTableModelModified((Boolean) evt.getNewValue());
-        }
-    };
-
-    private final PropertyChangeListener weightTableModelModified = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            onWeightTableModelModified((Boolean) evt.getNewValue());
-        }
-    };
+    private final PropertyChangeListener weightTableModelModified;
 
     JAXXContextEntryDef<LonglinePositionHelper<CatchLonglineDto>> POSITION_HELPER_ENTRY =
             UIHelper.newContextEntryDef("CatchLonglineUI-positionHelper", LonglinePositionHelper.class);
 
     public CatchLonglineUIHandler(CatchLonglineUI ui) {
         super(ui, DataContextType.SetLongline);
+        computeTabValidStateListener = e -> {
+
+            SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
+            computeTabValidState(source);
+
+        };
+        catchFateChanged = evt -> onCatchFateChanged((ReferentialReference<CatchFateLonglineDto>) evt.getNewValue(), (CatchLonglineDto) evt.getSource());
+        branchlineChanged = evt -> onBranchlineChanged((DataReference<BranchlineDto>) evt.getNewValue());
+        weightTableModelModified = evt -> onWeightTableModelModified((Boolean) evt.getNewValue());
+        sizeTableModelModified = evt -> onSizeTableModelModified((Boolean) evt.getNewValue());
+        depredatedChanged = evt -> onDepretadedChanged((Boolean) evt.getNewValue(), (CatchLonglineDto) evt.getSource());
     }
 
     @Override
@@ -169,31 +139,17 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat
         final CatchLonglineContentTableUIInitializer uiInitializer = new CatchLonglineContentTableUIInitializer(getUi());
         uiInitializer.initUI();
 
-        getModel().addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_SHOW_INDIVIDUAL_TABS, new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                Boolean newValue = (Boolean) evt.getNewValue();
-                showIndividualTabs(newValue);
-            }
+        getModel().addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_SHOW_INDIVIDUAL_TABS, evt -> {
+            Boolean newValue = (Boolean) evt.getNewValue();
+            showIndividualTabs(newValue);
         });
 
-        getModel().addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_EDITABLE, new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                Boolean newValue = (Boolean) evt.getNewValue();
-                setTableModelEditable(newValue);
-            }
+        getModel().addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_EDITABLE, evt -> {
+            Boolean newValue = (Boolean) evt.getNewValue();
+            setTableModelEditable(newValue);
         });
 
-        getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                updateUiWithReferenceSetsFromModel();
-            }
-        });
+        getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, evt -> updateUiWithReferenceSetsFromModel());
 
         setTableModelEditable(getModel().isEditable());
 
@@ -596,14 +552,10 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat
 
         }
 
-        getTableModel().addPropertyChangeListener(ContentTableModel.CREATE_PROPERTY, new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                Boolean oldValue = (Boolean) evt.getOldValue();
-                Boolean newValue = (Boolean) evt.getNewValue();
-                setTableModelCreate(oldValue, newValue);
-            }
+        getTableModel().addPropertyChangeListener(ContentTableModel.CREATE_PROPERTY, evt -> {
+            Boolean oldValue = (Boolean) evt.getOldValue();
+            Boolean newValue = (Boolean) evt.getNewValue();
+            setTableModelCreate(oldValue, newValue);
         });
     }
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java
index 1ad8a3d..db19fbd 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java
@@ -32,8 +32,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import javax.swing.JTable;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableCellRenderer;
 
 import static org.nuiton.i18n.I18n.n;
@@ -89,14 +87,10 @@ public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLon
         UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer));
 
         // when model change in table, let's recompute the proportion sum
-        table.getModel().addTableModelListener(new TableModelListener() {
+        table.getModel().addTableModelListener(e -> {
 
-            @Override
-            public void tableChanged(TableModelEvent e) {
-
-                int proportionSum = getBean().getFloatlinesCompositionProportionSum();
-                getBean().setFloatlinesCompositionProportionSum(proportionSum);
-            }
+            int proportionSum = getBean().getFloatlinesCompositionProportionSum();
+            getBean().setFloatlinesCompositionProportionSum(proportionSum);
         });
 
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java
index 855be39..0ecce5e 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java
@@ -22,10 +22,10 @@ package fr.ird.observe.ui.content.table.impl.longline;
  * #L%
  */
 
-import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import fr.ird.observe.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.db.DataContext;
 import fr.ird.observe.db.constants.DataContextType;
 import fr.ird.observe.services.dto.Form;
@@ -47,7 +47,6 @@ import fr.ird.observe.ui.content.ContentUIInitializer;
 import fr.ird.observe.ui.content.table.ContentTableUIHandler;
 import fr.ird.observe.ui.content.table.impl.seine.GearUseFeatureMeasurementCellEditor;
 import fr.ird.observe.ui.content.table.impl.seine.GearUseFeatureMeasurementCellRenderer;
-import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import jaxx.runtime.SwingUtil;
 import jaxx.runtime.validator.swing.SwingValidatorMessage;
 import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
@@ -58,12 +57,10 @@ import org.nuiton.validator.NuitonValidatorScope;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableCellRenderer;
 import java.awt.GridBagConstraints;
 import java.awt.Insets;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Collections;
 import java.util.HashSet;
@@ -86,27 +83,19 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip
     static private Log log = LogFactory.getLog(GearUseFeaturesLonglineUIHandler.class);
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
+    protected final TableModelListener computeTabValidStateListener;
 
-        @Override
-        public void tableChanged(TableModelEvent e) {
+    private final PropertyChangeListener measurementsTableModelModified;
+
+    public GearUseFeaturesLonglineUIHandler(GearUseFeaturesLonglineUI ui) {
+        super(ui, DataContextType.TripLongline);
+        computeTabValidStateListener = e -> {
 
             SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
             computeTabValidState(source);
 
-        }
-    };
-
-    private final PropertyChangeListener measurementsTableModelModified = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            onMeasurementsTableModelModified((Boolean) evt.getNewValue());
-        }
-    };
-
-    public GearUseFeaturesLonglineUIHandler(GearUseFeaturesLonglineUI ui) {
-        super(ui, DataContextType.TripLongline);
+        };
+        measurementsTableModelModified = evt -> onMeasurementsTableModelModified((Boolean) evt.getNewValue());
     }
 
     @Override
@@ -124,13 +113,9 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip
 
         super.initUI();
 
-        getModel().addPropertyChangeListener(GearUseFeaturesLonglineUIModel.PROPERTY_EDITABLE, new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                Boolean newValue = (Boolean) evt.getNewValue();
-                setTableModelEditable(newValue);
-            }
+        getModel().addPropertyChangeListener(GearUseFeaturesLonglineUIModel.PROPERTY_EDITABLE, evt -> {
+            Boolean newValue = (Boolean) evt.getNewValue();
+            setTableModelEditable(newValue);
         });
 
         setTableModelEditable(getModel().isEditable());
@@ -219,18 +204,14 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip
 
         List<GearUseFeaturesMeasurementLonglineDto> measurements = Lists.newArrayList(
                 Iterables.transform(gearDto.getGearCaracteristic(),
-                                    new Function<ReferentialReference, GearUseFeaturesMeasurementLonglineDto>() {
-
-                                        @Override
-                                        public GearUseFeaturesMeasurementLonglineDto apply(ReferentialReference input) {
-                                            GearUseFeaturesMeasurementLonglineDto measurementLonglineDto = new GearUseFeaturesMeasurementLonglineDto();
-                                            measurementLonglineDto.setGearCaracteristic(input);
-                                            String gearCaracterisiticTypeId = (String) input.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE);
-                                            if (GearCaracteristicTypeDtos.isBoolean(gearCaracterisiticTypeId)) {
-                                                measurementLonglineDto.setMeasurementValue(Boolean.FALSE.toString());
-                                            }
-                                            return measurementLonglineDto;
+                                    input -> {
+                                        GearUseFeaturesMeasurementLonglineDto measurementLonglineDto = new GearUseFeaturesMeasurementLonglineDto();
+                                        measurementLonglineDto.setGearCaracteristic(input);
+                                        String gearCaracterisiticTypeId = (String) input.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE);
+                                        if (GearCaracteristicTypeDtos.isBoolean(gearCaracterisiticTypeId)) {
+                                            measurementLonglineDto.setMeasurementValue(Boolean.FALSE.toString());
                                         }
+                                        return measurementLonglineDto;
                                     }));
 
         return measurements;
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java
index 4e51701..cf8ea37 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java
@@ -33,8 +33,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import javax.swing.JTable;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableCellRenderer;
 
 import static org.nuiton.i18n.I18n.n;
@@ -93,12 +91,9 @@ public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLongline
         UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer));
 
         // when model change in table, let's recompute the proportion sum
-        table.getModel().addTableModelListener(new TableModelListener() {
-            @Override
-            public void tableChanged(TableModelEvent e) {
-                int proportionSum = getBean().getHooksCompositionProportionSum();
-                getBean().setHooksCompositionProportionSum(proportionSum);
-            }
+        table.getModel().addTableModelListener(e -> {
+            int proportionSum = getBean().getHooksCompositionProportionSum();
+            getBean().setHooksCompositionProportionSum(proportionSum);
         });
 
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java
index d16a103..d1ef627 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java
@@ -32,7 +32,6 @@ import fr.ird.observe.services.dto.longline.LonglinePositionSetDto;
 import fr.ird.observe.services.dto.longline.SectionDto;
 import jaxx.runtime.swing.editor.bean.BeanComboBox;
 
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Collection;
 import java.util.Collections;
@@ -71,22 +70,10 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> {
         this.uiBasket = uiBasket;
         this.uiBranchline = uiBranchline;
 
-        PropertyChangeListener sectionChanged = new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                onSectionChanged((DataReference<SectionDto>) evt.getNewValue(), (D) evt.getSource());
-            }
-        };
+        PropertyChangeListener sectionChanged = evt -> onSectionChanged((DataReference<SectionDto>) evt.getNewValue(), (D) evt.getSource());
         tableEditBean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_SECTION, sectionChanged);
 
-        PropertyChangeListener basketChanged = new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                onBasketChanged((DataReference<BasketDto>) evt.getNewValue(), (D) evt.getSource());
-            }
-        };
+        PropertyChangeListener basketChanged = evt -> onBasketChanged((DataReference<BasketDto>) evt.getNewValue(), (D) evt.getSource());
         tableEditBean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_BASKET, basketChanged);
 
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java
index 2b8642f..159cc0f 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java
@@ -54,11 +54,9 @@ import org.nuiton.validator.NuitonValidatorScope;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableCellRenderer;
 import java.awt.Component;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.IOException;
@@ -85,26 +83,10 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt
     static private Log log = LogFactory.getLog(TdrUIHandler.class);
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
-
-        @Override
-        public void tableChanged(TableModelEvent e) {
-
-            SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
-            computeTabValidState(source);
-
-        }
-    };
+    protected final TableModelListener computeTabValidStateListener;
 
     // Change toogle target visible on all TimeEditors
-    protected final PropertyChangeListener onToogleTimeEditorSliderChangedListener = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            Boolean newValue = (Boolean) evt.getNewValue();
-            onToogleTimeEditorSliderChanged(newValue);
-        }
-    };
+    protected final PropertyChangeListener onToogleTimeEditorSliderChangedListener;
 
     protected boolean toogleTimeEditorSliderIsChanging;
 
@@ -113,6 +95,16 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt
 
     public TdrUIHandler(TdrUI ui) {
         super(ui, DataContextType.SetLongline);
+        computeTabValidStateListener = e -> {
+
+            SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
+            computeTabValidState(source);
+
+        };
+        onToogleTimeEditorSliderChangedListener = evt -> {
+            Boolean newValue = (Boolean) evt.getNewValue();
+            onToogleTimeEditorSliderChanged(newValue);
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java
index 0949118..c0f8b43 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java
@@ -22,10 +22,10 @@ package fr.ird.observe.ui.content.table.impl.seine;
  * #L%
  */
 
-import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import fr.ird.observe.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.db.DataContext;
 import fr.ird.observe.db.constants.DataContextType;
 import fr.ird.observe.services.dto.Form;
@@ -45,7 +45,6 @@ import fr.ird.observe.ui.UIHelper;
 import fr.ird.observe.ui.content.ContentMode;
 import fr.ird.observe.ui.content.ContentUIInitializer;
 import fr.ird.observe.ui.content.table.ContentTableUIHandler;
-import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import jaxx.runtime.SwingUtil;
 import jaxx.runtime.validator.swing.SwingValidatorMessage;
 import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
@@ -56,12 +55,10 @@ import org.nuiton.validator.NuitonValidatorScope;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableCellRenderer;
 import java.awt.GridBagConstraints;
 import java.awt.Insets;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Collections;
 import java.util.HashSet;
@@ -84,27 +81,19 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei
     static private Log log = LogFactory.getLog(GearUseFeaturesSeineUIHandler.class);
 
     // Compute valid state of tab from the error table
-    protected final TableModelListener computeTabValidStateListener = new TableModelListener() {
+    protected final TableModelListener computeTabValidStateListener;
 
-        @Override
-        public void tableChanged(TableModelEvent e) {
+    private final PropertyChangeListener measurementsTableModelModified;
+
+    public GearUseFeaturesSeineUIHandler(GearUseFeaturesSeineUI ui) {
+        super(ui, DataContextType.TripSeine);
+        computeTabValidStateListener = e -> {
 
             SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource();
             computeTabValidState(source);
 
-        }
-    };
-
-    private final PropertyChangeListener measurementsTableModelModified = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            onMeasurementsTableModelModified((Boolean) evt.getNewValue());
-        }
-    };
-
-    public GearUseFeaturesSeineUIHandler(GearUseFeaturesSeineUI ui) {
-        super(ui, DataContextType.TripSeine);
+        };
+        measurementsTableModelModified = evt -> onMeasurementsTableModelModified((Boolean) evt.getNewValue());
     }
 
     @Override
@@ -122,13 +111,9 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei
 
         super.initUI();
 
-        getModel().addPropertyChangeListener(GearUseFeaturesSeineUIModel.PROPERTY_EDITABLE, new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                Boolean newValue = (Boolean) evt.getNewValue();
-                setTableModelEditable(newValue);
-            }
+        getModel().addPropertyChangeListener(GearUseFeaturesSeineUIModel.PROPERTY_EDITABLE, evt -> {
+            Boolean newValue = (Boolean) evt.getNewValue();
+            setTableModelEditable(newValue);
         });
 
         setTableModelEditable(getModel().isEditable());
@@ -217,18 +202,14 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei
 
         List<GearUseFeaturesMeasurementSeineDto> measurements = Lists.newArrayList(
                 Iterables.transform(gearDto.getGearCaracteristic(),
-                                    new Function<ReferentialReference, GearUseFeaturesMeasurementSeineDto>() {
-
-                                        @Override
-                                        public GearUseFeaturesMeasurementSeineDto apply(ReferentialReference input) {
-                                            GearUseFeaturesMeasurementSeineDto measurementSeineDto = new GearUseFeaturesMeasurementSeineDto();
-                                            String gearCaracterisiticTypeId = (String) input.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE);
-                                            if (GearCaracteristicTypeDtos.isBoolean(gearCaracterisiticTypeId)) {
-                                                measurementSeineDto.setMeasurementValue(Boolean.FALSE.toString());
-                                            }
-                                            measurementSeineDto.setGearCaracteristic(input);
-                                            return measurementSeineDto;
+                                    input -> {
+                                        GearUseFeaturesMeasurementSeineDto measurementSeineDto = new GearUseFeaturesMeasurementSeineDto();
+                                        String gearCaracterisiticTypeId = (String) input.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE);
+                                        if (GearCaracteristicTypeDtos.isBoolean(gearCaracterisiticTypeId)) {
+                                            measurementSeineDto.setMeasurementValue(Boolean.FALSE.toString());
                                         }
+                                        measurementSeineDto.setGearCaracteristic(input);
+                                        return measurementSeineDto;
                                     }));
 
         return measurements;
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java
index 06dae5f..025a509 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java
@@ -25,6 +25,7 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import fr.ird.observe.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.db.constants.DataContextType;
 import fr.ird.observe.services.dto.Form;
 import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource;
@@ -44,7 +45,6 @@ import fr.ird.observe.services.service.seine.TripSeineService;
 import fr.ird.observe.ui.UIHelper;
 import fr.ird.observe.ui.content.table.ContentTableModel;
 import fr.ird.observe.ui.content.table.ContentTableUIHandler;
-import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -52,7 +52,6 @@ import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -79,14 +78,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa
      *
      * @since 3.0
      */
-    protected final PropertyChangeListener totalCountChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource();
-            source.setTotalCountComputedSource(null);
-        }
-    };
+    protected final PropertyChangeListener totalCountChanged;
 
     /**
      * Ecoute les modifications de la propriété {@link NonTargetCatchDto#getCatchWeight()},
@@ -95,14 +87,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa
      *
      * @since 3.0
      */
-    protected final PropertyChangeListener catchWeightChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource();
-            source.setCatchWeightComputedSource(null);
-        }
-    };
+    protected final PropertyChangeListener catchWeightChanged;
 
     /**
      * Ecoute les modifications de la propriété {@link NonTargetCatchDto#getMeanWeight()},
@@ -111,14 +96,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa
      *
      * @since 3.0
      */
-    protected final PropertyChangeListener meanWeightChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource();
-            source.setMeanWeightComputedSource(null);
-        }
-    };
+    protected final PropertyChangeListener meanWeightChanged;
 
     /**
      * Ecoute les modifications de la propriété {@link NonTargetCatchDto#getMeanLength()},
@@ -127,17 +105,26 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa
      *
      * @since 3.0
      */
-    protected final PropertyChangeListener meanLengthChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource();
-            source.setMeanLengthComputedSource(null);
-        }
-    };
+    protected final PropertyChangeListener meanLengthChanged;
 
     public NonTargetCatchUIHandler(NonTargetCatchUI ui) {
         super(ui, DataContextType.SetSeine);
+        totalCountChanged = evt -> {
+            NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource();
+            source.setTotalCountComputedSource(null);
+        };
+        catchWeightChanged = evt -> {
+            NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource();
+            source.setCatchWeightComputedSource(null);
+        };
+        meanWeightChanged = evt -> {
+            NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource();
+            source.setMeanWeightComputedSource(null);
+        };
+        meanLengthChanged = evt -> {
+            NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource();
+            source.setMeanLengthComputedSource(null);
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
index ae767b6..869a802 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
@@ -47,7 +47,6 @@ import org.nuiton.validator.NuitonValidatorScope;
 import javax.swing.JComponent;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -73,14 +72,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam
      *
      * @since 3.0
      */
-    protected final PropertyChangeListener weightChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource();
-            source.setWeightSource(false);
-        }
-    };
+    protected final PropertyChangeListener weightChanged;
 
     /**
      * Ecoute les modifications de la propriété {@link NonTargetLengthDto#getLength()},
@@ -89,17 +81,18 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam
      *
      * @since 3.0
      */
-    protected final PropertyChangeListener lengthChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource();
-            source.setLengthSource(false);
-        }
-    };
+    protected final PropertyChangeListener lengthChanged;
 
     public NonTargetSampleUIHandler(NonTargetSampleUI ui) {
         super(ui, DataContextType.SetSeine);
+        weightChanged = evt -> {
+            NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource();
+            source.setWeightSource(false);
+        };
+        lengthChanged = evt -> {
+            NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource();
+            source.setLengthSource(false);
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java
index b78744e..05427ed 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java
@@ -52,8 +52,6 @@ import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -91,19 +89,15 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa
 
         getUi().getSpecies().addPropertyChangeListener(
                 BeanComboBox.PROPERTY_SELECTED_ITEM,
-                new PropertyChangeListener() {
+                evt -> {
 
-                    @Override
-                    public void propertyChange(PropertyChangeEvent evt) {
+                    ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model = getTableModel();
+                    if (model.isNewRow()) {
 
-                        ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model = getTableModel();
-                        if (model.isNewRow()) {
+                        // en mode creation , on doit recalculer la liste des categories
+                        ReferentialReference<SpeciesDto> species = (ReferentialReference<SpeciesDto>) evt.getNewValue();
+                        onSpeciesChanged(species);
 
-                            // en mode creation , on doit recalculer la liste des categories
-                            ReferentialReference<SpeciesDto> species = (ReferentialReference<SpeciesDto>) evt.getNewValue();
-                            onSpeciesChanged(species);
-
-                        }
                     }
                 }
         );
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java
index 5e66f83..e11f990 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java
@@ -54,8 +54,6 @@ import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -122,22 +120,18 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT
 
         ui.getSpecies().addPropertyChangeListener(
                 BeanComboBox.PROPERTY_SELECTED_ITEM,
-                new PropertyChangeListener() {
+                evt -> {
 
-                    @Override
-                    public void propertyChange(PropertyChangeEvent evt) {
+                    ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model = getTableModel();
 
-                        ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model = getTableModel();
+                    if (model.isNewRow()) {
 
-                        if (model.isNewRow()) {
-
-                            // en mode creation , on doit recalculer la liste des categories
-                            ReferentialReference<SpeciesDto> species = (ReferentialReference<SpeciesDto>) evt.getNewValue();
-                            onSpeciesChanged(model.getRowBean(), species);
-
-                        }
+                        // en mode creation , on doit recalculer la liste des categories
+                        ReferentialReference<SpeciesDto> species = (ReferentialReference<SpeciesDto>) evt.getNewValue();
+                        onSpeciesChanged(model.getRowBean(), species);
 
                     }
+
                 }
         );
 
@@ -147,22 +141,18 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT
 
         ui.getWeightCategory().addPropertyChangeListener(
                 BeanComboBox.PROPERTY_SELECTED_ITEM,
-                new PropertyChangeListener() {
+                evt -> {
 
-                    @Override
-                    public void propertyChange(PropertyChangeEvent evt) {
+                    ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model = getTableModel();
+                    if (model.isNewRow()) {
 
-                        ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model = getTableModel();
-                        if (model.isNewRow()) {
-
-                            // en mode creation , on doit recalculer la liste des raison rejet
-                            ReferentialReference<WeightCategoryDto> weightCategory =
-                                    (ReferentialReference<WeightCategoryDto>) evt.getNewValue();
-                            onWeightCategoryChanged(model.getRowBean(), weightCategory);
-
-                        }
+                        // en mode creation , on doit recalculer la liste des raison rejet
+                        ReferentialReference<WeightCategoryDto> weightCategory =
+                                (ReferentialReference<WeightCategoryDto>) evt.getNewValue();
+                        onWeightCategoryChanged(model.getRowBean(), weightCategory);
 
                     }
+
                 }
         );
 
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java
index 94aca6c..990af33 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java
@@ -46,7 +46,6 @@ import org.nuiton.validator.NuitonValidatorScope;
 import javax.swing.JComponent;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -79,14 +78,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto
      *
      * @since 3.0
      */
-    protected final PropertyChangeListener weightChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            TargetLengthDto source = (TargetLengthDto) evt.getSource();
-            source.setWeightSource(false);
-        }
-    };
+    protected final PropertyChangeListener weightChanged;
 
     /**
      * Ecoute les modifications de la propriété {@link TargetLengthDto#getLength()},
@@ -95,19 +87,20 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto
      *
      * @since 3.0
      */
-    protected final PropertyChangeListener lengthChanged = new PropertyChangeListener() {
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            TargetLengthDto source = (TargetLengthDto) evt.getSource();
-            source.setLengthSource(false);
-        }
-    };
+    protected final PropertyChangeListener lengthChanged;
 
     public TargetSampleUIHandler(ContentTableUI<TargetSampleDto, TargetLengthDto> ui,
                                  boolean discarded) {
         super(ui, DataContextType.SetSeine);
         this.discarded = discarded;
+        weightChanged = evt -> {
+            TargetLengthDto source = (TargetLengthDto) evt.getSource();
+            source.setWeightSource(false);
+        };
+        lengthChanged = evt -> {
+            TargetLengthDto source = (TargetLengthDto) evt.getSource();
+            source.setLengthSource(false);
+        };
     }
 
     @Override
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java
index 4f3a4f2..1c29079 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java
@@ -28,6 +28,7 @@ import fr.ird.observe.ObserveActionExecutor;
 import fr.ird.observe.ObserveRunner;
 import fr.ird.observe.ObserveSwingApplicationContext;
 import fr.ird.observe.ObserveTextGenerator;
+import fr.ird.observe.application.swing.decoration.DecoratorService;
 import fr.ird.observe.configuration.ObserveSwingApplicationConfig;
 import fr.ird.observe.db.ObserveSwingDataSource;
 import fr.ird.observe.db.constants.ConnexionStatus;
@@ -45,7 +46,6 @@ import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto;
 import fr.ird.observe.services.dto.ObserveDbUserDto;
 import fr.ird.observe.services.service.SqlScriptProducerRequest;
 import fr.ird.observe.services.service.SqlScriptProducerService;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
 import fr.ird.observe.ui.ObserveMainUI;
 import fr.ird.observe.ui.UIHelper;
 import fr.ird.observe.ui.storage.tabs.DataSelectionModel;
@@ -63,8 +63,6 @@ import org.apache.commons.logging.LogFactory;
 import javax.swing.JTabbedPane;
 import java.awt.Component;
 import java.awt.Window;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -140,54 +138,51 @@ public class StorageUIHandler {
         StorageUIModel model = ui.getModel();
 
         // on écoute les changements d'étapes
-        model.addPropertyChangeListener(StorageUIModel.STEP_PROPERTY_NAME, new PropertyChangeListener() {
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                StorageUIModel model = (StorageUIModel) evt.getSource();
-                StorageStep oldStep = (StorageStep) evt.getOldValue();
-                StorageStep newStep = (StorageStep) evt.getNewValue();
+        model.addPropertyChangeListener(StorageUIModel.STEP_PROPERTY_NAME, evt -> {
+            StorageUIModel model1 = (StorageUIModel) evt.getSource();
+            StorageStep oldStep = (StorageStep) evt.getOldValue();
+            StorageStep newStep = (StorageStep) evt.getNewValue();
+            if (log.isDebugEnabled()) {
+                log.debug("step has changed <old:" + oldStep + ", new:" + newStep + ">");
+            }
+            int oldStepIndex = oldStep == null ? -1 : model1.getStepIndex(oldStep);
+            int newStepIndex = model1.getStepIndex(newStep);
+            JTabbedPane tabs = ui.getTabs();
+            if (oldStepIndex + 1 == newStepIndex) {
+
+                // creation d'un nouvel onglet
+                StorageTabUI c = (StorageTabUI) ui.getObjectById(newStep.name());
+                String title = t(newStep.getLabel());
+                String tip = t(newStep.getDescription());
+
                 if (log.isDebugEnabled()) {
-                    log.debug("step has changed <old:" + oldStep + ", new:" + newStep + ">");
+                    log.debug("Create tab " + title + " ui = " + c);
                 }
-                int oldStepIndex = oldStep == null ? -1 : model.getStepIndex(oldStep);
-                int newStepIndex = model.getStepIndex(newStep);
-                JTabbedPane tabs = ui.getTabs();
-                if (oldStepIndex + 1 == newStepIndex) {
+                tabs.addTab(title, null, c, tip);
+                tabs.setMnemonicAt(newStepIndex, title.charAt(0));
 
-                    // creation d'un nouvel onglet
-                    StorageTabUI c = (StorageTabUI) ui.getObjectById(newStep.name());
-                    String title = t(newStep.getLabel());
-                    String tip = t(newStep.getDescription());
+                // selection du nouvel onglet
+                int index = tabs.indexOfComponent(c);
+                if (index > -1) {
+                    tabs.setSelectedIndex(index);
+                }
+                ui.onStepChanged(oldStep, newStep);
 
-                    if (log.isDebugEnabled()) {
-                        log.debug("Create tab " + title + " ui = " + c);
-                    }
-                    tabs.addTab(title, null, c, tip);
-                    tabs.setMnemonicAt(newStepIndex, title.charAt(0));
+            } else if (oldStepIndex > newStepIndex) {
 
-                    // selection du nouvel onglet
-                    int index = tabs.indexOfComponent(c);
-                    if (index > -1) {
-                        tabs.setSelectedIndex(index);
-                    }
-                    ui.onStepChanged(oldStep, newStep);
-
-                } else if (oldStepIndex > newStepIndex) {
-
-                    // il s'agit d'un retour en arrière
-                    // on supprime tous les onglets obsoletes
-                    int index = newStepIndex + 1;
-                    while (tabs.getTabCount() > index) {
-                        if (log.isDebugEnabled()) {
-                            log.debug("remove tab : " + index);
-                        }
-                        tabs.remove(index);
+                // il s'agit d'un retour en arrière
+                // on supprime tous les onglets obsoletes
+                int index = newStepIndex + 1;
+                while (tabs.getTabCount() > index) {
+                    if (log.isDebugEnabled()) {
+                        log.debug("remove tab : " + index);
                     }
-
-                    ui.onStepChanged(oldStep, newStep);
-                } else {
-                    throw new IllegalStateException("can not go from " + oldStep + " to " + newStep);
+                    tabs.remove(index);
                 }
+
+                ui.onStepChanged(oldStep, newStep);
+            } else {
+                throw new IllegalStateException("can not go from " + oldStep + " to " + newStep);
             }
         });
 
@@ -295,15 +290,11 @@ public class StorageUIHandler {
         if (action == null) {
             final StorageUILauncher launcher = ui.getContextValue(StorageUILauncher.class);
 
-            action = new Runnable() {
-
-                @Override
-                public void run() {
-                    try {
-                        launcher.doAction(ui);
-                    } finally {
-                        launcher.doClose(ui, false);
-                    }
+            action = () -> {
+                try {
+                    launcher.doAction(ui);
+                } finally {
+                    launcher.doClose(ui, false);
                 }
             };
         }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java
index e4fe0ea..8fda354 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java
@@ -62,7 +62,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.version.Version;
 
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.FileInputStream;
@@ -166,6 +165,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
     /**
      * Un drapeau pour savoir si on a déjà lancé l'action Appliquer (pour éviter le code ré-entrant).
+     *
      * @since 4.0.4
      */
     protected boolean alreadyApplied;
@@ -214,10 +214,10 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
     protected String serverUrl;
 
-    /** Les information de connextion a la base**/
+    /** Les information de connextion a la base **/
     protected ObserveDataSourceInformation dataSourceInformation;
 
-    /** Les information de connextion a la base**/
+    /** Les information de connextion a la base **/
     protected ObserveDataSourceInformation h2DataSourceInformation;
 
     /** le fichier d'import des donné */
@@ -257,9 +257,9 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
     public StorageUIModel() {
         super(StorageStep.class,
-                StorageStep.CHOOSE_DB_MODE,
-                StorageStep.BACKUP,
-                StorageStep.CONFIRM
+              StorageStep.CHOOSE_DB_MODE,
+              StorageStep.BACKUP,
+              StorageStep.CONFIRM
         );
         selectDataModel = new DataSelectionModel();
         securityModel = new SecurityModel();
@@ -302,12 +302,9 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                 modelVersion
         );
 
-        PropertyChangeListener clearStatus = new PropertyChangeListener() {
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                setConnexionStatus(ConnexionStatus.UNTESTED);
-                dataSourceInformation = null;
-            }
+        PropertyChangeListener clearStatus = evt -> {
+            setConnexionStatus(ConnexionStatus.UNTESTED);
+            dataSourceInformation = null;
         };
 
         addPropertyChangeListener(REMOTE_URL_ROPERTY_NAME, clearStatus);
@@ -342,7 +339,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
             if (log.isDebugEnabled()) {
                 log.debug("from a incoming model " +
-                          incomingModel.getLabel() + " : " + incomingModel);
+                                  incomingModel.getLabel() + " : " + incomingModel);
             }
 
             // on initialie a partir d'un autre modèle
@@ -406,7 +403,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                 // on est actuellement connecte sur une base locale
                 fromStorageConfig((ObserveDataSourceConfigurationTopiaH2) source);
 
-            } else if (source instanceof ObserveDataSourceConfigurationTopiaPG){
+            } else if (source instanceof ObserveDataSourceConfigurationTopiaPG) {
 
                 if (!isLocalStorageExist) {
                     // aucune base locale, on positionne le mode de création
@@ -418,7 +415,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                 // on est sur une base distante
                 fromStorageConfig((ObserveDataSourceConfigurationTopiaPG) source);
 
-            }   else if (source instanceof ObserveDataSourceConfigurationRest){
+            } else if (source instanceof ObserveDataSourceConfigurationRest) {
 
                 // on est sur une base distante
                 fromStorageConfig((ObserveDataSourceConfigurationRest) source);
@@ -513,7 +510,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
             // on est actuellement connecte sur une base locale
             fromStorageConfig((ObserveDataSourceConfigurationTopiaH2) previousConfig);
             h2DataSourceInformation = previousInfo;
-        } else if (previousConfig instanceof ObserveDataSourceConfigurationTopiaPG){
+        } else if (previousConfig instanceof ObserveDataSourceConfigurationTopiaPG) {
 
             if (!isLocalStorageExist) {
 
@@ -524,7 +521,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
             // on est sur une base distante
             fromStorageConfig((ObserveDataSourceConfigurationTopiaPG) previousConfig);
 
-        }   else if (previousConfig instanceof ObserveDataSourceConfigurationRest){
+        } else if (previousConfig instanceof ObserveDataSourceConfigurationRest) {
 
             // on est sur une base distante
             fromStorageConfig((ObserveDataSourceConfigurationRest) previousConfig);
@@ -625,17 +622,14 @@ public class StorageUIModel extends WizardModel<StorageStep> {
         centralSourceModel.start(DbMode.USE_REMOTE);
 
         if (log.isDebugEnabled()) {
-            centralSourceModel.addPropertyChangeListener(new PropertyChangeListener() {
-                @Override
-                public void propertyChange(PropertyChangeEvent evt) {
-                    String name = evt.getPropertyName();
-                    Object oldValue = evt.getOldValue();
-                    Object newValue = evt.getNewValue();
-                    if (log.isDebugEnabled()) {
-                        log.debug(evt.getSource() + " - Property [" + name + "] has changed from  " + oldValue + " to " + newValue);
-                    }
-
+            centralSourceModel.addPropertyChangeListener(evt -> {
+                String name = evt.getPropertyName();
+                Object oldValue = evt.getOldValue();
+                Object newValue = evt.getNewValue();
+                if (log.isDebugEnabled()) {
+                    log.debug(evt.getSource() + " - Property [" + name + "] has changed from  " + oldValue + " to " + newValue);
                 }
+
             });
         }
 
@@ -662,17 +656,14 @@ public class StorageUIModel extends WizardModel<StorageStep> {
         dataSourceModel.start(DbMode.USE_REMOTE);
 
         if (log.isDebugEnabled()) {
-            dataSourceModel.addPropertyChangeListener(new PropertyChangeListener() {
-                @Override
-                public void propertyChange(PropertyChangeEvent evt) {
-                    String name = evt.getPropertyName();
-                    Object oldValue = evt.getOldValue();
-                    Object newValue = evt.getNewValue();
-                    if (log.isDebugEnabled()) {
-                        log.debug(evt.getSource() + " - Property [" + name + "] has changed from  " + oldValue + " to " + newValue);
-                    }
-
+            dataSourceModel.addPropertyChangeListener(evt -> {
+                String name = evt.getPropertyName();
+                Object oldValue = evt.getOldValue();
+                Object newValue = evt.getNewValue();
+                if (log.isDebugEnabled()) {
+                    log.debug(evt.getSource() + " - Property [" + name + "] has changed from  " + oldValue + " to " + newValue);
                 }
+
             });
         }
 
@@ -684,12 +675,12 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
     public boolean isNeedReferentielDataSource() {
         return adminAction != null &&
-               adminAction == ObstunaAdminAction.CREATE;
+                adminAction == ObstunaAdminAction.CREATE;
     }
 
     public boolean isNeedDataDataSource() {
         return adminAction != null &&
-               adminAction == ObstunaAdminAction.CREATE;
+                adminAction == ObstunaAdminAction.CREATE;
     }
 
     public void start(DbMode dbMode) {
@@ -791,9 +782,9 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                     String txt = t("observe.storage.label.import.referentiel");
                     if (getDbMode() == DbMode.CREATE_LOCAL) {
                         txt = t("observe.storage.label.import.referentiel", getH2Config().getDirectory().getAbsolutePath());
-                    } else if (isRemote()){
+                    } else if (isRemote()) {
                         txt = t("observe.storage.label.import.referentiel.remote", getRemoteUrl());
-                    } else if (isServer()){
+                    } else if (isServer()) {
                         txt = t("observe.storage.label.import.referentiel.server", getServerUrl());
                     }
                     return txt;
@@ -820,9 +811,9 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                     String txt = t("observe.storage.label.import.data");
                     if (getDbMode() == DbMode.CREATE_LOCAL) {
                         txt = t("observe.storage.label.import.data", getH2Config().getDirectory().getAbsolutePath());
-                    } else if (isRemote()){
+                    } else if (isRemote()) {
                         txt = t("observe.storage.label.import.data.remote", getRemoteUrl());
-                    } else if (isServer()){
+                    } else if (isServer()) {
                         txt = t("observe.storage.label.import.data.server", getServerUrl());
                     }
                     return txt;
@@ -957,8 +948,8 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                     if (DbMode.USE_REMOTE.equals(dbMode)
                             || DbMode.USE_SERVER.equals(dbMode)
                             || DbMode.CREATE_LOCAL.equals(dbMode)
-                               && (CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode)
-                                   || CreationMode.IMPORT_REMOTE_STORAGE.equals(creationMode))) {
+                            && (CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode)
+                            || CreationMode.IMPORT_REMOTE_STORAGE.equals(creationMode))) {
                         validate = ConnexionStatus.SUCCESS.equals(getConnexionStatus());
                         //FIXME Il faut savoir si l'utilisateur est le
                         //FIXME propriétaire de la base
@@ -1088,7 +1079,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
                 case CREATE_LOCAL:
                     result = getCreationMode() != null &&
-                             validate(StorageStep.CONFIG);
+                            validate(StorageStep.CONFIG);
                     break;
                 case USE_REMOTE:
                 case USE_SERVER:
@@ -1115,7 +1106,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
     public boolean isUseSelectData() {
         return getSteps() != null &&
-               getSteps().contains(StorageStep.SELECT_DATA);
+                getSteps().contains(StorageStep.SELECT_DATA);
     }
 
     public boolean isBackupAction() {
@@ -1232,11 +1223,11 @@ public class StorageUIModel extends WizardModel<StorageStep> {
         boolean oldValueServer = isEditServerConfig();
 
         editRemoteConfig = DbMode.USE_REMOTE.equals(dbMode) ||
-                           DbMode.CREATE_LOCAL.equals(dbMode) && CreationMode.IMPORT_REMOTE_STORAGE.equals(creationMode);
+                DbMode.CREATE_LOCAL.equals(dbMode) && CreationMode.IMPORT_REMOTE_STORAGE.equals(creationMode);
         firePropertyChange(EDIT_REMOTE_CONFIG_PROPERTY_NAME, oldValueRemote, editRemoteConfig);
 
         editServerConfig = DbMode.USE_SERVER.equals(dbMode) ||
-                           DbMode.CREATE_LOCAL.equals(dbMode) && CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode);
+                DbMode.CREATE_LOCAL.equals(dbMode) && CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode);
         firePropertyChange(EDIT_SERVER_CONFIG_PROPERTY_NAME, oldValueServer, editServerConfig);
     }
 
@@ -1468,11 +1459,11 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
         if (isEditRemoteConfig()) {
 
-          pgConfig.setUsername(remoteLogin);
+            pgConfig.setUsername(remoteLogin);
 
         } else if (isEditServerConfig()) {
 
-          restConfig.setLogin(remoteLogin);
+            restConfig.setLogin(remoteLogin);
 
         }
 
@@ -1503,7 +1494,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
     public void setCanCreateLocalService(boolean canCreateLocalService) {
         this.canCreateLocalService = canCreateLocalService;
         firePgConfigChanged(CAN_CREATE_LOCALE_SERVICE_PROPERTY_NAME, null,
-                canCreateLocalService);
+                            canCreateLocalService);
     }
 
     public void setCanUseRemoteService(boolean canUseRemoteService) {
@@ -1775,7 +1766,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                         Version versionDataSource = dataSourceInformation.getVersion();
 
                         // en mise a jour de la base on ne test pas la version
-                        if (getModelVersion().equals(versionDataSource) || isCanMigrate()  || ObstunaAdminAction.CREATE.equals(adminAction)) {
+                        if (getModelVersion().equals(versionDataSource) || isCanMigrate() || ObstunaAdminAction.CREATE.equals(adminAction)) {
 
                             setConnexionStatus(ConnexionStatus.SUCCESS);
 
@@ -1879,7 +1870,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
     public DataSourceCreateConfigurationDto toImportReferentielSourceConfig() {
 
-        DataSourceCreateConfigurationDto importReferenceConfig = new DataSourceCreateConfigurationDto();;
+        DataSourceCreateConfigurationDto importReferenceConfig = new DataSourceCreateConfigurationDto();
 
         // on peut créer une base vide
         importReferenceConfig.setCanCreateEmptyDatabase(true);
@@ -2007,7 +1998,6 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                         createConfigurationDto.setImportDatabase(bytes);
 
 
-
                     } catch (Exception e) {
 
                         throw new RuntimeException("Could not read dump file", e);
@@ -2041,7 +2031,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                     importDataSource = ObserveSwingApplicationContext.get().newDataSource(dataSourceConfig);
 
                 }
-                    break;
+                break;
 
                 case IMPORT_SERVER_STORAGE: {
 
@@ -2051,7 +2041,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                     importDataSource = ObserveSwingApplicationContext.get().newDataSource(dataSourceConfig);
 
                 }
-                    break;
+                break;
                 default:
                     throw new IllegalStateException("Can't come here");
             }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java
index 275c4ec..fce5203 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java
@@ -52,7 +52,6 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Window;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.util.Date;
@@ -96,16 +95,13 @@ public class StorageTabUIHandler {
 
     public void initUI(final ChooseDbModeUI ui) {
 
-        PropertyChangeListener listener = new PropertyChangeListener() {
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                StorageUIModel model = (StorageUIModel) evt.getSource();
+        PropertyChangeListener listener = evt -> {
+            StorageUIModel model = (StorageUIModel) evt.getSource();
 
-                ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get();
-                ObserveTextGenerator textGenerator = applicationContext.getTextGenerator();
-                String txt = textGenerator.getLoadDataSourceResume(model);
-                ui.getResume().setText(txt);
-            }
+            ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get();
+            ObserveTextGenerator textGenerator = applicationContext.getTextGenerator();
+            String txt = textGenerator.getLoadDataSourceResume(model);
+            ui.getResume().setText(txt);
         };
         StorageUIModel model = ui.getModel();
         model.addPropertyChangeListener(StorageUIModel.DB_MODE_PROPERTY_NAME, listener);
@@ -115,27 +111,24 @@ public class StorageTabUIHandler {
 
     public void initUI(final ConfigUI ui) {
 
-        PropertyChangeListener listener = new PropertyChangeListener() {
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                StorageUIModel model = (StorageUIModel) evt.getSource();
-                String propertyName = evt.getPropertyName();
-                if (StorageUIModel.CREATION_MODE_PROPERTY_NAME.equals(propertyName) ||
-                    StorageUIModel.DB_MODE_PROPERTY_NAME.equals(propertyName)) {
-                    String id = null;
-                    if (model.getDbMode() == DbMode.USE_REMOTE) {
-                        id = DbMode.USE_REMOTE.name();
-                    } else if (model.getDbMode() == DbMode.USE_SERVER) {
-                        id = DbMode.USE_SERVER.name();
-                    } else {
-                        if (model.getCreationMode() != null) {
-                            id = model.getCreationMode().name();
-                        }
-                    }
-                    if (id != null) {
-                        refreshConfig(ui, id);
+        PropertyChangeListener listener = evt -> {
+            StorageUIModel model = (StorageUIModel) evt.getSource();
+            String propertyName = evt.getPropertyName();
+            if (StorageUIModel.CREATION_MODE_PROPERTY_NAME.equals(propertyName) ||
+                StorageUIModel.DB_MODE_PROPERTY_NAME.equals(propertyName)) {
+                String id = null;
+                if (model.getDbMode() == DbMode.USE_REMOTE) {
+                    id = DbMode.USE_REMOTE.name();
+                } else if (model.getDbMode() == DbMode.USE_SERVER) {
+                    id = DbMode.USE_SERVER.name();
+                } else {
+                    if (model.getCreationMode() != null) {
+                        id = model.getCreationMode().name();
                     }
                 }
+                if (id != null) {
+                    refreshConfig(ui, id);
+                }
             }
         };
         ui.getModel().addPropertyChangeListener(listener);
@@ -145,14 +138,11 @@ public class StorageTabUIHandler {
         if (ui.getStep() != null) {
             ui.setDescriptionText(t(ui.getStep().getDescription()));
 
-            PropertyChangeListener listener = new PropertyChangeListener() {
-                @Override
-                public void propertyChange(PropertyChangeEvent evt) {
-                    String propertyName = evt.getPropertyName();
-                    if (StorageUIModel.REFERENTIEL_IMPORT_MODE_PROPERTY_NAME.equals(propertyName)) {
-                        CreationMode id = (CreationMode) evt.getNewValue();
-                        refreshConfig(ui, id.name());
-                    }
+            PropertyChangeListener listener = evt -> {
+                String propertyName = evt.getPropertyName();
+                if (StorageUIModel.REFERENTIEL_IMPORT_MODE_PROPERTY_NAME.equals(propertyName)) {
+                    CreationMode id = (CreationMode) evt.getNewValue();
+                    refreshConfig(ui, id.name());
                 }
             };
             ui.getModel().addPropertyChangeListener(listener);
@@ -164,19 +154,16 @@ public class StorageTabUIHandler {
         if (ui.getStep() != null) {
             ui.setDescriptionText(t(ui.getStep().getDescription()));
 
-            PropertyChangeListener listener = new PropertyChangeListener() {
-                @Override
-                public void propertyChange(PropertyChangeEvent evt) {
-                    String propertyName = evt.getPropertyName();
-                    if (StorageUIModel.DATA_IMPORT_MODE_PROPERTY_NAME.equals(propertyName)) {
-                        CreationMode id = (CreationMode) evt.getNewValue();
-
-                        if (id != null) {
-                            refreshConfig(ui, id.name());
+            PropertyChangeListener listener = evt -> {
+                String propertyName = evt.getPropertyName();
+                if (StorageUIModel.DATA_IMPORT_MODE_PROPERTY_NAME.equals(propertyName)) {
+                    CreationMode id = (CreationMode) evt.getNewValue();
 
-                        }
+                    if (id != null) {
+                        refreshConfig(ui, id.name());
 
                     }
+
                 }
             };
             ui.getModel().addPropertyChangeListener(listener);
@@ -189,14 +176,11 @@ public class StorageTabUIHandler {
             ui.setDescriptionText(t(ui.getStep().getDescription()));
         }
 
-        ui.getSecurityModel().addPropertyChangeListener(new PropertyChangeListener() {
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                if (log.isDebugEnabled()) {
-                    log.debug("Security model changed [" + evt.getPropertyName() + "] <" + evt.getOldValue() + " : " + evt.getNewValue() + ">");
-                }
-                ui.getModel().validate();
+        ui.getSecurityModel().addPropertyChangeListener(evt -> {
+            if (log.isDebugEnabled()) {
+                log.debug("Security model changed [" + evt.getPropertyName() + "] <" + evt.getOldValue() + " : " + evt.getNewValue() + ">");
             }
+            ui.getModel().validate();
         });
 
         JTable table = ui.getRoles();
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeCellRenderer.java
index d06c8b6..5509875 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeCellRenderer.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeCellRenderer.java
@@ -33,7 +33,6 @@ import javax.swing.JTree;
 import javax.swing.UIDefaults;
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Graphics2D;
 import java.util.List;
 
 import static org.nuiton.i18n.I18n.t;
@@ -144,13 +143,7 @@ public class DataSelectionTreeCellRenderer extends AbstractObserveTreeCellRender
         // customize tree selection colors
         UIDefaults defaults = new UIDefaults();
 
-        Painter<JComponent> painter = new Painter<JComponent>() {
-
-            public void paint(Graphics2D g, JComponent c, int w, int h) {
-                g.fillRect(0, 0, w, h);
-            }
-
-        };
+        Painter<JComponent> painter = (g, c, w, h) -> g.fillRect(0, 0, w, h);
         defaults.put("Tree:TreeCell[Enabled+Selected].backgroundPainter", painter);
         defaults.put("Tree:TreeCell[Enabled+Focused].backgroundPainter", painter);
         defaults.put("Tree:TreeCell[Focused+Selected].backgroundPainter", painter);
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java
index f262516..d9ed766 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java
@@ -30,7 +30,6 @@ import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor;
 
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
-import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableCellEditor;
@@ -609,22 +608,19 @@ public abstract class EditableTableModelSupport<E extends Serializable> extends
 
     protected ListSelectionListener getWhenSelectionModelChanged() {
         if (whenSelectionModelChanged == null) {
-            whenSelectionModelChanged = new ListSelectionListener() {
-                @Override
-                public void valueChanged(ListSelectionEvent e) {
-
-                    if (!e.getValueIsAdjusting()) {
-                        int selectedRow = table.getSelectedRow();
-                        if (selectedRow >= getRowCount()) {
-                            selectedRow = getRowCount() - 1;
-                            if (log.isInfoEnabled()) {
-                                log.info("Decrease selectedRow!!! to " + selectedRow);
-                            }
+            whenSelectionModelChanged = e -> {
+
+                if (!e.getValueIsAdjusting()) {
+                    int selectedRow = table.getSelectedRow();
+                    if (selectedRow >= getRowCount()) {
+                        selectedRow = getRowCount() - 1;
+                        if (log.isInfoEnabled()) {
+                            log.info("Decrease selectedRow!!! to " + selectedRow);
                         }
-                        setSelectedRowIndex(selectedRow);
                     }
-
+                    setSelectedRowIndex(selectedRow);
                 }
+
             };
         }
         return whenSelectionModelChanged;
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java
index 4be65a3..77eaa56 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java
@@ -23,7 +23,6 @@ package fr.ird.observe.ui.util.tripMap;
  */
 
 import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -424,12 +423,7 @@ public class TripMapContentBuilder {
 
     protected Style findStyle(StyledLayerDescriptor styledLayerDescriptor, final String layerName, String styleName, Style defaultStyle) {
 
-        Optional<StyledLayer> styledLayerOptional = Iterables.tryFind(styledLayerDescriptor.layers(), new Predicate<StyledLayer>() {
-            @Override
-            public boolean apply(StyledLayer input) {
-                return input.getName().equals(layerName);
-            }
-        });
+        Optional<StyledLayer> styledLayerOptional = Iterables.tryFind(styledLayerDescriptor.layers(), input -> input.getName().equals(layerName));
 
         Style style = defaultStyle;
 
diff --git a/pom.xml b/pom.xml
index b82f617..3f06567 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
     <processorPluginVersion>1.3</processorPluginVersion>
 
     <topiaVersion>3.1.2-SNAPSHOT</topiaVersion>
-    <jaxxVersion>2.29</jaxxVersion>
+    <jaxxVersion>2.30-SNAPSHOT</jaxxVersion>
     <nuitonI18nVersion>3.5</nuitonI18nVersion>
     <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion>
 

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Observe-commits] 02/08: Use lambda \o/

codelutin.com scm