Removed some unneeded code in MotorListFragment. Use startActivityForResult when...

[debian/openrocket] / android / src / net / sf / openrocket / android / motor / MotorBrowserActivity.java

diff --git a/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java b/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
index e059da133834a939388131a44ba3e495f12c7bce..282baec288e81230b8510433465635d231a10fd9 100644 (file)
--- a/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
+++ b/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
@@ -3,12 +3,7 @@ package net.sf.openrocket.android.motor;
 import net.sf.openrocket.R;\r
 import net.sf.openrocket.android.ActivityHelpers;\r
 import net.sf.openrocket.android.PreferencesActivity;\r
-import net.sf.openrocket.android.simulation.SimulationChart;\r
-import net.sf.openrocket.android.simulation.SimulationFragment;\r
-import net.sf.openrocket.android.simulation.SimulationViewActivity;\r
-import net.sf.openrocket.android.thrustcurve.TCQueryActivity;\r
 import net.sf.openrocket.android.util.AndroidLogWrapper;\r
-import net.sf.openrocket.document.Simulation;\r
 import android.content.Intent;\r
 import android.os.Bundle;\r
 import android.support.v4.app.Fragment;\r
@@ -24,18 +19,15 @@ implements MotorListFragment.OnMotorSelectedListener
 {\r
 \r
        MotorListFragment motorList;\r
+       \r
+       private final static int DOWNLOAD_REQUEST_CODE = 1;\r
 \r
        /** Called when the activity is first created. */\r
        @Override\r
        public void onCreate(Bundle savedInstanceState) {\r
                super.onCreate(savedInstanceState);\r
-\r
-        if (getSupportFragmentManager().findFragmentById(android.R.id.content) == null) {\r
-               motorList = MotorListFragment.newInstance();\r
-               FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
-               ft.add(android.R.id.content, motorList);\r
-               ft.commit();\r
-        }\r
+               setContentView(R.layout.motorbrowser);\r
+               getSupportFragmentManager().beginTransaction().add( R.id.motorBrowserList, new MotorListFragment()).commit();\r
        }\r
 \r
        @Override\r
@@ -50,7 +42,7 @@ implements MotorListFragment.OnMotorSelectedListener
                AndroidLogWrapper.d(MotorBrowserActivity.class,"onMenuItemSelected" + item.getItemId());\r
                switch(item.getItemId()) {\r
                case R.id.download_from_thrustcurve_menu_option:\r
-                       ActivityHelpers.downloadFromThrustcurve(this);\r
+                       ActivityHelpers.downloadFromThrustcurve(this,DOWNLOAD_REQUEST_CODE);\r
                        return true;\r
                case R.id.preference_menu_option:\r
                        Intent intent = new Intent().setClass(this, PreferencesActivity.class);\r
@@ -60,28 +52,32 @@ implements MotorListFragment.OnMotorSelectedListener
                return super.onMenuItemSelected(featureId, item);\r
        }\r
 \r
+       @Override\r
+       protected void onActivityResult(int requestCode, int responseCode, Intent intent) {\r
+               if ( requestCode == DOWNLOAD_REQUEST_CODE ) {\r
+                       MotorListFragment frag = (MotorListFragment) getSupportFragmentManager().findFragmentById(R.id.motorBrowserList);\r
+                       frag.refreshData();\r
+               }\r
+       }\r
+\r
        @Override\r
        public void onMotorSelected(long motorId) {\r
                \r
                View sidepane = findViewById(R.id.sidepane);\r
                if ( /* if multi pane */ sidepane != null ) {\r
-                       /*\r
-                       Simulation sim = app.getRocketDocument().getSimulation(simulationId);\r
-                       SimulationChart chart = new SimulationChart(simulationId);\r
-\r
-                       Fragment graph = SimulationFragment.newInstance(chart);\r
+                       \r
+                       Fragment graph = BurnPlotFragment.newInstance(motorId);\r
 \r
                        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
                        ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);\r
                        // probably only want to update back stack for first time.\r
-                       ft.addToBackStack("simulationplot");\r
+                       ft.addToBackStack("burnplot");\r
                        ft.replace(R.id.sidepane, graph);\r
                        ft.show(graph);\r
                        ft.commit();\r
-*/\r
 \r
                } else {\r
-                       Intent i = new Intent(this,MotorDetailsActivity.class);\r
+                       Intent i = new Intent(this,BurnPlotActivity.class);\r
                        i.putExtra("Motor", motorId);\r
                        startActivity(i);\r
                }\r