From d2c81aff1c01c3140cbaa5e2eb96f88e4586048c Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Sat, 30 Jun 2012 19:16:34 +0000 Subject: [PATCH] Refactor. Rename SimulationSeriesDialog to SimulationPlotConfigDialog. Change names of layouts accordingly. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@821 180e2498-e6e9-4542-8430-84ac67f01cd8 --- ...s_dialog.xml => simulation_plot_config_dialog.xml} | 11 +---------- ...xml => simulation_plot_config_event_list_item.xml} | 0 android/res/values/strings.xml | 1 + ...iesDialog.java => SimulationPlotConfigDialog.java} | 10 +++++----- .../android/simulation/SimulationViewFragment.java | 4 ++-- 5 files changed, 9 insertions(+), 17 deletions(-) rename android/res/layout/{simulation_series_dialog.xml => simulation_plot_config_dialog.xml} (83%) rename android/res/layout/{simulation_series_event_list_item.xml => simulation_plot_config_event_list_item.xml} (100%) rename android/src/net/sf/openrocket/android/simulation/{SimulationSeriesDialog.java => SimulationPlotConfigDialog.java} (90%) diff --git a/android/res/layout/simulation_series_dialog.xml b/android/res/layout/simulation_plot_config_dialog.xml similarity index 83% rename from android/res/layout/simulation_series_dialog.xml rename to android/res/layout/simulation_plot_config_dialog.xml index 2f231db6..d3af9014 100644 --- a/android/res/layout/simulation_series_dialog.xml +++ b/android/res/layout/simulation_plot_config_dialog.xml @@ -4,15 +4,6 @@ android:layout_height="match_parent" android:orientation="vertical" > - - - + android:text="@string/plot" /> \ No newline at end of file diff --git a/android/res/layout/simulation_series_event_list_item.xml b/android/res/layout/simulation_plot_config_event_list_item.xml similarity index 100% rename from android/res/layout/simulation_series_event_list_item.xml rename to android/res/layout/simulation_plot_config_event_list_item.xml diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index fae70a50..b57930fd 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -13,6 +13,7 @@ Change Plot View Events Select Series And Events + Plot Case diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java b/android/src/net/sf/openrocket/android/simulation/SimulationPlotConfigDialog.java similarity index 90% rename from android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java rename to android/src/net/sf/openrocket/android/simulation/SimulationPlotConfigDialog.java index 4ed66743..5f34a21f 100644 --- a/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java +++ b/android/src/net/sf/openrocket/android/simulation/SimulationPlotConfigDialog.java @@ -25,7 +25,7 @@ import android.widget.ListView; import android.widget.Spinner; import android.widget.TextView; -public class SimulationSeriesDialog extends DialogFragment { +public class SimulationPlotConfigDialog extends DialogFragment { public interface OnConfirmListener { public void onConfirm(); @@ -38,8 +38,8 @@ public class SimulationSeriesDialog extends DialogFragment { private SimulationChart chart; private OnConfirmListener listener; - public static SimulationSeriesDialog newInstance( SimulationChart chart ) { - SimulationSeriesDialog d = new SimulationSeriesDialog(); + public static SimulationPlotConfigDialog newInstance( SimulationChart chart ) { + SimulationPlotConfigDialog d = new SimulationPlotConfigDialog(); d.chart = chart; return d; } @@ -58,7 +58,7 @@ public class SimulationSeriesDialog extends DialogFragment { builder.setTitle(R.string.simulationPlotDialogTitle); final LayoutInflater inflater = getActivity().getLayoutInflater(); - View v = inflater.inflate(R.layout.simulation_series_dialog, null); + View v = inflater.inflate(R.layout.simulation_plot_config_dialog, null); builder.setView(v); OpenRocketDocument rocketDocument = CurrentRocketHolder.getCurrentRocket().getRocketDocument(); @@ -87,7 +87,7 @@ public class SimulationSeriesDialog extends DialogFragment { if ( listener != null ) { listener.onConfirm(); } - SimulationSeriesDialog.this.dismiss(); + SimulationPlotConfigDialog.this.dismiss(); } }); diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java index 72f7b0d1..48f70762 100644 --- a/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java +++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java @@ -21,7 +21,7 @@ import com.actionbarsherlock.view.MenuItem; /** * An activity that encapsulates a graphical view of the chart. */ -public class SimulationViewFragment extends SherlockFragment implements SimulationSeriesDialog.OnConfirmListener { +public class SimulationViewFragment extends SherlockFragment implements SimulationPlotConfigDialog.OnConfirmListener { SimulationChart chart; @@ -63,7 +63,7 @@ public class SimulationViewFragment extends SherlockFragment implements Simulati switch (item.getItemId()) { case R.id.simulation_select_series_menu_option: - SimulationSeriesDialog seriesDialog = SimulationSeriesDialog.newInstance(chart); + SimulationPlotConfigDialog seriesDialog = SimulationPlotConfigDialog.newInstance(chart); seriesDialog.show(getFragmentManager(), "AbraCadaver"); seriesDialog.setOnConfirmListener(this); return true; -- 2.47.2