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 c89def933f9e6312437f8d4168cf5d73aac853c2 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Sep 6 18:53:59 2016 +0200 Corrige la récupération des noeuds routes et activités suite au refactoring des chaines i18n fixes #8525 --- .../swing/ui/actions/shared/MoveActivityLonglinesUIAction.java | 2 +- .../observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java | 2 +- .../swing/ui/tree/actions/ChangeActivityTripActionListener.java | 2 +- .../swing/ui/tree/actions/ChangeRouteTripActionListener.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 a108d15..2f6e480 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 @@ -169,7 +169,7 @@ public class MoveActivityLonglinesUIAction extends AbstractUIAction { ObserveNode oldTripLonglineNode = oldActivitiesNode.getParent(); ObserveNode programNode = oldTripLonglineNode.getParent(); ObserveNode newTripLonglineNode = treeHelper.getChild(programNode, tripLonglineId); - String activitiesNodeId = ObserveI18nDecoratorHelper.getTypeI18nKey(ActivityLonglineDto.class); + String activitiesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(ActivityLonglineDto.class); ObserveNode newActivitiesNode = treeHelper.getChild(newTripLonglineNode, activitiesNodeId); // Let's check if we're moving an open activity 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 e371f39..23e0556 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 @@ -162,7 +162,7 @@ public class MoveRoutesUIAction extends AbstractUIAction { ObserveNode oldTripSeineNode = oldRoutesNode.getParent(); ObserveNode programNode = oldTripSeineNode.getParent(); ObserveNode newTripSeineNode = treeHelper.getChild(programNode, tripSeineId); - String routesNodeId = ObserveI18nDecoratorHelper.getTypeI18nKey(RouteDto.class); + String routesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(RouteDto.class); ObserveNode newRoutesNode = treeHelper.getChild(newTripSeineNode, routesNodeId); // Let's check if we're moving an open route 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 bc18a0d..9b9c6c6 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 @@ -70,7 +70,7 @@ public class ChangeActivityTripActionListener extends NodeChangeActionListener { @Override protected ObserveNode getNewParentNode(ObserveNode grandParentNode, String parentNodeId) { ObserveNode tripLonglineNode = getTreeHelper().getChild(grandParentNode, parentNodeId); - String activitiesNodeId = ObserveI18nDecoratorHelper.getTypeI18nKey(ActivityLonglineDto.class); + String activitiesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(ActivityLonglineDto.class); return getTreeHelper().getChild(tripLonglineNode, activitiesNodeId); } 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 144f417..70f390d 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 @@ -70,7 +70,7 @@ public class ChangeRouteTripActionListener extends NodeChangeActionListener { @Override protected ObserveNode getNewParentNode(ObserveNode grandParentNode, String parentNodeId) { ObserveNode tripNode = getTreeHelper().getChild(grandParentNode, parentNodeId); - String routesNodeId = ObserveI18nDecoratorHelper.getTypeI18nKey(RouteDto.class); + String routesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(RouteDto.class); return getTreeHelper().getChild(tripNode, routesNodeId); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.