Change to inherit from Sherlock classes.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@753 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java
index 1c17c6a0d599dbac11decbd28fa4230437ab45d8..cdfcf65da82298245c06a7d4d2520e63fd9981d7 100644 (file)
--- a/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java
+++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java
@@ -7,15 +7,16 @@ import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.document.Simulation;\r
 import android.os.Bundle;\r
 import android.support.v4.app.Fragment;\r
-import android.support.v4.app.FragmentActivity;\r
 import android.support.v4.app.FragmentTransaction;\r
-import android.view.Menu;\r
-import android.view.MenuItem;\r
+\r
+import com.actionbarsherlock.app.SherlockFragmentActivity;\r
+import com.actionbarsherlock.view.Menu;\r
+import com.actionbarsherlock.view.MenuItem;\r
 \r
 /**\r
  * An activity that encapsulates a graphical view of the chart.\r
  */\r
-public class SimulationViewActivity extends FragmentActivity {\r
+public class SimulationViewActivity extends SherlockFragmentActivity {\r
 \r
        @Override\r
        protected void onCreate(Bundle savedInstanceState) {\r

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
index 655b154efcffaaaf2fa5fd70830cc2319ee4d096..72f7b0d1dfddd8e445e669265c64d8987c6fd81e 100644 (file)
--- a/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
+++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
@@ -2,7 +2,6 @@
 package net.sf.openrocket.android.simulation;\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.document.OpenRocketDocument;\r
 \r
@@ -10,18 +9,19 @@ import org.achartengine.GraphicalView;
 import org.achartengine.chart.XYChart;\r
 \r
 import android.os.Bundle;\r
-import android.support.v4.app.Fragment;\r
 import android.view.LayoutInflater;\r
-import android.view.Menu;\r
-import android.view.MenuInflater;\r
-import android.view.MenuItem;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
 \r
+import com.actionbarsherlock.app.SherlockFragment;\r
+import com.actionbarsherlock.view.Menu;\r
+import com.actionbarsherlock.view.MenuInflater;\r
+import com.actionbarsherlock.view.MenuItem;\r
+\r
 /**\r
  * An activity that encapsulates a graphical view of the chart.\r
  */\r
-public class SimulationViewFragment extends Fragment implements SimulationSeriesDialog.OnConfirmListener {\r
+public class SimulationViewFragment extends SherlockFragment implements SimulationSeriesDialog.OnConfirmListener {\r
        \r
        SimulationChart chart;\r
 \r