From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Tue, 5 Jun 2012 13:47:15 +0000 (+0000)
Subject: Change to inherit from Sherlock classes.
X-Git-Tag: upstream/12.09^2~203
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=aa1b0eb287708d1a47a325fbaa4074f33042c50a;p=debian%2Fopenrocket

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 1c17c6a0..cdfcf65d 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 655b154e..72f7b0d1 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;