From ad265733bd247d632a293a807e5426a333a20cbb Mon Sep 17 00:00:00 2001
From: Kevin Ruland <kruland@sunflower.com>
Date: Tue, 5 Jun 2012 13:47:15 +0000
Subject: [PATCH] Change to inherit from Sherlock classes.

---
 .../android/simulation/SimulationViewActivity.java   |  9 +++++----
 .../android/simulation/SimulationViewFragment.java   | 12 ++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java
index 1c17c6a0d..cdfcf65da 100644
--- 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;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTransaction;
-import android.view.Menu;
-import android.view.MenuItem;
+
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
 
 /**
  * An activity that encapsulates a graphical view of the chart.
  */
-public class SimulationViewActivity extends FragmentActivity {
+public class SimulationViewActivity extends SherlockFragmentActivity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
index 655b154ef..72f7b0d1d 100644
--- 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;
 
 import net.sf.openrocket.R;
-import net.sf.openrocket.android.Application;
 import net.sf.openrocket.android.CurrentRocketHolder;
 import net.sf.openrocket.document.OpenRocketDocument;
 
@@ -10,18 +9,19 @@ import org.achartengine.GraphicalView;
 import org.achartengine.chart.XYChart;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.actionbarsherlock.app.SherlockFragment;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+
 /**
  * An activity that encapsulates a graphical view of the chart.
  */
-public class SimulationViewFragment extends Fragment implements SimulationSeriesDialog.OnConfirmListener {
+public class SimulationViewFragment extends SherlockFragment implements SimulationSeriesDialog.OnConfirmListener {
 	
 	SimulationChart chart;