[Sammoa-commits] r529 - in trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application: device device/audio device/gps flightController

5 Sep 2012

Author: fdesbois
Date: 2012-09-05 17:07:06 +0200 (Wed, 05 Sep 2012)
New Revision: 529

Url: http://forge.codelutin.com/repositories/revision/sammoa/529

Log:
refs #1197 : add getter for recordingDate + improve events by extends EventObject

Modified:
   trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceStateEvent.java
   trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java
   trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java
   trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java
   trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java
   trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsLocationEvent.java
   trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/ObservationEvent.java
   trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/RouteEvent.java

Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceStateEvent.java
===================================================================

--- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceStateEvent.java	2012-09-05 14:57:12 UTC (rev 528)
+++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/DeviceStateEvent.java	2012-09-05 15:07:06 UTC (rev 529)
@@ -23,14 +23,16 @@
  * #L%
  */
 
+import java.util.EventObject;
+
 /**
  * Created: 06/08/12
  *
  * @author fdesbois <florian.desbois@codelutin.com>
  */
-public class DeviceStateEvent {
+public class DeviceStateEvent extends EventObject {
 
-    protected DeviceManager source;
+    private static final long serialVersionUID = 1L;
 
     protected DeviceState oldValue;
 
@@ -39,13 +41,14 @@
     protected DeviceTechnicalException error;
 
     public DeviceStateEvent(DeviceManager source, DeviceState oldValue, DeviceState newValue) {
-        this.source = source;
+        super(source);
         this.oldValue = oldValue;
         this.newValue = newValue;
     }
 
+    @Override
     public DeviceManager getSource() {
-        return source;
+        return (DeviceManager) source;
     }
 
     public DeviceState getOldValue() {

Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java
===================================================================
--- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java	2012-09-05 14:57:12 UTC (rev 528)
+++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java	2012-09-05 15:07:06 UTC (rev 529)
@@ -18,6 +18,8 @@
     /**
      * @param source La source de l'evenement
      * @param audioLength la nouvelle taille en milliseconds
+     * @deprecated no longer used
      */
+    @Deprecated
     public void audioChanged(AudioReader source, long audioLength);
 }

Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java
===================================================================
--- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java	2012-09-05 14:57:12 UTC (rev 528)
+++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java	2012-09-05 15:07:06 UTC (rev 529)
@@ -52,6 +52,12 @@
     /** @return loaded audio in milliseconds or 0 if no audio is loaded */
     long getLength();
 
+    /**
+     * @return the recording date of the loaded file or null if not provided or
+     *         no file is loaded
+     */
+    Date getRecordingDate();
+
     /** @param position current audio position in milliseconds to set */
     void setPosition(long position);
 

Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java
===================================================================
--- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java	2012-09-05 14:57:12 UTC (rev 528)
+++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java	2012-09-05 15:07:06 UTC (rev 529)
@@ -81,6 +81,11 @@
     }
 
     @Override
+    public Date getRecordingDate() {
+        return null;
+    }
+
+    @Override
     public void setPosition(long position) {
         this.position = position;
     }

Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java
===================================================================
--- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java	2012-09-05 14:57:12 UTC (rev 528)
+++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java	2012-09-05 15:07:06 UTC (rev 529)
@@ -68,6 +68,8 @@
     protected long audioLength;         // Length of the sound.
     protected long audioPosition = 0;   // Current position within the sound
 
+    protected Date recordingDate;
+
     protected DeviceState state = DeviceState.UNAVAILABLE;
 
     protected Set<DeviceStateListener> listeners = new HashSet<DeviceStateListener>();
@@ -179,7 +181,7 @@
             }
             // Get the clip length in microseconds and convert to milliseconds
             audioLength = (int)(clip.getMicrosecondLength( )/1000);
-            fireAudioChanged(audioLength);
+            this.recordingDate = recordingDate;
 
             setState(DeviceState.READY);
             logger.debug(String.format("Sound file '%s' loaded", file));
@@ -197,6 +199,7 @@
             clip.close();
             clip = null;
         }
+        recordingDate = null;
         setState(DeviceState.UNAVAILABLE);
     }
 
@@ -206,6 +209,11 @@
     }
 
     @Override
+    public Date getRecordingDate() {
+        return recordingDate;
+    }
+
+    @Override
     public void setPosition(long position) {
         if (clip != null) {
             long old = audioPosition;
@@ -223,12 +231,6 @@
         }
     }
 
-    protected void fireAudioChanged(long length) {
-        for (AudioPositionListener l : audioPositionListener) {
-            l.audioChanged(this, length);
-        }
-    }
-
     @Override
     public long getPosition() {
         return audioPosition;

Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsLocationEvent.java
===================================================================
--- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsLocationEvent.java	2012-09-05 14:57:12 UTC (rev 528)
+++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsLocationEvent.java	2012-09-05 15:07:06 UTC (rev 529)
@@ -25,14 +25,16 @@
 
 import fr.ulr.sammoa.persistence.GeoPoint;
 
+import java.util.EventObject;
+
 /**
  * Created: 06/08/12
  *
  * @author fdesbois <florian.desbois@codelutin.com>
  */
-public class GpsLocationEvent {
+public class GpsLocationEvent extends EventObject {
 
-    protected GpsHandler source;
+    private static final long serialVersionUID = 1L;
 
     protected GeoPoint oldValue;
 
@@ -41,13 +43,14 @@
     public GpsLocationEvent(GpsHandler source,
                             GeoPoint oldValue,
                             GeoPoint newValue) {
-        this.source = source;
+        super(source);
         this.oldValue = oldValue;
         this.newValue = newValue;
     }
 
+    @Override
     public GpsHandler getSource() {
-        return source;
+        return (GpsHandler) source;
     }
 
     public GeoPoint getOldValue() {

Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/ObservationEvent.java
===================================================================
--- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/ObservationEvent.java	2012-09-05 14:57:12 UTC (rev 528)
+++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/ObservationEvent.java	2012-09-05 15:07:06 UTC (rev 529)
@@ -26,14 +26,16 @@
 import fr.ulr.sammoa.persistence.GeoPoint;
 import fr.ulr.sammoa.persistence.Observation;
 
+import java.util.EventObject;
+
 /**
  * Created: 06/08/12
  *
  * @author fdesbois <florian.desbois@codelutin.com>
  */
-public class ObservationEvent {
+public class ObservationEvent extends EventObject {
 
-    protected FlightController source;
+    private static final long serialVersionUID = 1L;
 
     protected Observation observation;
 
@@ -42,13 +44,14 @@
     public ObservationEvent(FlightController source,
                             Observation observation,
                             GeoPoint geoPoint) {
-        this.source = source;
+        super(source);
         this.observation = observation;
         this.geoPoint = geoPoint;
     }
 
+    @Override
     public FlightController getSource() {
-        return source;
+        return (FlightController) source;
     }
 
     public Observation getObservation() {

Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/RouteEvent.java
===================================================================
--- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/RouteEvent.java	2012-09-05 14:57:12 UTC (rev 528)
+++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/RouteEvent.java	2012-09-05 15:07:06 UTC (rev 529)
@@ -25,14 +25,16 @@
 
 import fr.ulr.sammoa.persistence.Route;
 
+import java.util.EventObject;
+
 /**
  * Created: 06/08/12
  *
  * @author fdesbois <florian.desbois@codelutin.com>
  */
-public class RouteEvent {
+public class RouteEvent extends EventObject {
 
-    protected FlightController source;
+    private static final long serialVersionUID = 1L;
 
     protected Route route;
 
@@ -44,14 +46,15 @@
                       Route route,
                       boolean isNew,
                       Route previousRoute) {
-        this.source = source;
+        super(source);
         this.route = route;
         this.isNew = isNew;
         this.previousRoute = previousRoute;
     }
 
+    @Override
     public FlightController getSource() {
-        return source;
+        return (FlightController) source;
     }
 
     public Route getRoute() {

    

[Sammoa-commits] r529 - in trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application: device device/audio device/gps flightController

fdesbois＠users.forge.codelutin.com