Author: tchemit Date: 2012-08-20 16:10:36 +0200 (Mon, 20 Aug 2012) New Revision: 445 Url: http://forge.codelutin.com/repositories/revision/sammoa/445 Log: - rename flight controller add-remove listener methods - use now JaxxContext in SammoaAction instead of SammoUIContext - fix validation i18n key Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightController.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/AddAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/BeginAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CenterObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CircleBackAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/EndAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/LeftObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextTransectAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/RightObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/SammoaAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StartAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StopAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/ui/swing/transect/TransectUIModel-error-validation.xml Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightController.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightController.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightController.java 2012-08-20 14:10:36 UTC (rev 445) @@ -258,8 +258,8 @@ boolean isRunning(); /** @param listener FlightControllerListener to add */ - void addListener(FlightControllerListener listener); + void addFlightControllerListener(FlightControllerListener listener); /** @param listener FlightControllerListener to remove */ - void removeListener(FlightControllerListener listener); + void removeFlightControllerListener(FlightControllerListener listener); } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java 2012-08-20 14:10:36 UTC (rev 445) @@ -98,19 +98,23 @@ protected TransectFlight lastTransect; - protected Set<FlightControllerListener> listeners = Sets.newHashSet(); + protected final Set<FlightControllerListener> listeners; protected FlightStorage flightStorage; + public FlightControllerDefault() { + listeners = Sets.newHashSet(); + } + // protected GeoPoint lastLocation; @Override - public void addListener(FlightControllerListener listener) { + public void addFlightControllerListener(FlightControllerListener listener) { listeners.add(listener); } @Override - public void removeListener(FlightControllerListener listener) { + public void removeFlightControllerListener(FlightControllerListener listener) { listeners.remove(listener); } @@ -254,7 +258,6 @@ this.currentRoute = service.getLastRoute(flight); this.lastTransect = service.getLastTransectDone(flight); - this.listeners = Sets.newHashSet(); Campaign campaign = flight.getCampaign(); CampaignStorage campaignStorage = Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/AddAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/AddAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/AddAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -24,7 +24,7 @@ package fr.ulr.sammoa.ui.swing.action; import fr.ulr.sammoa.application.flightController.FlightState; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import jaxx.runtime.JAXXContext; import org.nuiton.util.Resource; import javax.swing.Action; @@ -41,7 +41,7 @@ private static final long serialVersionUID = 1L; - public AddAction(SammoaUIContext context) { + public AddAction(JAXXContext context) { super(Resource.getIcon("/icons/action-add.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.add.tip")); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/BeginAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/BeginAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/BeginAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -25,7 +25,7 @@ import fr.ulr.sammoa.application.flightController.FlightState; import fr.ulr.sammoa.persistence.RouteType; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import jaxx.runtime.JAXXContext; import org.nuiton.util.Resource; import javax.swing.Action; @@ -42,7 +42,7 @@ private static final long serialVersionUID = 1L; - public BeginAction(SammoaUIContext context) { + public BeginAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_play.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.begin.tip")); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CenterObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CenterObservationAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CenterObservationAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -24,7 +24,7 @@ package fr.ulr.sammoa.ui.swing.action; import fr.ulr.sammoa.persistence.Position; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import jaxx.runtime.JAXXContext; import javax.swing.Action; @@ -39,7 +39,7 @@ private static final long serialVersionUID = 1L; - public CenterObservationAction(SammoaUIContext context) { + public CenterObservationAction(JAXXContext context) { super(_("sammoa.observation.observations.center"), context, Position.NAVIGATOR); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.center.tip")); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CircleBackAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CircleBackAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CircleBackAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -27,7 +27,7 @@ import fr.ulr.sammoa.persistence.Observation; import fr.ulr.sammoa.persistence.Route; import fr.ulr.sammoa.persistence.RouteType; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import jaxx.runtime.JAXXContext; import org.nuiton.util.Resource; import javax.swing.Action; @@ -51,7 +51,7 @@ protected static final ImageIcon CIRCLE_BACK_ICON = Resource.getIcon("/icons/undo.png"); - public CircleBackAction(SammoaUIContext context) { + public CircleBackAction(JAXXContext context) { super(CIRCLE_BACK_ICON, context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.circleBack.tip")); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/EndAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/EndAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/EndAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -24,7 +24,7 @@ package fr.ulr.sammoa.ui.swing.action; import fr.ulr.sammoa.application.flightController.FlightState; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import jaxx.runtime.JAXXContext; import org.nuiton.util.Resource; import javax.swing.Action; @@ -41,7 +41,7 @@ private static final long serialVersionUID = 1L; - public EndAction(SammoaUIContext context) { + public EndAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_stop.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.end.tip")); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/LeftObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/LeftObservationAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/LeftObservationAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -24,7 +24,7 @@ package fr.ulr.sammoa.ui.swing.action; import fr.ulr.sammoa.persistence.Position; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import jaxx.runtime.JAXXContext; import javax.swing.Action; @@ -39,7 +39,7 @@ private static final long serialVersionUID = 1L; - public LeftObservationAction(SammoaUIContext context) { + public LeftObservationAction(JAXXContext context) { super(_("sammoa.observation.observations.left"), context, Position.FRONT_LEFT); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.left.tip")); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -24,7 +24,7 @@ package fr.ulr.sammoa.ui.swing.action; import fr.ulr.sammoa.application.flightController.FlightState; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import jaxx.runtime.JAXXContext; import org.nuiton.util.Resource; import javax.swing.Action; @@ -41,7 +41,7 @@ private static final long serialVersionUID = 1L; - public NextAction(SammoaUIContext context) { + public NextAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_next.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.next.tip")); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextTransectAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextTransectAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -24,7 +24,7 @@ package fr.ulr.sammoa.ui.swing.action; import fr.ulr.sammoa.persistence.TransectFlight; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import jaxx.runtime.JAXXContext; import org.nuiton.util.Resource; import javax.swing.Action; @@ -44,7 +44,7 @@ public static final String CLIENT_PROPERTY_INDEX = "index"; - public NextTransectAction(SammoaUIContext context) { + public NextTransectAction(JAXXContext context) { super(Resource.getIcon("/icons/action-next-transect.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.nextTransect.tip")); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ObservationAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ObservationAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -25,7 +25,7 @@ import fr.ulr.sammoa.application.flightController.FlightState; import fr.ulr.sammoa.persistence.Position; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import jaxx.runtime.JAXXContext; import java.awt.event.ActionEvent; @@ -40,7 +40,7 @@ protected Position position; - public ObservationAction(String name, SammoaUIContext context, Position position) { + public ObservationAction(String name, JAXXContext context, Position position) { super(name, context); this.position = position; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/RightObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/RightObservationAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/RightObservationAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -24,7 +24,7 @@ package fr.ulr.sammoa.ui.swing.action; import fr.ulr.sammoa.persistence.Position; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import jaxx.runtime.JAXXContext; import javax.swing.Action; @@ -39,7 +39,7 @@ private static final long serialVersionUID = 1L; - public RightObservationAction(SammoaUIContext context) { + public RightObservationAction(JAXXContext context) { super(_("sammoa.observation.observations.right"), context, Position.FRONT_RIGHT); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.right.tip")); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/SammoaAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/SammoaAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/SammoaAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -28,8 +28,9 @@ import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.Route; import fr.ulr.sammoa.persistence.TransectFlight; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import fr.ulr.sammoa.ui.swing.flight.FlightUIHandler; import fr.ulr.sammoa.ui.swing.flight.FlightUIModel; +import jaxx.runtime.JAXXContext; import javax.swing.AbstractAction; import javax.swing.Icon; @@ -45,19 +46,19 @@ private static final long serialVersionUID = 1L; - protected SammoaUIContext context; + protected JAXXContext context; - public SammoaAction(Icon icon, SammoaUIContext context) { + public SammoaAction(Icon icon, JAXXContext context) { super("", icon); init(context); } - public SammoaAction(String name, SammoaUIContext context) { + public SammoaAction(String name, JAXXContext context) { super(name); init(context); } - protected void init(SammoaUIContext context) { + protected void init(JAXXContext context) { this.context = context; getModel().addPropertyChangeListener(this); setEnabled(checkEnabled()); @@ -69,11 +70,11 @@ } protected FlightController getFlightController() { - return context.getFlightUIHandler().getFlightController(); + return context.getContextValue(FlightUIHandler.class).getFlightController(); } protected FlightUIModel getModel() { - return context.getFlightUIHandler().getModel(); + return context.getContextValue(FlightUIHandler.class).getModel(); } protected FlightState getFlightState() { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StartAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StartAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StartAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -24,7 +24,7 @@ package fr.ulr.sammoa.ui.swing.action; import fr.ulr.sammoa.application.flightController.FlightState; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import jaxx.runtime.JAXXContext; import org.nuiton.util.Resource; import javax.swing.Action; @@ -41,7 +41,7 @@ private static final long serialVersionUID = 1L; - public StartAction(SammoaUIContext context) { + public StartAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_play.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.start.tip")); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StopAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StopAction.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StopAction.java 2012-08-20 14:10:36 UTC (rev 445) @@ -24,7 +24,7 @@ package fr.ulr.sammoa.ui.swing.action; import fr.ulr.sammoa.application.flightController.FlightState; -import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import jaxx.runtime.JAXXContext; import org.nuiton.util.Resource; import javax.swing.Action; @@ -41,7 +41,7 @@ private static final long serialVersionUID = 1L; - public StopAction(SammoaUIContext context) { + public StopAction(JAXXContext context) { super(Resource.getIcon("/icons/playback_stop.png"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.stop.tip")); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-08-20 14:10:36 UTC (rev 445) @@ -245,7 +245,7 @@ SammoaUtil.updateBusyState(context.getMainUIHandler().getUI(), true); } - flightController.addListener(this); + flightController.addFlightControllerListener(this); flightController.getGpsHandler().addGpsLocationListener(gpsLocationListener); flightController.getGpsHandler().addDeviceStateListener(deviceStateListener); flightController.getAudioRecorder().addDeviceStateListener(deviceStateListener); @@ -701,17 +701,17 @@ public void initActions() { - putAction("start", new StartAction(context)); - putAction("stop", new StopAction(context)); - putAction("begin", new BeginAction(context)); - putAction("end", new EndAction(context)); - putAction("next", new NextAction(context)); - putAction("nextTransect", new NextTransectAction(context)); - putAction("add", new AddAction(context)); - putAction("leftObservation", new LeftObservationAction(context)); - putAction("centerObservation", new CenterObservationAction(context)); - putAction("rightObservation", new RightObservationAction(context)); - putAction("circleBack", new CircleBackAction(context)); + putAction("start", new StartAction(ui)); + putAction("stop", new StopAction(ui)); + putAction("begin", new BeginAction(ui)); + putAction("end", new EndAction(ui)); + putAction("next", new NextAction(ui)); + putAction("nextTransect", new NextTransectAction(ui)); + putAction("add", new AddAction(ui)); + putAction("leftObservation", new LeftObservationAction(ui)); + putAction("centerObservation", new CenterObservationAction(ui)); + putAction("rightObservation", new RightObservationAction(ui)); + putAction("circleBack", new CircleBackAction(ui)); getModel().setActionMap(getActionMap()); Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/ui/swing/transect/TransectUIModel-error-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/ui/swing/transect/TransectUIModel-error-validation.xml 2012-08-20 14:10:34 UTC (rev 444) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/ui/swing/transect/TransectUIModel-error-validation.xml 2012-08-20 14:10:36 UTC (rev 445) @@ -49,7 +49,7 @@ <param name="keys">name</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> - <message>sammoa.validator.transect.uniqueKey##${name}</message> + <message>sammoa.validator.transect.uniqueKey##name</message> </field-validator> </field>