Author: fdesbois Date: 2012-08-29 10:56:54 +0200 (Wed, 29 Aug 2012) New Revision: 481 Url: http://forge.codelutin.com/repositories/revision/sammoa/481 Log: fixes #1424 : resolve issue with route dooblon delete and validation button activation Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ValidRouteAction.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ValidRouteAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ValidRouteAction.java 2012-08-28 20:43:32 UTC (rev 480) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ValidRouteAction.java 2012-08-29 08:56:54 UTC (rev 481) @@ -38,6 +38,8 @@ import javax.swing.Action; import java.awt.event.ActionEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import static org.nuiton.i18n.I18n._; @@ -58,7 +60,24 @@ public ValidRouteAction(JAXXContext context) { super(_("sammoa.action.validRoute"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validRoute.tip")); - bindModelProperties(FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN); + getModel().addPropertyChangeListener( + FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + Route oldValue = (Route) evt.getOldValue(); + if (oldValue != null) { + oldValue.removePropertyChangeListener( + Route.PROPERTY_DELETED, enabledListener); + } + Route newValue = (Route) evt.getNewValue(); + if (newValue != null) { + newValue.addPropertyChangeListener( + Route.PROPERTY_DELETED, enabledListener); + } + enabledListener.propertyChange(evt); + } + }); } @Override