Author: fdesbois Date: 2012-09-10 12:03:43 +0200 (Mon, 10 Sep 2012) New Revision: 561 Url: http://forge.codelutin.com/repositories/revision/sammoa/561 Log: little improvement Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/AddAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BaseFlightAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CircleBackAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/EndAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/AddAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/AddAction.java 2012-09-07 17:51:00 UTC (rev 560) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/AddAction.java 2012-09-10 10:03:43 UTC (rev 561) @@ -45,7 +45,7 @@ public AddAction(JAXXContext context) { super(Resource.getIcon("/icons/action-add.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.add.tip")); - bindModelProperties(FlightUIModel.PROPERTY_FLIGHT_STATE); + bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BaseFlightAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BaseFlightAction.java 2012-09-07 17:51:00 UTC (rev 560) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BaseFlightAction.java 2012-09-10 10:03:43 UTC (rev 561) @@ -80,12 +80,6 @@ return context.getContextValue(SammoaUIContext.class); } - protected void bindModelProperties(String... properties) { - for (String property : properties) { - bindModelProperty(property, false); - } - } - protected void bindModelProperty(String property, boolean all) { NestedPropertyChangeListener listener = new NestedPropertyChangeListener(enabledListener, property, all); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java 2012-09-07 17:51:00 UTC (rev 560) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/BeginAction.java 2012-09-10 10:03:43 UTC (rev 561) @@ -47,11 +47,9 @@ public BeginAction(JAXXContext context) { super(_("sammoa.action.begin"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.begin.tip")); - bindModelProperties( - FlightUIModel.PROPERTY_FLIGHT_STATE, - FlightUIModel.PROPERTY_CURRENT_ROUTE, - FlightUIModel.PROPERTY_NEXT_TRANSECT + ".deleted" - ); + bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); + bindModelProperty(FlightUIModel.PROPERTY_CURRENT_ROUTE, false); + bindModelProperty(FlightUIModel.PROPERTY_NEXT_TRANSECT + ".deleted", false); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CircleBackAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CircleBackAction.java 2012-09-07 17:51:00 UTC (rev 560) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/CircleBackAction.java 2012-09-10 10:03:43 UTC (rev 561) @@ -55,7 +55,7 @@ public CircleBackAction(JAXXContext context) { super(CIRCLE_BACK_ICON, context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.circleBack.tip")); - bindModelProperties(FlightUIModel.PROPERTY_CURRENT_ROUTE); + bindModelProperty(FlightUIModel.PROPERTY_CURRENT_ROUTE, false); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/EndAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/EndAction.java 2012-09-07 17:51:00 UTC (rev 560) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/EndAction.java 2012-09-10 10:03:43 UTC (rev 561) @@ -44,7 +44,7 @@ public EndAction(JAXXContext context) { super(_("sammoa.action.end"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.end.tip")); - bindModelProperties(FlightUIModel.PROPERTY_FLIGHT_STATE); + bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java 2012-09-07 17:51:00 UTC (rev 560) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/NextAction.java 2012-09-10 10:03:43 UTC (rev 561) @@ -44,8 +44,8 @@ public NextAction(JAXXContext context) { super(_("sammoa.action.next"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.next.tip")); - bindModelProperties(FlightUIModel.PROPERTY_FLIGHT_STATE, - FlightUIModel.PROPERTY_NEXT_TRANSECT + ".deleted"); + bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); + bindModelProperty(FlightUIModel.PROPERTY_NEXT_TRANSECT + ".deleted", false); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ObservationAction.java 2012-09-07 17:51:00 UTC (rev 560) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/ObservationAction.java 2012-09-10 10:03:43 UTC (rev 561) @@ -44,7 +44,7 @@ public ObservationAction(String name, JAXXContext context, Position position) { super(name, context); this.position = position; - bindModelProperties(FlightUIModel.PROPERTY_FLIGHT_STATE); + bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAction.java 2012-09-07 17:51:00 UTC (rev 560) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StartAction.java 2012-09-10 10:03:43 UTC (rev 561) @@ -45,7 +45,7 @@ public StartAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_play.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.start.tip")); - bindModelProperties(FlightUIModel.PROPERTY_FLIGHT_STATE); + bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java 2012-09-07 17:51:00 UTC (rev 560) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java 2012-09-10 10:03:43 UTC (rev 561) @@ -45,7 +45,7 @@ public StopAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_stop.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.stop.tip")); - bindModelProperties(FlightUIModel.PROPERTY_FLIGHT_STATE); + bindModelProperty(FlightUIModel.PROPERTY_FLIGHT_STATE, false); } @Override