Rename SimulationFragment to SimulationViewFragment.

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

diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
index 57799332eabde206383570e59c829ce39afe0211..a061305f7be3b773cc65a208cd4bfa0becf7fdea 100644 (file)
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
@@ -6,8 +6,8 @@ import net.sf.openrocket.android.ActivityHelpers;
 import net.sf.openrocket.android.Application;\r
 import net.sf.openrocket.android.actionbarcompat.ActionBarFragmentActivity;\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.simulation.SimulationViewFragment;\r
 import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import net.sf.openrocket.document.Simulation;\r
 import android.app.AlertDialog;\r
@@ -88,7 +88,7 @@ implements Simulations.OnSimulationSelectedListener
                if ( /* if multi pane */ sidepane != null ) {\r
                        SimulationChart chart = new SimulationChart(simulationId);\r
 \r
-                       Fragment graph = SimulationFragment.newInstance(chart);\r
+                       Fragment graph = SimulationViewFragment.newInstance(chart);\r
 \r
                        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
                        ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);\r

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationFragment.java b/android/src/net/sf/openrocket/android/simulation/SimulationFragment.java
deleted file mode 100644 (file)
index 60c8682..0000000
--- a/android/src/net/sf/openrocket/android/simulation/SimulationFragment.java
+++ /dev/null
@@ -1,96 +0,0 @@
-\r
-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.document.OpenRocketDocument;\r
-\r
-import org.achartengine.GraphicalView;\r
-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
-/**\r
- * An activity that encapsulates a graphical view of the chart.\r
- */\r
-public class SimulationFragment extends Fragment implements SimulationSeriesDialog.OnConfirmListener {\r
-       \r
-       SimulationChart chart;\r
-\r
-       ViewGroup container;\r
-       \r
-       /** The encapsulated graphical view. */\r
-       private GraphicalView mView;\r
-       /** The chart to be drawn. */\r
-       private XYChart mChart;\r
-\r
-       public static SimulationFragment newInstance( SimulationChart chart ) {\r
-               SimulationFragment frag = new SimulationFragment();\r
-               frag.chart = chart;\r
-               return frag;\r
-       }\r
-\r
-       @Override\r
-       public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {\r
-               setRetainInstance(true);\r
-               setHasOptionsMenu(true);\r
-               OpenRocketDocument rocketDocument = ((Application)getActivity().getApplication()).getRocketDocument();\r
-\r
-               this.container = container;\r
-               if (savedInstanceState != null ) {\r
-                       chart = (SimulationChart) savedInstanceState.getSerializable("chart");\r
-               }\r
-               mChart = chart.buildChart(rocketDocument);\r
-               mView = new GraphicalView(container.getContext(), mChart);\r
-               return mView;\r
-       }\r
-\r
-       @Override\r
-       public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {\r
-               inflater.inflate(R.menu.simulation_option_menu, menu);\r
-       }\r
-\r
-       @Override\r
-       public boolean onOptionsItemSelected(MenuItem item) {\r
-               switch (item.getItemId())\r
-               {\r
-               case R.id.simulation_select_series_menu_option:\r
-                       SimulationSeriesDialog seriesDialog = SimulationSeriesDialog.newInstance(chart);\r
-                       seriesDialog.show(getFragmentManager(), "AbraCadaver");\r
-                       seriesDialog.setOnConfirmListener(this);\r
-                       return true;\r
-               case R.id.simulation_select_events_menu_option:\r
-                       SimulationEventsDialog eventsDialog = SimulationEventsDialog.newInstance(chart);\r
-                       eventsDialog.show(getFragmentManager(), "AbraCadaver");\r
-                       return true;\r
-               default:\r
-                       return super.onOptionsItemSelected(item);\r
-               }\r
-       }\r
-\r
-       @Override\r
-       public void onConfirm() {\r
-               OpenRocketDocument rocketDocument = ((Application)getActivity().getApplication()).getRocketDocument();\r
-\r
-               mChart = chart.buildChart(rocketDocument);\r
-               ViewGroup parent = (ViewGroup) mView.getParent();\r
-               parent.removeView(mView);\r
-               mView = new GraphicalView(container.getContext(), mChart);\r
-               parent.addView(mView);\r
-       }\r
-\r
-       @Override\r
-       public void onSaveInstanceState(Bundle outState) {\r
-               super.onSaveInstanceState(outState);\r
-               outState.putSerializable("chart", chart);\r
-\r
-       }\r
-       \r
-}
\ No newline at end of file

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java
index 8a478ab4def6347225ea6df0967ad4865ff17803..60b0b7bf313ccdae82f9ff471555eefeb39274b4 100644 (file)
--- a/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java
+++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java
@@ -1,18 +1,3 @@
-/**\r
- * Copyright (C) 2009, 2010 SC 4ViewSoft SRL\r
- *  \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *  \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *  \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
 package net.sf.openrocket.android.simulation;\r
 \r
 import net.sf.openrocket.R;\r
@@ -46,7 +31,7 @@ public class SimulationViewActivity extends FragmentActivity {
                chart.setSeries1(sim.getSimulatedData().getBranch(0).getTypes()[1]);\r
                chart.setSeries2(sim.getSimulatedData().getBranch(0).getTypes()[2]);\r
 \r
-               Fragment graph = SimulationFragment.newInstance(chart);\r
+               Fragment graph = SimulationViewFragment.newInstance(chart);\r
 \r
                FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
                ft.replace(android.R.id.content, graph);\r

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
new file mode 100644 (file)
index 0000000..212c0b4
--- /dev/null
+++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
@@ -0,0 +1,96 @@
+\r
+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.document.OpenRocketDocument;\r
+\r
+import org.achartengine.GraphicalView;\r
+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
+/**\r
+ * An activity that encapsulates a graphical view of the chart.\r
+ */\r
+public class SimulationViewFragment extends Fragment implements SimulationSeriesDialog.OnConfirmListener {\r
+       \r
+       SimulationChart chart;\r
+\r
+       ViewGroup container;\r
+       \r
+       /** The encapsulated graphical view. */\r
+       private GraphicalView mView;\r
+       /** The chart to be drawn. */\r
+       private XYChart mChart;\r
+\r
+       public static SimulationViewFragment newInstance( SimulationChart chart ) {\r
+               SimulationViewFragment frag = new SimulationViewFragment();\r
+               frag.chart = chart;\r
+               return frag;\r
+       }\r
+\r
+       @Override\r
+       public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {\r
+               setRetainInstance(true);\r
+               setHasOptionsMenu(true);\r
+               OpenRocketDocument rocketDocument = ((Application)getActivity().getApplication()).getRocketDocument();\r
+\r
+               this.container = container;\r
+               if (savedInstanceState != null ) {\r
+                       chart = (SimulationChart) savedInstanceState.getSerializable("chart");\r
+               }\r
+               mChart = chart.buildChart(rocketDocument);\r
+               mView = new GraphicalView(container.getContext(), mChart);\r
+               return mView;\r
+       }\r
+\r
+       @Override\r
+       public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {\r
+               inflater.inflate(R.menu.simulation_option_menu, menu);\r
+       }\r
+\r
+       @Override\r
+       public boolean onOptionsItemSelected(MenuItem item) {\r
+               switch (item.getItemId())\r
+               {\r
+               case R.id.simulation_select_series_menu_option:\r
+                       SimulationSeriesDialog seriesDialog = SimulationSeriesDialog.newInstance(chart);\r
+                       seriesDialog.show(getFragmentManager(), "AbraCadaver");\r
+                       seriesDialog.setOnConfirmListener(this);\r
+                       return true;\r
+               case R.id.simulation_select_events_menu_option:\r
+                       SimulationEventsDialog eventsDialog = SimulationEventsDialog.newInstance(chart);\r
+                       eventsDialog.show(getFragmentManager(), "AbraCadaver");\r
+                       return true;\r
+               default:\r
+                       return super.onOptionsItemSelected(item);\r
+               }\r
+       }\r
+\r
+       @Override\r
+       public void onConfirm() {\r
+               OpenRocketDocument rocketDocument = ((Application)getActivity().getApplication()).getRocketDocument();\r
+\r
+               mChart = chart.buildChart(rocketDocument);\r
+               ViewGroup parent = (ViewGroup) mView.getParent();\r
+               parent.removeView(mView);\r
+               mView = new GraphicalView(container.getContext(), mChart);\r
+               parent.addView(mView);\r
+       }\r
+\r
+       @Override\r
+       public void onSaveInstanceState(Bundle outState) {\r
+               super.onSaveInstanceState(outState);\r
+               outState.putSerializable("chart", chart);\r
+\r
+       }\r
+       \r
+}
\ No newline at end of file