This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 187d3364795bd02aca2ab73393e5d6ad895c54f0 Author: Kevin Morin <morin@codelutin.com> Date: Wed Nov 18 16:13:08 2015 +0100 refactor --- .../ui/actions/shared/MoveActivitySeinesUIAction.java | 9 ++++----- .../ird/observe/ui/actions/shared/MoveRoutesUIAction.java | 5 ++--- .../java/fr/ird/observe/ui/util/DecoratedNodeEntity.java | 13 +++++++++++++ 3 files changed, 19 insertions(+), 8 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 a211045..6ea1874 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 @@ -65,13 +65,13 @@ public class MoveActivitySeinesUIAction extends AbstractUIAction { */ private static final Log log = LogFactory.getLog(MoveActivitySeinesUIAction.class); - public static final String ACTION_NAME = "moveActivities"; + public static final String ACTION_NAME = "moveActivitySeines"; public MoveActivitySeinesUIAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, - n("observe.action.move.activities"), - n("observe.action.move.activities.tip"), + n("observe.action.move.activities.seine"), + n("observe.action.move.activities.seine.tip"), "move-activities" ); } @@ -141,8 +141,7 @@ public class MoveActivitySeinesUIAction extends AbstractUIAction { String routeId = routeNode.getId(); if (!oldRouteId.equals(routeId)) { - decoratedRoutes[j++] = new DecoratedNodeEntity(routeId, - decorator.toString(((DtoNodeSupport) routeNode).getEntity())); + decoratedRoutes[j++] = new DecoratedNodeEntity((DtoNodeSupport) routeNode, decorator); } } 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 3330dff..408b194 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 @@ -130,7 +130,7 @@ public class MoveRoutesUIAction extends AbstractUIAction { Decorator<ReferenceDto> decorator = applicationContext.getDecorator(ReferenceDto.class, TripSeineDto.class.getSimpleName()); - //on crée un tableau avec une route en moins car on ne propose pas la route actuel + //on crée un tableau avec une marée en moins car on ne propose pas la marée actuel DecoratedNodeEntity[] decoratedTripSeines = new DecoratedNodeEntity[tripSeineNb - 1]; int j = 0; @@ -141,8 +141,7 @@ public class MoveRoutesUIAction extends AbstractUIAction { String tripSeineId = tripSeineNode.getId(); if (!oldTripSeineId.equals(tripSeineId)) { - decoratedTripSeines[j++] = new DecoratedNodeEntity(tripSeineId, - decorator.toString(((DtoNodeSupport) tripSeineNode).getEntity())); + decoratedTripSeines[j++] = new DecoratedNodeEntity((DtoNodeSupport) tripSeineNode, decorator); } } 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 index 6006192..0b61312 100644 --- 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 @@ -1,5 +1,10 @@ package fr.ird.observe.ui.util; +import com.google.common.base.Preconditions; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.ui.tree.DtoNodeSupport; +import org.nuiton.decorator.Decorator; + /** * @author Kevin Morin (Code Lutin) * @since 5.0 @@ -14,6 +19,14 @@ public class DecoratedNodeEntity { this.label = label; } + public DecoratedNodeEntity(DtoNodeSupport node, Decorator<ReferenceDto> decorator) { + Preconditions.checkNotNull(node); + Preconditions.checkNotNull(decorator); + + this.id = node.getId(); + this.label = decorator.toString(node.getEntity()); + } + public String getId() { return id; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.