Author: fdesbois Date: 2012-09-07 16:19:49 +0200 (Fri, 07 Sep 2012) New Revision: 558 Url: http://forge.codelutin.com/repositories/revision/sammoa/558 Log: fixes #1484 : disable transect validation on TRANSIT route Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java 2012-09-07 14:10:02 UTC (rev 557) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidAction.java 2012-09-07 14:19:49 UTC (rev 558) @@ -123,48 +123,4 @@ _("sammoa.confirmDialog.validation.deleteByCascade.message", label, cascadeLabel) ); } - -// protected <E extends TopiaEntity & Validable> void bindValidableEntity(String propertyName, -// Class<E> propertyClass) { -// -// getModel().addPropertyChangeListener(propertyName, new PropertyChangeListener() { -// -// @Override -// public void propertyChange(PropertyChangeEvent evt) { -// TopiaEntity oldValue = (TopiaEntity) evt.getOldValue(); -// if (oldValue != null) { -// oldValue.removePropertyChangeListener( -// "deleted", enabledListener); -// } -// TopiaEntity newValue = (TopiaEntity) evt.getNewValue(); -// if (newValue != null) { -// newValue.addPropertyChangeListener( -// "deleted", enabledListener); -// } -// enabledListener.propertyChange(evt); -// } -// }); -// } -// -// protected <E extends AbstractBean & Validable> void bindValidableModel(String propertyName, -// Class<E> propertyClass) { -// -// getModel().addPropertyChangeListener(propertyName, new PropertyChangeListener() { -// -// @Override -// public void propertyChange(PropertyChangeEvent evt) { -// AbstractBean oldValue = (AbstractBean) evt.getOldValue(); -// if (oldValue != null) { -// oldValue.removePropertyChangeListener( -// "deleted", enabledListener); -// } -// AbstractBean newValue = (AbstractBean) evt.getNewValue(); -// if (newValue != null) { -// newValue.addPropertyChangeListener( -// "deleted", enabledListener); -// } -// enabledListener.propertyChange(evt); -// } -// }); -// } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2012-09-07 14:10:02 UTC (rev 557) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ValidTransectAction.java 2012-09-07 14:19:49 UTC (rev 558) @@ -152,13 +152,10 @@ boolean result = isEnabled(); if (!validatorIsAdjusting) { TransectFlightModel bean = getModel().getTransectFlightEditBean(); - if (bean != null) { - TransectFlight transectflight = bean.getSource(); - result = transectflight != null - && TransectFlights.isValid(transectflight, - getRouteValidator(), - getObservationValidator()); - } + result = bean != null && + TransectFlights.isValid(bean.getSource(), + getRouteValidator(), + getObservationValidator()); } return result; }