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 6470e06c41bcdcc918e9ebb464546115f62de534..cb027d2b8a1a77e242d8be57435000ee1071a19c 100644 (file)
--- a/android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java
+++ b/android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java
@@ -5,15 +5,14 @@ import java.util.List;
 \r
 import net.sf.openrocket.android.db.DbAdapter;\r
 import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor;\r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import net.sf.openrocket.database.MotorDatabase;\r
 import net.sf.openrocket.motor.Motor;\r
 import net.sf.openrocket.motor.Motor.Type;\r
 import android.content.Context;\r
-import android.util.Log;\r
 \r
 public class MotorDatabaseAdapter implements MotorDatabase {\r
 \r
-       private final static String TAG = "MotorDatabaseAdapter";\r
        private DbAdapter mDbHelper;\r
 \r
        public MotorDatabaseAdapter( Context ctx ) {\r
@@ -25,16 +24,16 @@ public class MotorDatabaseAdapter implements MotorDatabase {
        public List<? extends Motor> findMotors(Type type, String manufacturer,\r
                        String designation, double diameter, double length) {\r
 \r
-               Log.d(TAG,"find motor: type="+ type.toString());\r
-               Log.d(TAG,"find motor: manu="+ manufacturer);\r
-               Log.d(TAG,"find motor: designation="+ designation);\r
-               Log.d(TAG,"find motor: diameter=" +diameter);\r
-               Log.d(TAG,"find motor: length="+ length);\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
+               AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: length="+ length);\r
 \r
                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