This is an automated email from the git hooks/post-receive script. New commit to branch feature/7622 in repository observe. See http://git.codelutin.com/observe.git commit 49905802674d40c2170ba05c1ef874e3ccda434e Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 17 12:27:19 2015 +0100 correction de l'action de déplacement des routes depuis la liste (refs #7622) --- .../main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 2 ++ .../java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java | 6 +++--- .../java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.css | 3 +-- .../main/resources/i18n/observe-application-swing_fr_FR.properties | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 5efda8f..422b4c7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -25,6 +25,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import fr.ird.observe.db.DataContext; +import fr.ird.observe.ui.actions.shared.MoveRoutesUIAction; import fr.ird.observe.util.gps.GPSService; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; @@ -911,6 +912,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im registerMainAction(actionMap, new DeleteReferenceUIAction(ui)); registerMainAction(actionMap, new MoveTripLonglinesUIAction(ui)); registerMainAction(actionMap, new MoveTripSeinesUIAction(ui)); + registerMainAction(actionMap, new MoveRoutesUIAction(ui)); } public void registerMainAction(ActionMap actionMap, AbstractUIAction action) { 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 d19c293..8bbc322 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 @@ -69,12 +69,12 @@ public class MoveRoutesUIAction extends AbstractUIAction { public static final String ACTION_NAME = "moveRoutes"; - public MoveRoutesUIAction(ObserveMainUI mainUI, String actionName) { + public MoveRoutesUIAction(ObserveMainUI mainUI) { super(mainUI, - actionName, + ACTION_NAME, n("observe.action.move.routes"), n("observe.action.move.routes.tip"), - "move-trips" + "move-routes" ); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.css index a545bd0..0de1951 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.css @@ -34,10 +34,9 @@ toolTipText:"observe.action.create.route.tip"; } -#moveSelectedTrips { +#moveSelectedChildren { text:"observe.action.move.routes"; toolTipText:"observe.action.move.routes.tip"; - enabled:{model.getSelectedDatas() != null}; _observeAction:{MoveRoutesUIAction.ACTION_NAME}; } diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 82cbf09..b1bbaaa 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -282,8 +282,8 @@ observe.action.mitigationType.detail.tip=Voir les détails du type de mesure d'a observe.action.mitigationType.modify.tip=Modifier le type de mesure d'atténuation sélectionné observe.action.mitigationType.save.tip=Sauver les modifications du type de mesure d'atténuation observe.action.modify=Modifier -observe.action.move.routes= -observe.action.move.routes.tip= +observe.action.move.routes=Changer de marée +observe.action.move.routes.tip=Changer la marée des routes sélectionnées observe.action.move.trips=Changer de programme observe.action.move.trips.tip=Changer le programme des marées sélectionnées observe.action.new.entry=Nouveau -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.