From 3357f4e01054de16ee469166bfb2cc83623a0edc Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Tue, 15 May 2012 21:11:58 +0000 Subject: [PATCH] Rename SimulationFragment to SimulationViewFragment. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@682 180e2498-e6e9-4542-8430-84ac67f01cd8 --- .../android/rocket/OpenRocketViewer.java | 4 ++-- .../simulation/SimulationViewActivity.java | 17 +---------------- ...ragment.java => SimulationViewFragment.java} | 6 +++--- 3 files changed, 6 insertions(+), 21 deletions(-) rename android/src/net/sf/openrocket/android/simulation/{SimulationFragment.java => SimulationViewFragment.java} (88%) diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java index 57799332..a061305f 100644 --- 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; import net.sf.openrocket.android.actionbarcompat.ActionBarFragmentActivity; 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.SimulationViewFragment; import net.sf.openrocket.android.util.AndroidLogWrapper; import net.sf.openrocket.document.Simulation; import android.app.AlertDialog; @@ -88,7 +88,7 @@ implements Simulations.OnSimulationSelectedListener if ( /* if multi pane */ sidepane != null ) { SimulationChart chart = new SimulationChart(simulationId); - Fragment graph = SimulationFragment.newInstance(chart); + Fragment graph = SimulationViewFragment.newInstance(chart); FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE); diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java index 8a478ab4..60b0b7bf 100644 --- a/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java +++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java @@ -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; import net.sf.openrocket.R; @@ -46,7 +31,7 @@ public class SimulationViewActivity extends FragmentActivity { chart.setSeries1(sim.getSimulatedData().getBranch(0).getTypes()[1]); chart.setSeries2(sim.getSimulatedData().getBranch(0).getTypes()[2]); - Fragment graph = SimulationFragment.newInstance(chart); + Fragment graph = SimulationViewFragment.newInstance(chart); FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); ft.replace(android.R.id.content, graph); diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationFragment.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java similarity index 88% rename from android/src/net/sf/openrocket/android/simulation/SimulationFragment.java rename to android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java index 60c86822..212c0b44 100644 --- a/android/src/net/sf/openrocket/android/simulation/SimulationFragment.java +++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java @@ -20,7 +20,7 @@ import android.view.ViewGroup; /** * 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; @@ -31,8 +31,8 @@ public class SimulationFragment extends Fragment implements SimulationSeriesDial /** The chart to be drawn. */ private XYChart mChart; - public static SimulationFragment newInstance( SimulationChart chart ) { - SimulationFragment frag = new SimulationFragment(); + public static SimulationViewFragment newInstance( SimulationChart chart ) { + SimulationViewFragment frag = new SimulationViewFragment(); frag.chart = chart; return frag; } -- 2.30.2