hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

motor loading refactoring

Browse Source
This commit is contained in:
Sampo Niskanen 2012-01-29 18:15:33 +00:00
parent 7401254c4b
commit 510adee8c7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java
View File

@ -3,6 +3,7 @@ package net.sf.openrocket.android.rocket;
import java.io.File; import java.io.File;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.file.DatabaseMotorFinder;
import net.sf.openrocket.file.RocketLoadException; import net.sf.openrocket.file.RocketLoadException;
import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader; import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader;
import android.os.AsyncTask; import android.os.AsyncTask;
@ -17,17 +18,16 @@ public class OpenRocketLoaderTask extends AsyncTask<File, Void, OpenRocketLoader
*/ */
@Override @Override
protected OpenRocketLoaderResult doInBackground(File... arg0) { protected OpenRocketLoaderResult doInBackground(File... arg0) {
Log.d(TAG,"doInBackgroud"); Log.d(TAG, "doInBackgroud");
OpenRocketLoader rocketLoader = new OpenRocketLoader(); OpenRocketLoader rocketLoader = new OpenRocketLoader();
try { try {
OpenRocketLoaderResult result = new OpenRocketLoaderResult(); OpenRocketLoaderResult result = new OpenRocketLoaderResult();
OpenRocketDocument rocket = rocketLoader.load(arg0[0]); OpenRocketDocument rocket = rocketLoader.load(arg0[0], new DatabaseMotorFinder());
result.rocket = rocket; result.rocket = rocket;
result.warnings = result.warnings; result.warnings = result.warnings;
return result; return result;
} } catch (RocketLoadException ex) {
catch( RocketLoadException ex ) {
Log.e(TAG, "doInBackground rocketLaoder.load threw", ex); Log.e(TAG, "doInBackground rocketLaoder.load threw", ex);
} }
return null; return null;