motor loading refactoring

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@379 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java
index 01ecaede3da87880700c176b1a408b2850b60ff7..eaca7362877866b6b122b25d298ea286a8076826 100644 (file)
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java
@@ -3,13 +3,14 @@ package net.sf.openrocket.android.rocket;
 import java.io.File;\r
 \r
 import net.sf.openrocket.document.OpenRocketDocument;\r
+import net.sf.openrocket.file.DatabaseMotorFinder;\r
 import net.sf.openrocket.file.RocketLoadException;\r
 import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader;\r
 import android.os.AsyncTask;\r
 import android.util.Log;\r
 \r
 public class OpenRocketLoaderTask extends AsyncTask<File, Void, OpenRocketLoaderResult> {\r
-\r
+       \r
        private final static String TAG = "OpenRocketLoaderTask";\r
        \r
        /* (non-Javadoc)\r
@@ -17,21 +18,20 @@ public class OpenRocketLoaderTask extends AsyncTask<File, Void, OpenRocketLoader
         */\r
        @Override\r
        protected OpenRocketLoaderResult doInBackground(File... arg0) {\r
-               Log.d(TAG,"doInBackgroud");\r
+               Log.d(TAG, "doInBackgroud");\r
                \r
                OpenRocketLoader rocketLoader = new OpenRocketLoader();\r
                try {\r
                        OpenRocketLoaderResult result = new OpenRocketLoaderResult();\r
-                       OpenRocketDocument rocket = rocketLoader.load(arg0[0]);\r
+                       OpenRocketDocument rocket = rocketLoader.load(arg0[0], new DatabaseMotorFinder());\r
                        result.rocket = rocket;\r
                        result.warnings = result.warnings;\r
                        return result;\r
-               }\r
-               catch( RocketLoadException ex ) {\r
+               } catch (RocketLoadException ex) {\r
                        Log.e(TAG, "doInBackground rocketLaoder.load threw", ex);\r
                }\r
                return null;\r
                \r
        }\r
-\r
+       \r
 }\r