This is an automated email from the git hooks/post-receive script. New commit to branch feature/7624 in repository observe. See http://git.codelutin.com/observe.git commit 471fe456d72272b449c750ac70274c58076ceb09 Author: Kevin Morin <morin@codelutin.com> Date: Wed Nov 18 15:33:17 2015 +0100 refactor --- .../actions/shared/MoveActivitySeinesUIAction.java | 27 ++++---------------- .../ui/actions/shared/MoveRoutesUIAction.java | 28 ++++----------------- .../ui/actions/shared/MoveTripsUIAction.java | 29 +++++----------------- .../tree/ObserveNavigationTreeShowPopupAction.java | 10 +++++--- .../MoveActivityLonglineNodeMenuPopulator.java | 15 +++++------ .../menu/MoveActivitySeineNodeMenuPopulator.java | 11 ++++---- .../ui/tree/menu/MoveNodeMenuPopulator.java | 7 +++--- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 11 ++++---- .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 11 ++++---- .../ird/observe/ui/util/DecoratedNodeEntity.java | 26 +++++++++++++++++++ 10 files changed, 78 insertions(+), 97 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java index d117a50..a211045 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java @@ -36,6 +36,7 @@ import fr.ird.observe.ui.content.list.impl.seine.ActivitySeinesUI; import fr.ird.observe.ui.tree.DtoNodeSupport; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; +import fr.ird.observe.ui.util.DecoratedNodeEntity; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; @@ -130,7 +131,7 @@ public class MoveActivitySeinesUIAction extends AbstractUIAction { RouteDto.class.getSimpleName()); //on crée un tableau avec une route en moins car on ne propose pas la route actuel - DecoratedRoute[] decoratedRoutes = new DecoratedRoute[routeNb - 1]; + DecoratedNodeEntity[] decoratedRoutes = new DecoratedNodeEntity[routeNb - 1]; int j = 0; for (int i = 0 ; i < routeNb ; i++) { @@ -140,7 +141,8 @@ public class MoveActivitySeinesUIAction extends AbstractUIAction { String routeId = routeNode.getId(); if (!oldRouteId.equals(routeId)) { - decoratedRoutes[j++] = new DecoratedRoute(routeId, decorator.toString(((DtoNodeSupport) routeNode).getEntity())); + decoratedRoutes[j++] = new DecoratedNodeEntity(routeId, + decorator.toString(((DtoNodeSupport) routeNode).getEntity())); } } @@ -152,7 +154,7 @@ public class MoveActivitySeinesUIAction extends AbstractUIAction { decoratedRoutes, null); - return decoratedRoute != null ? ((DecoratedRoute) decoratedRoute).getId() : null; + return decoratedRoute != null ? ((DecoratedNodeEntity) decoratedRoute).getId() : null; } protected void updateTree(ObserveNode oldActivitiesNode, @@ -203,23 +205,4 @@ public class MoveActivitySeinesUIAction extends AbstractUIAction { treeHelper.reloadNode(tripNode, true); } - public static class DecoratedRoute { - - private final String id; - private final String label; - - public DecoratedRoute(String id, String label) { - this.id = id; - this.label = label; - } - - public String getId() { - return id; - } - - @Override - public String toString() { - return label; - } - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java index 4a87d2a..3330dff 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java @@ -36,6 +36,7 @@ import fr.ird.observe.ui.content.list.impl.seine.RoutesUI; import fr.ird.observe.ui.tree.DtoNodeSupport; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; +import fr.ird.observe.ui.util.DecoratedNodeEntity; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; @@ -130,7 +131,7 @@ public class MoveRoutesUIAction extends AbstractUIAction { TripSeineDto.class.getSimpleName()); //on crée un tableau avec une route en moins car on ne propose pas la route actuel - DecoratedTripSeine[] decoratedTripSeines = new DecoratedTripSeine[tripSeineNb - 1]; + DecoratedNodeEntity[] decoratedTripSeines = new DecoratedNodeEntity[tripSeineNb - 1]; int j = 0; for (int i = 0 ; i < tripSeineNb ; i++) { @@ -140,8 +141,8 @@ public class MoveRoutesUIAction extends AbstractUIAction { String tripSeineId = tripSeineNode.getId(); if (!oldTripSeineId.equals(tripSeineId)) { - decoratedTripSeines[j++] = new DecoratedTripSeine(tripSeineId, - decorator.toString(((DtoNodeSupport) tripSeineNode).getEntity())); + decoratedTripSeines[j++] = new DecoratedNodeEntity(tripSeineId, + decorator.toString(((DtoNodeSupport) tripSeineNode).getEntity())); } } @@ -152,7 +153,7 @@ public class MoveRoutesUIAction extends AbstractUIAction { null, decoratedTripSeines, null); - return decoratedTripSeine != null ? ((DecoratedTripSeine) decoratedTripSeine).getId() : null; + return decoratedTripSeine != null ? ((DecoratedNodeEntity) decoratedTripSeine).getId() : null; } protected void updateTree(ObserveNode oldRoutesNode, @@ -202,23 +203,4 @@ public class MoveRoutesUIAction extends AbstractUIAction { } - public static class DecoratedTripSeine { - - private final String id; - private final String label; - - public DecoratedTripSeine(String id, String label) { - this.id = id; - this.label = label; - } - - public String getId() { - return id; - } - - @Override - public String toString() { - return label; - } - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java index 1538fb2..47760f2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripsUIAction.java @@ -35,6 +35,7 @@ import fr.ird.observe.ui.content.list.ContentListUIModel; import fr.ird.observe.ui.tree.DtoNodeSupport; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; +import fr.ird.observe.ui.util.DecoratedNodeEntity; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; @@ -155,7 +156,7 @@ public abstract class MoveTripsUIAction extends AbstractUIAction { ProgramDto.class.getSimpleName()); //on crée un tableau avec un programme en moins car on ne propose pas le programme actuel - List<DecoratedProgram> decoratedProgramList = new ArrayList<>(); + List<DecoratedNodeEntity> decoratedProgramList = new ArrayList<>(); for (int i = 0, n = rootNode.getChildCount() ; i < n ; i++) { @@ -173,12 +174,13 @@ public abstract class MoveTripsUIAction extends AbstractUIAction { if (geartype.equals(program.getPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE))) { String decoratedProgram = decorator.toString(program); - decoratedProgramList.add(new DecoratedProgram(programId, decoratedProgram)); + decoratedProgramList.add(new DecoratedNodeEntity(programId, decoratedProgram)); } } } - DecoratedProgram[] decoratedPrograms = decoratedProgramList.toArray(new DecoratedProgram[decoratedProgramList.size()]); + DecoratedNodeEntity[] decoratedPrograms = + decoratedProgramList.toArray(new DecoratedNodeEntity[decoratedProgramList.size()]); Object decoratedProgram = JOptionPane.showInputDialog(ui, t("observe.action.choose.program.message"), @@ -188,7 +190,7 @@ public abstract class MoveTripsUIAction extends AbstractUIAction { decoratedPrograms, null); - return decoratedProgram != null ? ((DecoratedProgram) decoratedProgram).getId() : null; + return decoratedProgram != null ? ((DecoratedNodeEntity) decoratedProgram).getId() : null; } protected void updateTree(ContentUI<?> ui, @@ -244,23 +246,4 @@ public abstract class MoveTripsUIAction extends AbstractUIAction { protected abstract void updateModelData(ContentUI<?> ui); - public static class DecoratedProgram { - - private final String id; - private final String label; - - public DecoratedProgram(String id, String label) { - this.id = id; - this.label = label; - } - - public String getId() { - return id; - } - - @Override - public String toString() { - return label; - } - } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java index 6eb9877..fa365b3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -34,6 +34,7 @@ import fr.ird.observe.ui.tree.menu.MoveActivitySeineNodeMenuPopulator; import fr.ird.observe.ui.tree.menu.MoveNodeMenuPopulator; import fr.ird.observe.ui.tree.menu.MoveRouteNodeMenuPopulator; import fr.ird.observe.ui.tree.menu.MoveTripNodeMenuPopulator; +import fr.ird.observe.ui.util.DecoratedNodeEntity; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -52,7 +53,7 @@ import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.util.Map; +import java.util.List; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -321,11 +322,12 @@ public class ObserveNavigationTreeShowPopupAction { ObserveSwingDataSource dataSource = treeHelper.getDataProvider().getDataSource(); - Map<String, String> possibleParentNodes = moveNodeData.getPossibleParentNodes(selectedNode, treeHelper); + List<DecoratedNodeEntity> possibleParentNodes = moveNodeData.getPossibleParentNodes(selectedNode, treeHelper); - for (String possibleParentId : possibleParentNodes.keySet()) { + for (DecoratedNodeEntity possibleParent : possibleParentNodes) { - JMenuItem item = new JMenuItem(possibleParentNodes.get(possibleParentId)); + String possibleParentId = possibleParent.getId(); + JMenuItem item = new JMenuItem(possibleParent.toString()); item.setName(possibleParentId); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java index 8fb9f6d..4697333 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java @@ -8,12 +8,13 @@ import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.tree.DtoNodeSupport; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; -import fr.ird.observe.ui.tree.actions.ChangeActivityRouteActionListener; +import fr.ird.observe.ui.tree.actions.ChangeActivityTripActionListener; import fr.ird.observe.ui.tree.actions.NodeChangeActionListener; +import fr.ird.observe.ui.util.DecoratedNodeEntity; import org.nuiton.decorator.Decorator; -import java.util.LinkedHashMap; -import java.util.Map; +import java.util.ArrayList; +import java.util.List; /** * @author Kevin Morin (Code Lutin) @@ -26,17 +27,17 @@ public class MoveActivityLonglineNodeMenuPopulator extends MoveNodeMenuPopulator ObserveSwingDataSource dataSource, String id, String parentId) { - return new ChangeActivityRouteActionListener(treeHelper, dataSource, id, parentId); + return new ChangeActivityTripActionListener(treeHelper, dataSource, id, parentId); } @Override - public Map<String, String> getPossibleParentNodes(ObserveNode activityLonglineNode, ObserveTreeHelper treeHelper) { + public List<DecoratedNodeEntity> getPossibleParentNodes(ObserveNode activityLonglineNode, ObserveTreeHelper treeHelper) { // noeud de marée parent ObserveNode parentNode = activityLonglineNode.getParent().getParent(); // noeud de route de la marée sans le parent actuel - Map<String, String> possibleParents = new LinkedHashMap<>(); + List<DecoratedNodeEntity> possibleParents = new ArrayList<>(); // noeud du programme ObserveNode programNode = parentNode.getParent(); @@ -56,7 +57,7 @@ public class MoveActivityLonglineNodeMenuPopulator extends MoveNodeMenuPopulator && IdDtos.isTripLonglineId(tripId)) { String decoratedTrip = tripDecorator.toString(((DtoNodeSupport) tripNode).getEntity()); - possibleParents.put(tripId, decoratedTrip); + possibleParents.add(new DecoratedNodeEntity(tripId, decoratedTrip)); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java index 50ee5bb..719c393 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java @@ -10,10 +10,11 @@ import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.actions.ChangeActivityRouteActionListener; import fr.ird.observe.ui.tree.actions.NodeChangeActionListener; +import fr.ird.observe.ui.util.DecoratedNodeEntity; import org.nuiton.decorator.Decorator; -import java.util.LinkedHashMap; -import java.util.Map; +import java.util.ArrayList; +import java.util.List; /** * @author Kevin Morin (Code Lutin) @@ -30,13 +31,13 @@ public class MoveActivitySeineNodeMenuPopulator extends MoveNodeMenuPopulator { } @Override - public Map<String, String> getPossibleParentNodes(ObserveNode activitySeineNode, ObserveTreeHelper treeHelper) { + public List<DecoratedNodeEntity> getPossibleParentNodes(ObserveNode activitySeineNode, ObserveTreeHelper treeHelper) { // noeud de route parent ObserveNode parentNode = activitySeineNode.getParent().getParent(); // noeud de route de la marée sans le parent actuel - Map<String, String> possibleParents = new LinkedHashMap<>(); + List<DecoratedNodeEntity> possibleParents = new ArrayList<>(); // noeud des routes de la marée ObserveNode routesNode = parentNode.getParent(); @@ -56,7 +57,7 @@ public class MoveActivitySeineNodeMenuPopulator extends MoveNodeMenuPopulator { && IdDtos.isRouteId(routeId)) { String decoratedRoute = routeDecorator.toString(((DtoNodeSupport) routeNode).getEntity()); - possibleParents.put(routeId, decoratedRoute); + possibleParents.add(new DecoratedNodeEntity(routeId, decoratedRoute)); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveNodeMenuPopulator.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveNodeMenuPopulator.java index 0a751da..9dcb0a0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveNodeMenuPopulator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveNodeMenuPopulator.java @@ -4,8 +4,9 @@ import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.actions.NodeChangeActionListener; +import fr.ird.observe.ui.util.DecoratedNodeEntity; -import java.util.Map; +import java.util.List; /** * Objets pour créer les items du menu déplacer dans le menu contextuel de l'arbre @@ -32,8 +33,8 @@ public abstract class MoveNodeMenuPopulator { * Récupère les parents dans lesquels on peut déplacer le noeud sélectionné * @param node le noeud sélectionné * @param treeHelper le treehelper - * @return une map contenant les libellés des noeuds par id + * @return une liste contenant les ids et les libellés des noeuds */ - public abstract Map<String, String> getPossibleParentNodes(ObserveNode node, ObserveTreeHelper treeHelper); + public abstract List<DecoratedNodeEntity> getPossibleParentNodes(ObserveNode node, ObserveTreeHelper treeHelper); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeMenuPopulator.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeMenuPopulator.java index bddac46..b9ea140 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeMenuPopulator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeMenuPopulator.java @@ -10,10 +10,11 @@ import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.actions.ChangeRouteTripActionListener; import fr.ird.observe.ui.tree.actions.NodeChangeActionListener; +import fr.ird.observe.ui.util.DecoratedNodeEntity; import org.nuiton.decorator.Decorator; -import java.util.LinkedHashMap; -import java.util.Map; +import java.util.ArrayList; +import java.util.List; /** * @author Kevin Morin (Code Lutin) @@ -30,13 +31,13 @@ public class MoveRouteNodeMenuPopulator extends MoveNodeMenuPopulator { } @Override - public Map<String,String> getPossibleParentNodes(ObserveNode routeNode, ObserveTreeHelper treeHelper) { + public List<DecoratedNodeEntity> getPossibleParentNodes(ObserveNode routeNode, ObserveTreeHelper treeHelper) { // noeud de marée parent ObserveNode parentNode = routeNode.getParent().getParent(); // noeud de marée du programme sans le parent actuel - Map<String, String> possibleParents = new LinkedHashMap<>(); + List<DecoratedNodeEntity> possibleParents = new ArrayList<>(); // noeud du programme ObserveNode programNode = parentNode.getParent(); @@ -56,7 +57,7 @@ public class MoveRouteNodeMenuPopulator extends MoveNodeMenuPopulator { && IdDtos.isTripSeineId(tripId)) { String decoratedTrip = tripDecorator.toString(((DtoNodeSupport) tripNode).getEntity()); - possibleParents.put(tripId, decoratedTrip); + possibleParents.add(new DecoratedNodeEntity(tripId, decoratedTrip)); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeMenuPopulator.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeMenuPopulator.java index ce0aacc..be084c7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeMenuPopulator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeMenuPopulator.java @@ -11,10 +11,11 @@ import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.actions.ChangeTripProgramActionListener; import fr.ird.observe.ui.tree.actions.NodeChangeActionListener; +import fr.ird.observe.ui.util.DecoratedNodeEntity; import org.nuiton.decorator.Decorator; -import java.util.LinkedHashMap; -import java.util.Map; +import java.util.ArrayList; +import java.util.List; /** * @author Kevin Morin (Code Lutin) @@ -31,13 +32,13 @@ public class MoveTripNodeMenuPopulator extends MoveNodeMenuPopulator { } @Override - public Map<String, String> getPossibleParentNodes(ObserveNode tripNode, ObserveTreeHelper treeHelper) { + public List<DecoratedNodeEntity> getPossibleParentNodes(ObserveNode tripNode, ObserveTreeHelper treeHelper) { // noeud du programme parent ObserveNode parentNode = tripNode.getParent(); // programmes du même type que le noeud de marée, sans le parent actuel - Map<String, String> possibleParents = new LinkedHashMap<>(); + List<DecoratedNodeEntity> possibleParents = new ArrayList<>(); // noeud longline ? GearType geartype = IdDtos.isLonglineId(tripNode.getId()) ? GearType.longline : GearType.seine; @@ -65,7 +66,7 @@ public class MoveTripNodeMenuPopulator extends MoveNodeMenuPopulator { if (geartype.equals(program.getPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE))) { String decoratedProgram = programDecorator.toString(program); - possibleParents.put(programId, decoratedProgram); + possibleParents.add(new DecoratedNodeEntity(programId, decoratedProgram)); } } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/DecoratedNodeEntity.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/DecoratedNodeEntity.java new file mode 100644 index 0000000..6006192 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/DecoratedNodeEntity.java @@ -0,0 +1,26 @@ +package fr.ird.observe.ui.util; + +/** + * @author Kevin Morin (Code Lutin) + * @since 5.0 + */ +public class DecoratedNodeEntity { + + private final String id; + private final String label; + + public DecoratedNodeEntity(String id, String label) { + this.id = id; + this.label = label; + } + + public String getId() { + return id; + } + + @Override + public String toString() { + return label; + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.