Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / src / net / sf / openrocket / android / rocket / Component.java

diff --git a/android/src/net/sf/openrocket/android/rocket/Component.java b/android/src/net/sf/openrocket/android/rocket/Component.java
index a19f2e7c66130cf850e74726f4e6d2e93899c909..ac8f1f993ec6115318971e7d94b10a5900110722 100644 (file)
--- a/android/src/net/sf/openrocket/android/rocket/Component.java
+++ b/android/src/net/sf/openrocket/android/rocket/Component.java
@@ -1,7 +1,7 @@
 package net.sf.openrocket.android.rocket;\r
 \r
 import net.sf.openrocket.R;\r
-import net.sf.openrocket.android.Application;\r
+import net.sf.openrocket.android.CurrentRocketHolder;\r
 import net.sf.openrocket.android.rocket.RocketComponentTreeAdapter.RocketComponentWithId;\r
 import net.sf.openrocket.document.OpenRocketDocument;\r
 import net.sf.openrocket.rocketcomponent.Rocket;\r
@@ -31,13 +31,12 @@ public class Component extends Fragment {
        }\r
 \r
        @Override\r
-       public void onActivityCreated(Bundle savedInstanceState) {\r
-               super.onActivityCreated(savedInstanceState);\r
-\r
-               final OpenRocketDocument rocketDocument = ((Application)getActivity().getApplication()).getRocketDocument();\r
+       public void onResume() {\r
+               super.onResume();\r
+               final OpenRocketDocument rocketDocument = CurrentRocketHolder.getCurrentRocket().getRocketDocument();\r
                componentTree.setAdapter( buildAdapter( rocketDocument.getRocket() ) );\r
        }\r
-       \r
+\r
        private ListAdapter buildAdapter( Rocket rocket ) {\r
 \r
                TreeStateManager<RocketComponentWithId> manager = new InMemoryTreeStateManager<RocketComponentWithId>();\r