Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / simulation / listeners / AbstractSimulationListener.java

diff --git a/core/src/net/sf/openrocket/simulation/listeners/AbstractSimulationListener.java b/core/src/net/sf/openrocket/simulation/listeners/AbstractSimulationListener.java
index ebb2ad94c3ec8cedab38e43596e955da5afce56c..3f156f38ee392c9e9dcf793ed624fc517affa4a3 100644 (file)
--- a/core/src/net/sf/openrocket/simulation/listeners/AbstractSimulationListener.java
+++ b/core/src/net/sf/openrocket/simulation/listeners/AbstractSimulationListener.java
@@ -1,5 +1,7 @@
 package net.sf.openrocket.simulation.listeners;
 
+import java.util.List;
+
 import net.sf.openrocket.aerodynamics.AerodynamicForces;
 import net.sf.openrocket.aerodynamics.FlightConditions;
 import net.sf.openrocket.models.atmosphere.AtmosphericConditions;
@@ -8,6 +10,7 @@ import net.sf.openrocket.motor.MotorInstance;
 import net.sf.openrocket.rocketcomponent.MotorMount;
 import net.sf.openrocket.rocketcomponent.RecoveryDevice;
 import net.sf.openrocket.simulation.AccelerationData;
+import net.sf.openrocket.simulation.FlightDataType;
 import net.sf.openrocket.simulation.FlightEvent;
 import net.sf.openrocket.simulation.MassData;
 import net.sf.openrocket.simulation.SimulationStatus;
@@ -27,6 +30,16 @@ public class AbstractSimulationListener implements SimulationListener, Simulatio
        
        ////  SimulationListener  ////
        
+       @Override
+       public String getName() {
+               return this.getClass().getSimpleName();
+       }
+       
+       @Override
+       public String[] getMenuPosition() {
+               return new String[0];
+       }
+       
        @Override
        public void startSimulation(SimulationStatus status) throws SimulationException {
                // No-op
@@ -57,9 +70,15 @@ public class AbstractSimulationListener implements SimulationListener, Simulatio
                return false;
        }
        
+       /**
+        * Return an array of any flight data types this listener creates.
+        */
+       @Override
+       public FlightDataType[] getFlightDataTypes(){
+               return new FlightDataType[] {};
+       }
+       
        
-
-
        ////  SimulationEventListener  ////
        
        @Override
@@ -83,7 +102,7 @@ public class AbstractSimulationListener implements SimulationListener, Simulatio
        }
        
        
-
+       
        ////  SimulationComputationListener  ////
        
        @Override