hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename SimulationFragment to SimulationViewFragment.

Browse Source
This commit is contained in:
Kevin Ruland 2012-05-15 21:11:58 +00:00
parent 33bbc9d65b
commit bfbab58f51
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
View File

@ -6,8 +6,8 @@ import net.sf.openrocket.android.ActivityHelpers;
import net.sf.openrocket.android.Application; import net.sf.openrocket.android.Application;
import net.sf.openrocket.android.actionbarcompat.ActionBarFragmentActivity; import net.sf.openrocket.android.actionbarcompat.ActionBarFragmentActivity;
import net.sf.openrocket.android.simulation.SimulationChart; import net.sf.openrocket.android.simulation.SimulationChart;
import net.sf.openrocket.android.simulation.SimulationFragment;
import net.sf.openrocket.android.simulation.SimulationViewActivity; import net.sf.openrocket.android.simulation.SimulationViewActivity;
import net.sf.openrocket.android.simulation.SimulationViewFragment;
import net.sf.openrocket.android.util.AndroidLogWrapper; import net.sf.openrocket.android.util.AndroidLogWrapper;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import android.app.AlertDialog; import android.app.AlertDialog;
@ -88,7 +88,7 @@ implements Simulations.OnSimulationSelectedListener
if ( /* if multi pane */ sidepane != null ) { if ( /* if multi pane */ sidepane != null ) {
SimulationChart chart = new SimulationChart(simulationId); SimulationChart chart = new SimulationChart(simulationId);
Fragment graph = SimulationFragment.newInstance(chart); Fragment graph = SimulationViewFragment.newInstance(chart);
FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE); ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);

17
android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java
View File

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

6
android/src/net/sf/openrocket/android/simulation/SimulationFragment.java → android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
View File

@ -20,7 +20,7 @@ import android.view.ViewGroup;
/** /**
* An activity that encapsulates a graphical view of the chart. * An activity that encapsulates a graphical view of the chart.
*/ */
public class SimulationFragment extends Fragment implements SimulationSeriesDialog.OnConfirmListener { public class SimulationViewFragment extends Fragment implements SimulationSeriesDialog.OnConfirmListener {
SimulationChart chart; SimulationChart chart;
@ -31,8 +31,8 @@ public class SimulationFragment extends Fragment implements SimulationSeriesDial
/** The chart to be drawn. */ /** The chart to be drawn. */
private XYChart mChart; private XYChart mChart;
public static SimulationFragment newInstance( SimulationChart chart ) { public static SimulationViewFragment newInstance( SimulationChart chart ) {
SimulationFragment frag = new SimulationFragment(); SimulationViewFragment frag = new SimulationViewFragment();
frag.chart = chart; frag.chart = chart;
return frag; return frag;
} }