Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

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

diff --git a/android/src/net/sf/openrocket/android/motor/MotorDetailsFragment.java b/android/src/net/sf/openrocket/android/motor/MotorDetailsFragment.java
index b1fac2cb5e5a1eb2651ef8f80ff858d6ceb59494..5bd42b9af43dca571fc32aa8de6f82539e13679a 100644 (file)
--- a/android/src/net/sf/openrocket/android/motor/MotorDetailsFragment.java
+++ b/android/src/net/sf/openrocket/android/motor/MotorDetailsFragment.java
@@ -3,13 +3,12 @@ package net.sf.openrocket.android.motor;
 import net.sf.openrocket.R;\r
 import net.sf.openrocket.android.db.ConversionUtils;\r
 import net.sf.openrocket.android.db.DbAdapter;\r
-import net.sf.openrocket.motor.ThrustCurveMotor;\r
+import net.sf.openrocket.unit.UnitGroup;\r
 import android.os.Bundle;\r
 import android.support.v4.app.DialogFragment;\r
 import android.view.LayoutInflater;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
-import android.widget.Button;\r
 import android.widget.EditText;\r
 \r
 public class MotorDetailsFragment extends DialogFragment {\r
@@ -84,14 +83,13 @@ public class MotorDetailsFragment extends DialogFragment {
        }\r
 \r
        private void init( ) {\r
-               ThrustCurveMotor tcm = motor.getThrustCurveMotor();\r
-               manuField.setText( tcm.getManufacturer().getDisplayName());\r
-               nameField.setText( tcm.getDesignation() );\r
-               delaysField.setText( ConversionUtils.delaysToString(tcm.getStandardDelays()) );\r
+               manuField.setText( motor.getManufacturer().getDisplayName());\r
+               nameField.setText( motor.getDesignation() );\r
+               delaysField.setText( ConversionUtils.delaysToString(motor.getStandardDelays()) );\r
                caseField.setText( motor.getCaseInfo());\r
                impulseClassField.setText( motor.getImpulseClass());\r
-               diameterField.setText( String.valueOf(tcm.getDiameter()*1000.0) );\r
-               lengthField.setText( String.valueOf(tcm.getLength()*1000.0) );\r
+               diameterField.setText( UnitGroup.UNITS_MOTOR_DIMENSIONS.toString(motor.getDiameter()) );\r
+               lengthField.setText( UnitGroup.UNITS_LENGTH.getUnit("mm").toString(motor.getLength()) );\r
        }\r
 \r
        private void saveChanges() {\r