[Observe-commits] 11/14: [iso] revue du rechargement des noeuds dans l'arbre de navigation + du nettoyage de code

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 0b74ce6721d1f1947187e477137a49ad1402c524 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 4 12:42:16 2016 +0100 [iso] revue du rechargement des noeuds dans l'arbre de navigation + du nettoyage de code --- .../ui/content/list/ContentListUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 3 +- .../swing/ui/tree/navigation/NavigationTree.java | 5 +-- .../ui/tree/navigation/NavigationTreeModel.java | 14 +++++-- .../navigation/nodes/ClassNavigationTreeNode.java | 5 --- .../nodes/NavigationTreeNodeSupport.java | 43 +++++++++++++++------- .../nodes/ReferenceNavigationTreeNodeSupport.java | 3 -- .../navigation/nodes/RootNavigationTreeNode.java | 5 --- .../nodes/StringNavigationTreeNodeSupport.java | 6 --- .../tree/navigation/nodes/WithChildsToReload.java | 12 ++++++ .../ActivitiesLonglineNavigationTreeNode.java | 13 ++----- .../ActivityLonglineNavigationTreeNode.java | 33 +++++------------ .../ProgramLonglineNavigationTreeNode.java | 8 +--- .../longline/SetLonglineNavigationTreeNode.java | 22 ++++++----- .../longline/TripLonglineNavigationTreeNode.java | 12 ++---- .../seine/ActivitiesSeineNavigationTreeNode.java | 18 ++------- .../seine/ActivitySeineNavigationTreeNode.java | 30 ++++++++------- .../FloatingObjectSeineNavigationTreeNode.java | 10 +---- .../seine/ProgramSeineNavigationTreeNode.java | 7 ---- .../nodes/seine/RouteSeineNavigationTreeNode.java | 11 ++---- .../nodes/seine/RoutesSeineNavigationTreeNode.java | 11 ++---- .../nodes/seine/SetSeineNavigationTreeNode.java | 27 ++++++++------ .../nodes/seine/TripSeineNavigationTreeNode.java | 5 --- .../dto/longline/ActivityLonglineHelper.java | 26 +++++++++++++ .../services/dto/seine/ActivitySeineHelper.java | 10 +++++ 25 files changed, 169 insertions(+), 172 deletions(-) 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 c2b79f2..8ae5090 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 @@ -140,7 +140,7 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto, U NavigationTreeNodeSupport selectedNode = treeHelper.getSelectedNode(); // on charge si besoin les enfants du nœud - selectedNode.populateChilds(treeHelper.getTreeModel()); + selectedNode.populateChilds(); Enumeration children = selectedNode.children(); while (children.hasMoreElements()) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 566989c..d31b3a5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -28,7 +28,6 @@ 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.ContentUIModel; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; -import fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline.ActivityLonglineNavigationTreeNode; import fr.ird.observe.application.swing.validation.ValidationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; @@ -259,7 +258,7 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin // ouverture de l'activité après création getOpenDataManager().openActivityLongline(getSelectedParentId(), bean.getId(), null); - if (ActivityLonglineNavigationTreeNode.FISHING_OPERATION_ID.equals(bean.getVesselActivityLongline().getId())) { + if (ActivityLonglineHelper.FISHING_OPERATION_ID.equals(bean.getVesselActivityLongline().getId())) { // création de l'opération de pêche SwingUtilities.invokeLater(() -> getUi().getAddSet().doClick()); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java index 190da68..c13ef19 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java @@ -172,7 +172,7 @@ public class NavigationTree extends JXTree { } public NavigationTreeNodeSupport getChild(NavigationTreeNodeSupport node, String id) { - return node.findChildById(getTreeModel(), id); + return node.findChildById(id); } public void removeNode(NavigationTreeNodeSupport node) { @@ -299,8 +299,7 @@ public class NavigationTree extends JXTree { } // 3. Let's re-generate node's children by populating the node : this will call the child loaders. - node.reload(); - node.populateChilds(getTreeModel()); + node.updateNode(); // Fix bug (if no child in parent node, it will not expand...) fireTreeExpanded(new TreePath(node.getPath())); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java index c0feaba..aea1297 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.swing.ui.tree.navigation; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.RootNavigationTreeNode; +import fr.ird.observe.application.swing.ui.tree.navigation.nodes.WithChildsToReload; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline.ProgramLonglineNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.referential.ReferentialsNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.ProgramSeineNavigationTreeNode; @@ -72,9 +73,9 @@ public class NavigationTreeModel extends DefaultTreeModel { for (Object id : ids) { if (id instanceof String) { - result = node.findChildById(this, (String) id); + result = node.findChildById((String) id); } else if (id instanceof Class) { - result = node.findChildByType(this, (Class) id); + result = node.findChildByType((Class) id); } if (result == null) { @@ -88,7 +89,7 @@ public class NavigationTreeModel extends DefaultTreeModel { } public NavigationTreeNodeSupport<?> findNodeByType(NavigationTreeNodeSupport<?> node, Class<?> nodeType) { - return node.findChildByType(this, nodeType); + return node.findChildByType(nodeType); } public void populate() { @@ -185,7 +186,12 @@ public class NavigationTreeModel extends DefaultTreeModel { } public <N extends NavigationTreeNodeSupport> void open(N node) { - boolean updated = node.populateChilds(this); + if (node instanceof WithChildsToReload) { + WithChildsToReload childsToReload = (WithChildsToReload) node; + node.populateChilds(); + + } + boolean updated = node.populateChilds(); if (updated) { reload(node); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ClassNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ClassNavigationTreeNode.java index 0c8c2d3..b6fc7c5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ClassNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ClassNavigationTreeNode.java @@ -59,11 +59,6 @@ public abstract class ClassNavigationTreeNode<D extends IdDto> extends Navigatio } @Override - protected void populateChilds0(NavigationTreeModel treeModel) { - removeAllChildren(); - } - - @Override public String getText() { return t(ObserveI18nDecoratorHelper.getTypeI18nKey(getDataType())); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java index c72a72e..7b1b36f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java @@ -27,7 +27,6 @@ import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.actions.content.SelectNodeUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.ObserveTreeNodeSupport; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.services.ObserveServicesProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,15 +46,33 @@ import java.util.Enumeration; */ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSupport<O> { + /** Logger */ + private static final Log log = LogFactory.getLog(NavigationTreeNodeSupport.class); + + private boolean loaded; + public abstract Class<?> getDataType(); public abstract void reload(); public abstract Class<? extends ContentUI<?, ?>> getContentClass(); - protected abstract void populateChilds0(NavigationTreeModel treeModel); + public void updateNode() { + loaded=false; + reload(); + if (withChildsToLoad()) { + populateChilds(); + } + loaded = true; + } - private boolean loaded; + protected boolean withChildsToLoad() { + return WithChildsToReload.class.isAssignableFrom(getClass()); + } + + public boolean isPersisted() { + return getId() != null; + } @Override public RootNavigationTreeNode getRoot() { @@ -76,9 +93,12 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor setUserObject(data); } - public final boolean populateChilds(NavigationTreeModel treeModel) { - if (getAllowsChildren() && !isLoaded()) { - populateChilds0(treeModel); + public final boolean populateChilds() { + if (isPersisted() && getAllowsChildren() && !isLoaded()) { + if (isPersisted() && withChildsToLoad()) { + removeAllChildren(); + ((WithChildsToReload) this).reloadChilds(); + } loaded = true; return true; } @@ -97,7 +117,7 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider(); } - public NavigationTreeNodeSupport findChildById(NavigationTreeModel treeModel, String id) { + public NavigationTreeNodeSupport findChildById(String id) { if (id == null) { // id null ? donc rien a faire @@ -112,7 +132,7 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor if (!isLoaded()) { // il faut charger les fils du noeud pour effectuer la recherche - populateChilds(treeModel); + populateChilds(); } if (isLeaf()) { @@ -131,7 +151,7 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor return null; } - public NavigationTreeNodeSupport findChildByType(NavigationTreeModel treeModel, Class<?> childType) { + public NavigationTreeNodeSupport findChildByType(Class<?> childType) { if (childType.isAssignableFrom(getClass())) { @@ -142,7 +162,7 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor if (!isLoaded()) { // il faut charger les fils du noeud pour effectuer la recherche - populateChilds(treeModel); + populateChilds(); } if (isLeaf()) { @@ -175,9 +195,6 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor return isOpen() ? Color.BLACK : Color.GRAY; } - /** Logger */ - private static final Log log = LogFactory.getLog(NavigationTreeNodeSupport.class); - public JMenuItem toMenuItem(SelectNodeUIAction action, ContentUI<?, ?> ui) { JMenuItem mi = new JMenuItem(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java index b8db2ea..7fba96d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java @@ -35,9 +35,6 @@ import org.nuiton.decorator.Decorator; */ public abstract class ReferenceNavigationTreeNodeSupport<D extends IdDto, O extends AbstractReference<D>> extends NavigationTreeNodeSupport<O> { - public boolean isPersisted() { - return getId()!=null; - } @Override public String getId() { return getData().getId(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/RootNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/RootNavigationTreeNode.java index 4e2cc1c..66227a0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/RootNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/RootNavigationTreeNode.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes; */ import fr.ird.observe.application.swing.ui.content.ContentUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import org.apache.commons.collections4.EnumerationUtils; @@ -54,10 +53,6 @@ public class RootNavigationTreeNode extends StringNavigationTreeNodeSupport impl } @Override - protected void populateChilds0(NavigationTreeModel treeModel) { - } - - @Override public Iterator<ReferenceNavigationTreeNodeSupport<ProgramDto, ReferentialReference<ProgramDto>>> iterator() { return (Iterator) EnumerationUtils.toList(children()).stream().filter(c -> c instanceof ReferenceNavigationTreeNodeSupport).iterator(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/StringNavigationTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/StringNavigationTreeNodeSupport.java index 0a14e28..99ab435 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/StringNavigationTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/StringNavigationTreeNodeSupport.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes; */ import fr.ird.observe.application.swing.ui.content.ContentUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; /** * Created on 14/11/16. @@ -58,11 +57,6 @@ public class StringNavigationTreeNodeSupport extends NavigationTreeNodeSupport<S } @Override - protected void populateChilds0(NavigationTreeModel treeModel) { - // par défaut, pas de fils à charger - } - - @Override public String getText() { return getData(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/WithChildsToReload.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/WithChildsToReload.java new file mode 100644 index 0000000..e1e0c2f --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/WithChildsToReload.java @@ -0,0 +1,12 @@ +package fr.ird.observe.application.swing.ui.tree.navigation.nodes; + +/** + * Created on 04/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public interface WithChildsToReload { + + void reloadChilds(); +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java index 578c196..9263d5c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java @@ -24,12 +24,11 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.content.list.impl.longline.ActivityLonglinesUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ClassNavigationTreeNode; +import fr.ird.observe.application.swing.ui.tree.navigation.nodes.WithChildsToReload; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import static org.nuiton.i18n.I18n.t; @@ -39,7 +38,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 5.1 */ -public class ActivitiesLonglineNavigationTreeNode extends ClassNavigationTreeNode<ActivityLonglineDto> { +public class ActivitiesLonglineNavigationTreeNode extends ClassNavigationTreeNode<ActivityLonglineDto> implements WithChildsToReload { public ActivitiesLonglineNavigationTreeNode() { super(ActivityLonglineDto.class, true); @@ -66,14 +65,10 @@ public class ActivitiesLonglineNavigationTreeNode extends ClassNavigationTreeNod } @Override - protected void populateChilds0(NavigationTreeModel treeModel) { - removeAllChildren(); - String id = getId(); - ActivityLonglineService service = getMainDataSourceServicesProvider().newActivityLonglineService(); - DataReferenceSet<ActivityLonglineDto> referenceSet = service.getActivityLonglineByTripLongline(id); + public void reloadChilds() { + DataReferenceSet<ActivityLonglineDto> referenceSet = getMainDataSourceServicesProvider().newActivityLonglineService().getActivityLonglineByTripLongline(getId()); for (DataReference<ActivityLonglineDto> reference : referenceSet.getReferences()) { add(new ActivityLonglineNavigationTreeNode(reference)); } } - } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java index 5b54473..5159145 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java @@ -22,12 +22,11 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; * #L% */ -import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.ui.content.open.impl.longline.ActivityLonglineUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineHelper; import fr.ird.observe.services.dto.longline.SetLonglineDto; import static org.nuiton.i18n.I18n.t; @@ -41,32 +40,20 @@ import static org.nuiton.i18n.I18n.t; public class ActivityLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeSupport<ActivityLonglineDto, DataReference<ActivityLonglineDto>> { - public final static String FISHING_OPERATION_ID = - "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1"; // operation de peche - - private final static ImmutableSet<String> ENCOUNTERS_ID = ImmutableSet.of( - FISHING_OPERATION_ID, // operation de peche - "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.4" // rencontre interaction - ); - private final static ImmutableSet<String> SENSOR_USED_ID = ImmutableSet.of( - FISHING_OPERATION_ID, // operation de peche - "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.3" // station oceanographique - ); - public ActivityLonglineNavigationTreeNode(DataReference<ActivityLonglineDto> data) { super(data, true); - if (data.getId() != null) { - DataReference<SetLonglineDto> setLonglineRef = (DataReference) data.getPropertyValue(ActivityLonglineDto.PROPERTY_SET_LONGLINE); + if (isPersisted()) { + DataReference<SetLonglineDto> setLonglineRef = ActivityLonglineHelper.getSetLongline(data); if (setLonglineRef != null) { add(new SetLonglineNavigationTreeNode(setLonglineRef)); } - String vesselActivityId = (String) data.getPropertyValue(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE + "Id"); + String vesselActivityId = ActivityLonglineHelper.getVeseelActivityId(data); - if (ENCOUNTERS_ID.contains(vesselActivityId)) { + if (ActivityLonglineHelper.ENCOUNTERS_ID.contains(vesselActivityId)) { add(new EncounterLonglineNavigationTreeNode()); } - if (SENSOR_USED_ID.contains(vesselActivityId)) { + if (ActivityLonglineHelper.SENSOR_USED_ID.contains(vesselActivityId)) { add(new SensorUsedLonglineNavigationTreeNode()); } } @@ -74,12 +61,13 @@ public class ActivityLonglineNavigationTreeNode extends ReferenceNavigationTreeN @Override public void reload() { - + DataReference<ActivityLonglineDto> data = getMainDataSourceServicesProvider().newActivityLonglineService().loadReferenceToRead(getId()); + setData(data); } @Override public String getText() { - return getId() == null ? t("observe.type.activityLongline.unsaved") : super.getText(); + return isPersisted() ? super.getText() : t("observe.type.activityLongline.unsaved"); } @Override @@ -87,7 +75,4 @@ public class ActivityLonglineNavigationTreeNode extends ReferenceNavigationTreeN return ActivityLonglineUI.class; } - @Override - public void populateChilds0(NavigationTreeModel treeModel) { - } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java index 7fa467b..f249d0a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; */ import fr.ird.observe.application.swing.ui.content.list.impl.longline.TripLonglinesUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -63,7 +62,8 @@ public class ProgramLonglineNavigationTreeNode extends ReferenceNavigationTreeNo @Override public void reload() { - + ReferentialReference<ProgramDto> data = getMainDataSourceServicesProvider().newReferentialService().loadReference(ProgramDto.class, getId()); + setData(data); } @Override @@ -77,10 +77,6 @@ public class ProgramLonglineNavigationTreeNode extends ReferenceNavigationTreeNo } @Override - protected void populateChilds0(NavigationTreeModel treeModel) { - } - - @Override public Iterator<TripLonglineNavigationTreeNode> iterator() { return EnumerationUtils.toList(children()).iterator(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java index 7ce594c..25a5006 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; */ import fr.ird.observe.application.swing.ui.content.impl.longline.SetLonglineUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.SetLonglineDto; @@ -38,11 +37,23 @@ public class SetLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeSu public SetLonglineNavigationTreeNode(DataReference<SetLonglineDto> data) { super(data, true); + if (isPersisted()) { + add(new SetGlobalCompositionLonglineNavigationTreeNode()); + add(new SetDetailCompositionLonglineNavigationTreeNode()); + add(new CatchLonglineNavigationTreeNode()); + add(new TdrLonglineNavigationTreeNode()); + } } @Override - public void reload() { + public boolean isLeaf() { + return !isPersisted(); + } + @Override + public void reload() { + DataReference<SetLonglineDto> data = getMainDataSourceServicesProvider().newSetLonglineService().loadReferenceToRead(getId()); + setData(data); } @Override @@ -55,11 +66,4 @@ public class SetLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeSu return SetLonglineUI.class; } - @Override - public void populateChilds0(NavigationTreeModel treeModel) { - add(new SetGlobalCompositionLonglineNavigationTreeNode()); - add(new SetDetailCompositionLonglineNavigationTreeNode()); - add(new CatchLonglineNavigationTreeNode()); - add(new TdrLonglineNavigationTreeNode()); - } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java index d22ef4f..7549c6d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; */ import fr.ird.observe.application.swing.ui.content.open.impl.longline.TripLonglineUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -41,7 +40,7 @@ public class TripLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeS public TripLonglineNavigationTreeNode(DataReference<TripLonglineDto> data) { super(data, data.getId() != null); - if (data.getId() != null) { + if (isPersisted()) { add(new GearUseFeaturesLonglineNavigationTreeNode()); add(new ActivitiesLonglineNavigationTreeNode()); } @@ -49,12 +48,13 @@ public class TripLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeS @Override public void reload() { - + DataReference<TripLonglineDto> data = getMainDataSourceServicesProvider().newTripLonglineService().loadReferenceToRead(getId()); + setData(data); } @Override public String getText() { - return getId() == null ? t("observe.type.tripLongline.unsaved") : (super.getText() + " (" + TripLonglineHelper.getActivityCount(getData()) + ")"); + return isPersisted() ? (super.getText() + " (" + TripLonglineHelper.getActivityCount(getData()) + ")") : t("observe.type.tripLongline.unsaved"); } @Override @@ -62,8 +62,4 @@ public class TripLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeS return TripLonglineUI.class; } - @Override - public void populateChilds0(NavigationTreeModel treeModel) { - // rien à ajouter - } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java index e7f2ae4..62ac752 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java @@ -24,12 +24,11 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.content.list.impl.seine.ActivitySeinesUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ClassNavigationTreeNode; +import fr.ird.observe.application.swing.ui.tree.navigation.nodes.WithChildsToReload; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.service.data.seine.ActivitySeineService; import static org.nuiton.i18n.I18n.t; @@ -39,7 +38,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 5.1 */ -public class ActivitiesSeineNavigationTreeNode extends ClassNavigationTreeNode<ActivitySeineDto> { +public class ActivitiesSeineNavigationTreeNode extends ClassNavigationTreeNode<ActivitySeineDto> implements WithChildsToReload { public ActivitiesSeineNavigationTreeNode() { super(ActivitySeineDto.class, true); @@ -66,19 +65,10 @@ public class ActivitiesSeineNavigationTreeNode extends ClassNavigationTreeNode<A } @Override - public void reload() { - - } - - @Override - protected void populateChilds0(NavigationTreeModel treeModel) { - removeAllChildren(); - String id = getId(); - ActivitySeineService service = getMainDataSourceServicesProvider().newActivitySeineService(); - DataReferenceSet<ActivitySeineDto> referenceSet = service.getActivitySeineByRoute(id); + public void reloadChilds() { + DataReferenceSet<ActivitySeineDto> referenceSet = getMainDataSourceServicesProvider().newActivitySeineService().getActivitySeineByRoute(getId()); for (DataReference<ActivitySeineDto> reference : referenceSet.getReferences()) { add(new ActivitySeineNavigationTreeNode(reference)); } } - } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java index f1e2346..b1e45a2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java @@ -23,14 +23,14 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; */ import fr.ird.observe.application.swing.ui.content.open.impl.seine.ActivitySeineUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; +import fr.ird.observe.application.swing.ui.tree.navigation.nodes.WithChildsToReload; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineHelper; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.SetSeineDto; -import fr.ird.observe.services.service.data.seine.FloatingObjectService; import static org.nuiton.i18n.I18n.t; @@ -40,31 +40,27 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 5.1 */ -public class ActivitySeineNavigationTreeNode extends ReferenceNavigationTreeNodeSupport<ActivitySeineDto, DataReference<ActivitySeineDto>> { +public class ActivitySeineNavigationTreeNode extends ReferenceNavigationTreeNodeSupport<ActivitySeineDto, DataReference<ActivitySeineDto>> implements WithChildsToReload { public ActivitySeineNavigationTreeNode(DataReference<ActivitySeineDto> data) { super(data, true); - if (data.getId() != null) { - DataReference<SetSeineDto> set = (DataReference<SetSeineDto>) data.getPropertyValue(ActivitySeineDto.PROPERTY_SET_SEINE); + if (isPersisted()) { + DataReference<SetSeineDto> set = ActivitySeineHelper.getSetSeine(data); if (set != null) { add(new SetSeineNavigationTreeNode(set)); } - - FloatingObjectService service = getMainDataSourceServicesProvider().newFloatingObjectService(); - DataReferenceSet<FloatingObjectDto> referenceSet = service.getFloatingObjectByActivitySeine(getId()); - for (DataReference<FloatingObjectDto> reference : referenceSet.getReferences()) { - add(new FloatingObjectSeineNavigationTreeNode(reference)); - } } } @Override public void reload() { + DataReference<ActivitySeineDto> data = getMainDataSourceServicesProvider().newActivitySeineService().loadReferenceToRead(getId()); + setData(data); } @Override public String getText() { - return getId() == null ? t("observe.type.activitySeine.unsaved") : super.getText(); + return isPersisted() ? super.getText() : t("observe.type.activitySeine.unsaved"); } @Override @@ -73,6 +69,14 @@ public class ActivitySeineNavigationTreeNode extends ReferenceNavigationTreeNode } @Override - public void populateChilds0(NavigationTreeModel treeModel) { + public void reloadChilds() { + DataReference<SetSeineDto> set = ActivitySeineHelper.getSetSeine(getData()); + if (set != null) { + add(new SetSeineNavigationTreeNode(set)); + } + DataReferenceSet<FloatingObjectDto> referenceSet = getMainDataSourceServicesProvider().newFloatingObjectService().getFloatingObjectByActivitySeine(getId()); + for (DataReference<FloatingObjectDto> reference : referenceSet.getReferences()) { + add(new FloatingObjectSeineNavigationTreeNode(reference)); + } } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java index 905912e..ebd7b26 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java @@ -23,11 +23,9 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; */ import fr.ird.observe.application.swing.ui.content.impl.seine.FloatingObjectUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.FloatingObjectDto; -import fr.ird.observe.services.service.data.seine.FloatingObjectService; /** * Created on 14/11/16. @@ -48,9 +46,8 @@ public class FloatingObjectSeineNavigationTreeNode extends ReferenceNavigationTr @Override public void reload() { - FloatingObjectService service = getMainDataSourceServicesProvider().newFloatingObjectService(); - DataReference<FloatingObjectDto> reference = service.loadReferenceToRead(getId()); - setData(reference); + DataReference<FloatingObjectDto> data = getMainDataSourceServicesProvider().newFloatingObjectService().loadReferenceToRead(getId()); + setData(data); } @Override @@ -68,7 +65,4 @@ public class FloatingObjectSeineNavigationTreeNode extends ReferenceNavigationTr return FloatingObjectUI.class; } - @Override - public void populateChilds0(NavigationTreeModel treeModel) { - } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java index e30fdb7..e724def 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; */ import fr.ird.observe.application.swing.ui.content.list.impl.seine.TripSeinesUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -47,7 +46,6 @@ public class ProgramSeineNavigationTreeNode extends ReferenceNavigationTreeNodeS for (DataReference<TripSeineDto> trip : trips) { add(new TripSeineNavigationTreeNode(trip)); } - setLoaded(true); } @Override @@ -78,11 +76,6 @@ public class ProgramSeineNavigationTreeNode extends ReferenceNavigationTreeNodeS } @Override - protected void populateChilds0(NavigationTreeModel treeModel) { - } - - - @Override public Iterator<TripSeineNavigationTreeNode> iterator() { return EnumerationUtils.toList(children()).iterator(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java index be0ea75..dbf494d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; */ import fr.ird.observe.application.swing.ui.content.open.impl.seine.RouteUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.RouteDto; @@ -40,19 +39,20 @@ public class RouteSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSup public RouteSeineNavigationTreeNode(DataReference<RouteDto> data) { super(data, true); - if (data.getId() != null) { + if (isPersisted()) { add(new ActivitiesSeineNavigationTreeNode()); } } @Override public void reload() { - + DataReference<RouteDto> data = getMainDataSourceServicesProvider().newRouteService().loadReferenceToRead(getId()); + setData(data); } @Override public String getText() { - return getId() == null ? t("observe.type.route.unsaved") : super.getText(); + return isPersisted() ? super.getText() : t("observe.type.route.unsaved"); } @Override @@ -60,7 +60,4 @@ public class RouteSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSup return RouteUI.class; } - @Override - public void populateChilds0(NavigationTreeModel treeModel) { - } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java index 5f942a6..1bdbef2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java @@ -25,8 +25,8 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.content.list.impl.seine.RoutesUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ClassNavigationTreeNode; +import fr.ird.observe.application.swing.ui.tree.navigation.nodes.WithChildsToReload; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.RouteDto; @@ -40,7 +40,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 5.1 */ -public class RoutesSeineNavigationTreeNode extends ClassNavigationTreeNode<RouteDto> { +public class RoutesSeineNavigationTreeNode extends ClassNavigationTreeNode<RouteDto> implements WithChildsToReload { public RoutesSeineNavigationTreeNode() { super(RouteDto.class, true); @@ -67,12 +67,7 @@ public class RoutesSeineNavigationTreeNode extends ClassNavigationTreeNode<Route } @Override - public void reload() { - - } - - @Override - protected void populateChilds0(NavigationTreeModel treeModel) { + public void reloadChilds() { removeAllChildren(); String id = getId(); RouteService routeService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newRouteService(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java index 3894ce2..605227c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java @@ -23,10 +23,10 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; */ import fr.ird.observe.application.swing.ui.content.impl.seine.SetSeineUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.service.data.seine.SetSeineService; /** * Created on 14/11/16. @@ -38,10 +38,24 @@ public class SetSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSuppo public SetSeineNavigationTreeNode(DataReference<SetSeineDto> data) { super(data, true); + if (isPersisted()) { + add(new SchoolEstimatesSeineNavigationTreeNode()); + add(new KeptTargetCatchesSeineNavigationTreeNode()); + add(new DiscardedTargetCatchesSeineNavigationTreeNode()); + add(new KeptTargetSamplesSeineNavigationTreeNode()); + add(new DiscardedTargetSamplesSeineNavigationTreeNode()); + add(new NonTargetCatchesSeineNavigationTreeNode()); + add(new NoneTargetSamplesSeineNavigationTreeNode()); + } } @Override public void reload() { + if (isPersisted()) { + SetSeineService service = getMainDataSourceServicesProvider().newSetSeineService(); + DataReference<SetSeineDto> data = service.loadReferenceToRead(getId()); + setData(data); + } } @Override @@ -54,15 +68,4 @@ public class SetSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSuppo return SetSeineUI.class; } - @Override - public void populateChilds0(NavigationTreeModel treeModel) { - removeAllChildren(); - add(new SchoolEstimatesSeineNavigationTreeNode()); - add(new KeptTargetCatchesSeineNavigationTreeNode()); - add(new DiscardedTargetCatchesSeineNavigationTreeNode()); - add(new KeptTargetSamplesSeineNavigationTreeNode()); - add(new DiscardedTargetSamplesSeineNavigationTreeNode()); - add(new NonTargetCatchesSeineNavigationTreeNode()); - add(new NoneTargetSamplesSeineNavigationTreeNode()); - } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java index cbf872d..d442795 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java @@ -62,9 +62,4 @@ public class TripSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSupp public Class<TripSeineUI> getContentClass() { return TripSeineUI.class; } - - @Override - public void populateChilds0(NavigationTreeModel treeModel) { - - } } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineHelper.java new file mode 100644 index 0000000..42c1d0c --- /dev/null +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineHelper.java @@ -0,0 +1,26 @@ +package fr.ird.observe.services.dto.longline; + +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.DataReference; + +public class ActivityLonglineHelper extends GeneratedActivityLonglineHelper { + + public final static String FISHING_OPERATION_ID = + "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1"; // operation de peche + public final static ImmutableSet<String> SENSOR_USED_ID = ImmutableSet.of( + FISHING_OPERATION_ID, // operation de peche + "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.3" // station oceanographique + ); + public final static ImmutableSet<String> ENCOUNTERS_ID = ImmutableSet.of( + FISHING_OPERATION_ID, // operation de peche + "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.4" // rencontre interaction + ); + + public static DataReference<SetLonglineDto> getSetLongline(DataReference<ActivityLonglineDto> data) { + return (DataReference<SetLonglineDto>) data.getPropertyValue(ActivityLonglineDto.PROPERTY_SET_LONGLINE); + } + + public static String getVeseelActivityId(DataReference<ActivityLonglineDto> data) { + return (String) data.getPropertyValue(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE + "Id"); + } +} diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineHelper.java new file mode 100644 index 0000000..11b2855 --- /dev/null +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineHelper.java @@ -0,0 +1,10 @@ +package fr.ird.observe.services.dto.seine; + +import fr.ird.observe.services.dto.DataReference; + +public class ActivitySeineHelper extends GeneratedActivitySeineHelper { + + public static DataReference<SetSeineDto> getSetSeine(DataReference<ActivitySeineDto> data) { + return (DataReference<SetSeineDto>) data.getPropertyValue(ActivitySeineDto.PROPERTY_SET_SEINE); + } +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.