[Observe-commits] 05/21: introduce node package

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 35c679db691c8438eb137495ff162102300fe6b8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 14:29:48 2016 +0200 introduce node package --- .../fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java | 2 +- .../application/swing/ui/actions/shared/AbstractUIAction.java | 2 +- .../application/swing/ui/actions/shared/CancelCreateUIAction.java | 2 +- .../application/swing/ui/actions/shared/CloseOpenUIAction.java | 2 +- .../application/swing/ui/actions/shared/GoDownUIAction.java | 2 +- .../observe/application/swing/ui/actions/shared/GoUpUIAction.java | 2 +- .../swing/ui/actions/shared/MoveActivityLonglinesUIAction.java | 4 ++-- .../swing/ui/actions/shared/MoveActivitySeinesUIAction.java | 4 ++-- .../application/swing/ui/actions/shared/MoveRoutesUIAction.java | 4 ++-- .../application/swing/ui/actions/shared/MoveTripsUIAction.java | 2 +- .../application/swing/ui/actions/shared/ReOpenUIAction.java | 2 +- .../application/swing/ui/actions/shared/SelectNodeUIAction.java | 2 +- .../synchronize/data/DataSynchroSelectionTreeCellRenderer.java | 4 ++-- .../observe/application/swing/ui/content/ContentUIHandler.java | 2 +- .../observe/application/swing/ui/content/ContentUIManager.java | 2 +- .../swing/ui/content/impl/longline/SetLonglineUIHandler.java | 2 +- .../swing/ui/content/impl/seine/FloatingObjectUIHandler.java | 2 +- .../swing/ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../application/swing/ui/content/list/ContentListUIHandler.java | 2 +- .../swing/ui/content/open/ContentOpenableUIHandler.java | 2 +- .../swing/ui/content/open/impl/seine/RouteUIHandler.java | 2 +- .../application/swing/ui/content/table/ContentTableUIHandler.java | 2 +- .../swing/ui/tree/AbstractObserveTreeCellRenderer.java | 5 +++++ .../application/swing/ui/tree/DataSelectionTreeCellRenderer.java | 2 ++ .../swing/ui/tree/DataSelectionTreeSelectionModel.java | 2 ++ .../application/swing/ui/tree/NavigationTreeCellRenderer.java | 2 ++ .../swing/ui/tree/ObserveNavigationTreeShowPopupAction.java | 1 + .../ird/observe/application/swing/ui/tree/ObserveTreeBridge.java | 1 + .../ird/observe/application/swing/ui/tree/ObserveTreeHelper.java | 2 ++ .../swing/ui/tree/actions/ChangeActivityRouteActionListener.java | 2 +- .../swing/ui/tree/actions/ChangeActivityTripActionListener.java | 2 +- .../swing/ui/tree/actions/ChangeRouteTripActionListener.java | 2 +- .../swing/ui/tree/actions/ChangeTripProgramActionListener.java | 2 +- .../swing/ui/tree/actions/NodeChangeActionListener.java | 2 +- .../swing/ui/tree/loadors/AbstractNodeChildLoador.java | 2 +- .../swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java | 6 +++--- .../swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java | 4 ++-- .../swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java | 8 ++++---- .../swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java | 4 ++-- .../swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java | 2 +- .../swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java | 4 ++-- .../swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java | 4 ++-- .../swing/ui/tree/loadors/ReferenceNodeChildLoador.java | 2 +- .../application/swing/ui/tree/loadors/RootNodeChildLoador.java | 6 +++--- .../application/swing/ui/tree/loadors/RoutesNodeChildLoador.java | 4 ++-- .../swing/ui/tree/loadors/SetLonglineNodeChildLoador.java | 2 +- .../swing/ui/tree/loadors/SetSeineNodeChildLoador.java | 2 +- .../swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java | 4 ++-- .../swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java | 4 ++-- .../application/swing/ui/tree/menu/MoveNodeMenuPopulator.java | 2 +- .../swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java | 4 ++-- .../application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java | 6 +++--- .../swing/ui/tree/{ => node}/AbstrctReferenceNodeSupport.java | 3 ++- .../swing/ui/tree/{ => node}/ActivityLonglineNode.java | 3 ++- .../application/swing/ui/tree/{ => node}/ActivitySeineNode.java | 3 ++- .../swing/ui/tree/{ => node}/DataReferenceNodeSupport.java | 3 ++- .../swing/ui/tree/{ => node}/FloatingObjectSeineNode.java | 3 ++- .../observe/application/swing/ui/tree/{ => node}/ObserveNode.java | 2 +- .../application/swing/ui/tree/{ => node}/ProgramLonglineNode.java | 3 ++- .../application/swing/ui/tree/{ => node}/ProgramSeineNode.java | 3 ++- .../swing/ui/tree/{ => node}/ReferentialReferenceNodeSupport.java | 3 ++- .../application/swing/ui/tree/{ => node}/RouteSeineNode.java | 2 +- .../application/swing/ui/tree/{ => node}/SetLonglineNode.java | 3 ++- .../application/swing/ui/tree/{ => node}/SetSeineNode.java | 3 ++- .../application/swing/ui/tree/{ => node}/TripLonglineNode.java | 2 +- .../application/swing/ui/tree/{ => node}/TripSeineNode.java | 2 +- .../observe/application/swing/ui/util/DecoratedNodeEntity.java | 2 +- 67 files changed, 106 insertions(+), 81 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java index a230f45..c0fcea6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java @@ -35,7 +35,7 @@ import fr.ird.observe.application.swing.ui.content.ContentUIManager; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.content.ObserveContentUI; import fr.ird.observe.application.swing.ui.tree.ObserveNavigationTreeShowPopupAction; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.ui.util.ObserveSwingValidatorMessageTableModel; import fr.ird.observe.application.swing.ui.util.ObserveValidatorMessageTableRenderer; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java index 82b4b80..ee76b5d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ObserveContentUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import jaxx.runtime.SwingUtil; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CancelCreateUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CancelCreateUIAction.java index c992400..6161134 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CancelCreateUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CancelCreateUIAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import javax.swing.JComponent; import javax.swing.SwingUtilities; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseOpenUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseOpenUIAction.java index c9fb7c5..ae3cc0c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseOpenUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseOpenUIAction.java @@ -31,7 +31,7 @@ import fr.ird.observe.application.swing.ui.content.list.impl.seine.ActivitySeine import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUI; import fr.ird.observe.application.swing.ui.content.open.impl.longline.ActivityLonglineUI; import fr.ird.observe.application.swing.ui.content.open.impl.seine.ActivitySeineUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import javax.swing.JComponent; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java index eecf4b7..26aa472 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ObserveContentUI; import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import javax.swing.AbstractButton; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java index fae8c89..bc967e3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ObserveContentUI; import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import javax.swing.AbstractButton; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java index 2f6e480..d746b1b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java @@ -28,9 +28,9 @@ import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecor import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.longline.ActivityLonglinesUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.TripLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.TripLonglineNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java index 0aceb91..eb54dce 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java @@ -29,9 +29,9 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.seine.ActivitySeinesUI; import fr.ird.observe.application.swing.ui.content.list.impl.seine.ActivitySeinesUIModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.RouteSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.RouteSeineNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java index 23e0556..467920f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java @@ -28,9 +28,9 @@ import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecor import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.seine.RoutesUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.TripSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.RouteDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java index 54b87fc..c601df4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java @@ -29,7 +29,7 @@ import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.ui.tree.menu.MoveTripNodeMenuPopulator; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ReOpenUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ReOpenUIAction.java index b7b4c4a..8e185c6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ReOpenUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ReOpenUIAction.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.ContentListUI; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import javax.swing.JComponent; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectNodeUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectNodeUIAction.java index 81049e5..0fc6e3e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectNodeUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectNodeUIAction.java @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import javax.swing.JComponent; import java.awt.event.ActionEvent; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java index 1a9bb4d..b7c62aa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java @@ -25,8 +25,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data; import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.tree.DataSelectionTreeCellRenderer; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.ReferentialReferenceNodeSupport; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ReferentialReferenceNodeSupport; import javax.swing.Icon; import javax.swing.JTree; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java index 176c605..15e7120 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -38,7 +38,7 @@ import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.shared.AbstractUIAction; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.ui.util.SpringUtilities; import fr.ird.observe.application.swing.validation.ValidationContext; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java index f327cb6..c3d73c3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java @@ -59,7 +59,7 @@ import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetCatchU import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetDiscardCatchUI; import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetSampleCaptureUI; import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetSampleRejeteUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java index 2473d56..be720b5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java @@ -29,7 +29,7 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java index 3928984..632387d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -35,7 +35,7 @@ import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java index 9f2bce1..7c4ee3b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java @@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.I18nEnumHelper; import fr.ird.observe.services.dto.DataReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java index cce0607..f3e2911 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ui.actions.shared.SelectNodeUIAction; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.DataDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java index a19cb34..667b396 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java @@ -30,7 +30,7 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.validation.ValidationContext; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java index 437425c..6f88843 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java @@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java index 6d8f9eb..30210a2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java @@ -37,7 +37,7 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.content.table.impl.longline.WeightMeasuresTableModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.util.table.EditableTableModelSupport; import fr.ird.observe.application.swing.ui.util.table.InlineTableAutotSelectRowAndShowPopupAction; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java index b00bf46..aa0ceb2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java @@ -33,6 +33,11 @@ import fr.ird.observe.application.swing.ui.content.open.impl.longline.TripLongli import fr.ird.observe.application.swing.ui.content.open.impl.seine.ActivitySeineUI; import fr.ird.observe.application.swing.ui.content.open.impl.seine.RouteUI; import fr.ird.observe.application.swing.ui.content.open.impl.seine.TripSeineUI; +import fr.ird.observe.application.swing.ui.tree.node.DataReferenceNodeSupport; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ReferentialReferenceNodeSupport; +import fr.ird.observe.application.swing.ui.tree.node.SetLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.SetSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java index c9af230..e04bb61 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java @@ -21,6 +21,8 @@ */ package fr.ird.observe.application.swing.ui.tree; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java index c44831e..f558b0e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java @@ -22,6 +22,8 @@ package fr.ird.observe.application.swing.ui.tree; import com.google.common.collect.Sets; +import fr.ird.observe.application.swing.ui.tree.node.AbstrctReferenceNodeSupport; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java index bc1ec1c..b79d4af 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java @@ -21,6 +21,8 @@ */ package fr.ird.observe.application.swing.ui.tree; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; + import javax.swing.JComponent; import javax.swing.JTree; import javax.swing.tree.DefaultTreeModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java index f58ec32..fdd8901 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -35,6 +35,7 @@ import fr.ird.observe.application.swing.ui.tree.menu.MoveActivitySeineNodeMenuPo import fr.ird.observe.application.swing.ui.tree.menu.MoveNodeMenuPopulator; import fr.ird.observe.application.swing.ui.tree.menu.MoveRouteNodeMenuPopulator; import fr.ird.observe.application.swing.ui.tree.menu.MoveTripNodeMenuPopulator; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java index 33cbc70..1a5f526 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.application.swing.ui.tree; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import jaxx.runtime.swing.nav.tree.NavTreeBridge; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java index 40a5953..ede5dd3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java @@ -36,6 +36,8 @@ import fr.ird.observe.application.swing.ui.tree.loadors.ProgramLonglineNodeChild import fr.ird.observe.application.swing.ui.tree.loadors.ProgramSeineNodeChildLoador; import fr.ird.observe.application.swing.ui.tree.loadors.RootNodeChildLoador; import fr.ird.observe.application.swing.ui.tree.loadors.RoutesNodeChildLoador; +import fr.ird.observe.application.swing.ui.tree.node.AbstrctReferenceNodeSupport; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java index f7d103e..8a5907b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java index 9b9c6c6..03142c9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java index 70f390d..c876ac6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.seine.RouteService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java index 9bb6457..85e330f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java @@ -30,7 +30,7 @@ import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.services.service.seine.TripSeineService; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java index f1d593e..53b22ad 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.actions; */ -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java index 7bb246d..89d6322 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java @@ -25,7 +25,7 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 0987095..8d99fc7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.swing.ui.tree.loadors; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.application.swing.ui.tree.ActivityLonglineNode; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.SetLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ActivityLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.SetLonglineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java index 9903ca5..5642597 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.tree.loadors; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.ui.tree.ActivityLonglineNode; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ActivityLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java index 1da0070..b778d83 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java @@ -22,10 +22,10 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.ui.tree.ActivitySeineNode; -import fr.ird.observe.application.swing.ui.tree.FloatingObjectSeineNode; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.SetSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ActivitySeineNode; +import fr.ird.observe.application.swing.ui.tree.node.FloatingObjectSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.SetSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java index a0edadd..25c7545 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.ui.tree.ActivitySeineNode; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ActivitySeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java index bca68de..823bb4e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.tree.loadors; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index 8854627..b882687 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -24,8 +24,8 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.TripLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.TripLonglineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java index 0848478..7bfac0d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.TripSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java index fd1060e..4efc4b8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.referential.ReferentialHelper; import jaxx.runtime.swing.nav.NavDataProvider; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java index b1cacee..e4c33f5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java @@ -22,10 +22,10 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.ProgramLonglineNode; -import fr.ird.observe.application.swing.ui.tree.ProgramSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramSeineNode; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java index 46f6a6b..328a705 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.RouteSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.RouteSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java index acc43ed..3d609c0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import com.google.common.collect.Sets; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java index ddeac90..9bc8775 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import com.google.common.collect.Sets; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.seine.DiscardedTargetCatchDto; import fr.ird.observe.services.dto.seine.DiscardedTargetSampleDto; import fr.ird.observe.services.dto.seine.KeptTargetCatchDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java index ac35ffe..595cba2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java @@ -26,9 +26,9 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.application.swing.decoration.DecoratorService; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.TripLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.TripLonglineNode; import fr.ird.observe.application.swing.ui.tree.actions.ChangeActivityTripActionListener; import fr.ird.observe.application.swing.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java index 4baab6b..b86d554 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java @@ -26,9 +26,9 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.application.swing.decoration.DecoratorService; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.RouteSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.RouteSeineNode; import fr.ird.observe.application.swing.ui.tree.actions.ChangeActivityRouteActionListener; import fr.ird.observe.application.swing.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveNodeMenuPopulator.java index 9db1c7c..7bede09 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveNodeMenuPopulator.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.menu; */ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java index 09cf29c..6c528a1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java @@ -26,9 +26,9 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.application.swing.decoration.DecoratorService; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.TripSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; import fr.ird.observe.application.swing.ui.tree.actions.ChangeRouteTripActionListener; import fr.ird.observe.application.swing.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java index 5edf126..01abc5d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java @@ -27,10 +27,10 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.ProgramLonglineNode; -import fr.ird.observe.application.swing.ui.tree.ProgramSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramSeineNode; import fr.ird.observe.application.swing.ui.tree.actions.ChangeTripProgramActionListener; import fr.ird.observe.application.swing.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstrctReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstrctReferenceNodeSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java index e580171..2e391c2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstrctReferenceNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.tree; * #L% */ +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivityLonglineNode.java similarity index 93% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivityLonglineNode.java index ff0a73c..f9ca28f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivityLonglineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivitySeineNode.java similarity index 93% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivitySeineNode.java index 3dfed91..0d16aa4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivitySeineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataReferenceNodeSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java index a757d65..acb70c2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataReferenceNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -24,6 +24,7 @@ package fr.ird.observe.application.swing.ui.tree; import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.OpenableDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/FloatingObjectSeineNode.java similarity index 93% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/FloatingObjectSeineNode.java index e6ed23e..b81aefe 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/FloatingObjectSeineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.service.seine.FloatingObjectService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ObserveNode.java similarity index 98% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ObserveNode.java index e66ae53..d855c57 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ObserveNode.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java similarity index 94% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java index 05b0e2e..48d8266 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java similarity index 94% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java index 6d0d1cf..49d9e0a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ReferentialReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java similarity index 95% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ReferentialReferenceNodeSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java index dc999e1..b1d4c59 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ReferentialReferenceNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.tree; * #L% */ +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/RouteSeineNode.java similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/RouteSeineNode.java index e3be2b8..714d856 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/RouteSeineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetLonglineNode.java similarity index 93% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetLonglineNode.java index 3757916..7b1dbeb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetLonglineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.service.longline.SetLonglineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetSeineNode.java similarity index 93% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetSeineNode.java index 614535f..cc977f4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetSeineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.seine.SetSeineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripLonglineNode.java similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripLonglineNode.java index fe3ec9f..cc0663d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripLonglineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java index b5b2b23..b716579 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java index 274abf4..9aee659 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.util; * #L% */ -import fr.ird.observe.application.swing.ui.tree.AbstrctReferenceNodeSupport; +import fr.ird.observe.application.swing.ui.tree.node.AbstrctReferenceNodeSupport; import fr.ird.observe.services.dto.IdDto; import org.nuiton.decorator.Decorator; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.