From: plaa <plaa@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Sun, 29 Jan 2012 18:15:33 +0000 (+0000)
Subject: motor loading refactoring
X-Git-Tag: upstream/12.03~1^2~92
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=fd59705bc3771bb64e7d7955a84ee543a42e7d0d;p=debian%2Fopenrocket

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 01ecaede..eaca7362 100644
--- 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;
 
 import net.sf.openrocket.document.OpenRocketDocument;
+import net.sf.openrocket.file.DatabaseMotorFinder;
 import net.sf.openrocket.file.RocketLoadException;
 import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader;
 import android.os.AsyncTask;
 import android.util.Log;
 
 public class OpenRocketLoaderTask extends AsyncTask<File, Void, OpenRocketLoaderResult> {
-
+	
 	private final static String TAG = "OpenRocketLoaderTask";
 	
 	/* (non-Javadoc)
@@ -17,21 +18,20 @@ public class OpenRocketLoaderTask extends AsyncTask<File, Void, OpenRocketLoader
 	 */
 	@Override
 	protected OpenRocketLoaderResult doInBackground(File... arg0) {
-		Log.d(TAG,"doInBackgroud");
+		Log.d(TAG, "doInBackgroud");
 		
 		OpenRocketLoader rocketLoader = new OpenRocketLoader();
 		try {
 			OpenRocketLoaderResult result = new OpenRocketLoaderResult();
-			OpenRocketDocument rocket = rocketLoader.load(arg0[0]);
+			OpenRocketDocument rocket = rocketLoader.load(arg0[0], new DatabaseMotorFinder());
 			result.rocket = rocket;
 			result.warnings = result.warnings;
 			return result;
-		}
-		catch( RocketLoadException ex ) {
+		} catch (RocketLoadException ex) {
 			Log.e(TAG, "doInBackground rocketLaoder.load threw", ex);
 		}
 		return null;
 		
 	}
-
+	
 }