Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / src / net / sf / openrocket / android / motor / ExtendedThrustCurveMotor.java

diff --git a/android/src/net/sf/openrocket/android/motor/ExtendedThrustCurveMotor.java b/android/src/net/sf/openrocket/android/motor/ExtendedThrustCurveMotor.java
index 41e4c4fda73e157ff9873349144ee6222308d035..cd72be489738a77a14c4617a39a45d68ba9440f7 100644 (file)
--- a/android/src/net/sf/openrocket/android/motor/ExtendedThrustCurveMotor.java
+++ b/android/src/net/sf/openrocket/android/motor/ExtendedThrustCurveMotor.java
@@ -2,12 +2,16 @@ package net.sf.openrocket.android.motor;
 \r
 import net.sf.openrocket.motor.ThrustCurveMotor;\r
 \r
-public class ExtendedThrustCurveMotor {\r
+public class ExtendedThrustCurveMotor extends ThrustCurveMotor {\r
 \r
        private Long id;\r
        private String caseInfo;\r
        private String impulseClass;\r
-       private ThrustCurveMotor thrustCurveMotor;\r
+       \r
+       public ExtendedThrustCurveMotor( ThrustCurveMotor tcm ) {\r
+               super(tcm);\r
+       }\r
+       \r
        /**\r
         * @return the id\r
         */\r
@@ -44,19 +48,6 @@ public class ExtendedThrustCurveMotor {
        public void setImpulseClass(String impulseClass) {\r
                this.impulseClass = impulseClass;\r
        }\r
-       /**\r
-        * @return the thrustCurveMotor\r
-        */\r
-       public ThrustCurveMotor getThrustCurveMotor() {\r
-               return thrustCurveMotor;\r
-       }\r
-       /**\r
-        * @param thrustCurveMotor the thrustCurveMotor to set\r
-        */\r
-       public void setThrustCurveMotor(ThrustCurveMotor thrustCurveMotor) {\r
-               this.thrustCurveMotor = thrustCurveMotor;\r
-       }\r
-       \r
-       \r
+\r
        \r
 }\r