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 28de073a02a3e2c8d710447d31af84e6a5a3eaf1 Author: Kevin Morin <morin@codelutin.com> Date: Wed Nov 18 14:54:47 2015 +0100 renommage --- .../tree/ObserveNavigationTreeShowPopupAction.java | 22 +++++++++++----------- ... => MoveActivityLonglineNodeMenuPopulator.java} | 2 +- ...ava => MoveActivitySeineNodeMenuPopulator.java} | 6 +++--- ...oveNodeData.java => MoveNodeMenuPopulator.java} | 12 +++++++----- ...deData.java => MoveRouteNodeMenuPopulator.java} | 5 ++--- ...odeData.java => MoveTripNodeMenuPopulator.java} | 2 +- 6 files changed, 25 insertions(+), 24 deletions(-) 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 5578d04..6eb9877 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 @@ -29,11 +29,11 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.content.open.ContentOpenableUI; -import fr.ird.observe.ui.tree.menu.MoveActivityLonglineNodeData; -import fr.ird.observe.ui.tree.menu.MoveActivitySeineNodeData; -import fr.ird.observe.ui.tree.menu.MoveNodeData; -import fr.ird.observe.ui.tree.menu.MoveRouteNodeData; -import fr.ird.observe.ui.tree.menu.MoveTripNodeData; +import fr.ird.observe.ui.tree.menu.MoveActivityLonglineNodeMenuPopulator; +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 jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,7 +94,7 @@ public class ObserveNavigationTreeShowPopupAction { private final JMenuItem moveAction; private final JMenuItem deleteAction; - private final ImmutableMap<String, MoveNodeData> moveNodeDataByNodeType; + private final ImmutableMap<String, MoveNodeMenuPopulator> moveNodeDataByNodeType; public ObserveNavigationTreeShowPopupAction(final ObserveTreeHelper treeHelper, JScrollPane pane, JPopupMenu popup) { @@ -135,10 +135,10 @@ public class ObserveNavigationTreeShowPopupAction { this.moveAction = moveComponent; this.deleteAction = deleteActionComponent; - moveNodeDataByNodeType = ImmutableMap.of(TRIP_MENU_ITEMS, new MoveTripNodeData(), - ROUTE_MENU_ITEMS, new MoveRouteNodeData(), - ACTIVITY_SEINE_MENU_ITEMS, new MoveActivitySeineNodeData(), - ACTIVITY_LONGLINE_MENU_ITEMS, new MoveActivityLonglineNodeData()); + moveNodeDataByNodeType = ImmutableMap.of(TRIP_MENU_ITEMS, new MoveTripNodeMenuPopulator(), + ROUTE_MENU_ITEMS, new MoveRouteNodeMenuPopulator(), + ACTIVITY_SEINE_MENU_ITEMS, new MoveActivitySeineNodeMenuPopulator(), + ACTIVITY_LONGLINE_MENU_ITEMS, new MoveActivityLonglineNodeMenuPopulator()); KeyAdapter keyAdapter = new KeyAdapter() { @Override @@ -299,7 +299,7 @@ public class ObserveNavigationTreeShowPopupAction { log.info("Will load popup for " + nodeType + " node."); } - MoveNodeData moveNodeData = moveNodeDataByNodeType.get(nodeType); + MoveNodeMenuPopulator moveNodeData = moveNodeDataByNodeType.get(nodeType); ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeData.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java similarity index 96% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeData.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java index ddf373a..8fb9f6d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeData.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java @@ -19,7 +19,7 @@ import java.util.Map; * @author Kevin Morin (Code Lutin) * @since 5.0 */ -public class MoveActivityLonglineNodeData extends MoveNodeData { +public class MoveActivityLonglineNodeMenuPopulator extends MoveNodeMenuPopulator { @Override public NodeChangeActionListener createChangeActionListener(ObserveTreeHelper treeHelper, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeData.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java similarity index 94% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeData.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java index bfc508b..50ee5bb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeData.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java @@ -17,9 +17,9 @@ import java.util.Map; /** * @author Kevin Morin (Code Lutin) - * @since x.x + * @since 5.0 */ -public class MoveActivitySeineNodeData extends MoveNodeData { +public class MoveActivitySeineNodeMenuPopulator extends MoveNodeMenuPopulator { @Override public NodeChangeActionListener createChangeActionListener(ObserveTreeHelper treeHelper, @@ -38,7 +38,7 @@ public class MoveActivitySeineNodeData extends MoveNodeData { // noeud de route de la marée sans le parent actuel Map<String, String> possibleParents = new LinkedHashMap<>(); - // noeud de la marée + // noeud des routes de la marée ObserveNode routesNode = parentNode.getParent(); DecoratorService decoratorService = treeHelper.getTreeCellRenderer().getDecoratorService(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveNodeData.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveNodeMenuPopulator.java similarity index 74% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveNodeData.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveNodeMenuPopulator.java index 5211e1a..0a751da 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveNodeData.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveNodeMenuPopulator.java @@ -8,10 +8,12 @@ import fr.ird.observe.ui.tree.actions.NodeChangeActionListener; import java.util.Map; /** + * Objets pour créer les items du menu déplacer dans le menu contextuel de l'arbre + * * @author Kevin Morin (Code Lutin) * @since 5.0 */ -public abstract class MoveNodeData { +public abstract class MoveNodeMenuPopulator { /** * Crée une action pour déplacer le noeud quand on sélectionne le menu du nouveau parent @@ -27,10 +29,10 @@ public abstract class MoveNodeData { String parentId); /** - * - * @param node - * @param treeHelper - * @return + * 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 */ public abstract Map<String, String> getPossibleParentNodes(ObserveNode node, ObserveTreeHelper treeHelper); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeData.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeMenuPopulator.java similarity index 96% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeData.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeMenuPopulator.java index 6ca89b6..bddac46 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeData.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveRouteNodeMenuPopulator.java @@ -17,9 +17,9 @@ import java.util.Map; /** * @author Kevin Morin (Code Lutin) - * @since x.x + * @since 5.0 */ -public class MoveRouteNodeData extends MoveNodeData { +public class MoveRouteNodeMenuPopulator extends MoveNodeMenuPopulator { @Override public NodeChangeActionListener createChangeActionListener(ObserveTreeHelper treeHelper, @@ -41,7 +41,6 @@ public class MoveRouteNodeData extends MoveNodeData { // noeud du programme ObserveNode programNode = parentNode.getParent(); - DecoratorService decoratorService = treeHelper.getTreeCellRenderer().getDecoratorService(); Decorator<ReferenceDto> tripDecorator = decoratorService.getDecoratorByType(ReferenceDto.class, TripSeineDto.class.getSimpleName()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeData.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeMenuPopulator.java similarity index 97% rename from observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeData.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeMenuPopulator.java index 6169037..ce0aacc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeData.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/menu/MoveTripNodeMenuPopulator.java @@ -20,7 +20,7 @@ import java.util.Map; * @author Kevin Morin (Code Lutin) * @since x.x */ -public class MoveTripNodeData extends MoveNodeData { +public class MoveTripNodeMenuPopulator extends MoveNodeMenuPopulator { @Override public NodeChangeActionListener createChangeActionListener(ObserveTreeHelper treeHelper, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.