Froyo had troubles with the old table layout. Changed instead to the same layout...

[debian/openrocket] / android / src / net / sf / openrocket / android / thrustcurve / TCQueryActivity.java

diff --git a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
index df45897f29129aab105655aa050a96b53db1b4f9..9bb4e2dcc70df7a7e511c5384d68c2a9f38cef46 100644 (file)
--- a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
+++ b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
@@ -1,35 +1,26 @@
 package net.sf.openrocket.android.thrustcurve;\r
 \r
 import net.sf.openrocket.R;\r
-import net.sf.openrocket.android.db.DbAdapter;\r
-import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor;\r
-import android.app.Activity;\r
-import android.app.AlertDialog;\r
-import android.app.ProgressDialog;\r
-import android.content.DialogInterface;\r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
+import net.sf.openrocket.android.util.ErrorDialogFragment;\r
 import android.os.Bundle;\r
-import android.os.Handler;\r
-import android.util.Log;\r
 import android.view.View;\r
 import android.widget.Button;\r
 import android.widget.EditText;\r
 import android.widget.Spinner;\r
 \r
-public class TCQueryActivity extends Activity\r
-implements TCQueryAction.OnComplete\r
-{\r
-\r
-       private static final String TAG = "ThrustCurveQueryActivity";\r
+import com.actionbarsherlock.app.SherlockFragmentActivity;\r
 \r
-       private TCQueryAction queryAction;\r
+public class TCQueryActivity extends SherlockFragmentActivity\r
+implements TCQueryAction.OnTCQueryCompleteListener\r
+{\r
 \r
        @Override\r
        protected void onCreate(Bundle savedInstanceState) {\r
                super.onCreate(savedInstanceState);\r
+               setTitle(R.string.TCMotorSearchFormTitle);\r
                setContentView(R.layout.tcqueryform);\r
 \r
-               queryAction = new TCQueryAction(this);\r
-\r
                final Spinner manufacturerField = (Spinner) findViewById(R.id.TCMotorSearchFormManufacturerField);\r
                final Spinner impulseField = (Spinner) findViewById(R.id.TCMotorSearchFormImpulseField);\r
                final Spinner diameterField = (Spinner) findViewById(R.id.TCMotorSearchFormDiameterField);\r
@@ -40,50 +31,42 @@ implements TCQueryAction.OnComplete
                                new View.OnClickListener() {\r
                                        @Override\r
                                        public void onClick( View v ) {\r
-                                               Log.d(TAG,"submit button clicked");\r
+                                               AndroidLogWrapper.d(TCQueryActivity.class,"submit button clicked");\r
 \r
                                                String commonName = commonNameField.getText().toString();\r
 \r
                                                SearchRequest r = new SearchRequest();\r
                                                if ( manufacturerField.getSelectedItemPosition() != 0) {\r
                                                        String m = (String) manufacturerField.getSelectedItem();\r
-                                                       Log.d(TAG,"manufacturer = " + m);\r
+                                                       AndroidLogWrapper.d(TCQueryActivity.class,"manufacturer = " + m);\r
                                                        r.setManufacturer(m);\r
                                                }\r
                                                if ( impulseField.getSelectedItemPosition() != 0  ) {\r
                                                        String impulse = (String) impulseField.getSelectedItem();\r
-                                                       Log.d(TAG,"impulse = " + impulse);\r
+                                                       AndroidLogWrapper.d(TCQueryActivity.class,"impulse = " + impulse);\r
                                                        r.setImpulse_class(impulse);\r
                                                }\r
                                                if ( diameterField.getSelectedItemPosition() != 0 ) {\r
                                                        String diameter = (String)diameterField.getSelectedItem();\r
-                                                       Log.d(TAG,"diameter = " + diameter);\r
+                                                       AndroidLogWrapper.d(TCQueryActivity.class,"diameter = " + diameter);\r
                                                        r.setDiameter(diameter);\r
                                                }\r
                                                r.setCommon_name(commonName);\r
 \r
-                                               queryAction.start(r);\r
+                                               TCSearchAction motorfrag = TCSearchAction.newInstance( r );\r
+                                               getSupportFragmentManager().beginTransaction().add( motorfrag, "dloader").commit();\r
                                        }\r
-                               }\r
-                               );\r
+                               });\r
        }\r
 \r
        @Override\r
-       public void onComplete() {\r
-               finish();\r
-       }\r
-\r
-       /*\r
-        * TODO - ??\r
-       @Override\r
-       public Object onRetainNonConfigurationInstance() {\r
-               return downloadThread;\r
-       }\r
-        */\r
-       @Override\r
-       protected void onDestroy() {\r
-               queryAction.dismiss();\r
-               super.onDestroy();\r
+       public void onTCQueryComplete(String message) {\r
+               if ( message != null) {\r
+                       ErrorDialogFragment error = ErrorDialogFragment.newInstance(message);\r
+                       error.show(getSupportFragmentManager(), "ErrorDialog");\r
+               } else {\r
+                       finish();\r
+               }\r
        }\r
 \r
 }\r