Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / src / net / sf / openrocket / android / MotorDatabaseAdapter.java

diff --git a/android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java b/android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java
index 0d64ca605d88da11221c967b9374f10bcc14e2cf..cb027d2b8a1a77e242d8be57435000ee1071a19c 100644 (file)
--- a/android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java
+++ b/android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java
@@ -24,7 +24,7 @@ public class MotorDatabaseAdapter implements MotorDatabase {
        public List<? extends Motor> findMotors(Type type, String manufacturer,\r
                        String designation, double diameter, double length) {\r
 \r
-               AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: type="+ type.toString());\r
+               AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: type="+ String.valueOf(type));\r
                AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: manu="+ manufacturer);\r
                AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: designation="+ designation);\r
                AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: diameter=" +diameter);\r
@@ -33,7 +33,7 @@ public class MotorDatabaseAdapter implements MotorDatabase {
                try {\r
                        ExtendedThrustCurveMotor m = mDbHelper.getMotorDao().fetchMotor(manufacturer, designation);\r
                        if ( m != null ) {\r
-                               return Collections.singletonList(m.getThrustCurveMotor());\r
+                               return Collections.singletonList(m);\r
                        }\r
                } catch ( Exception ex ) {\r
 \r