From 304481e4bfb72edd8409059942af4e3fd331457c Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Tue, 15 May 2012 20:57:01 +0000 Subject: [PATCH] Refactor the Motor Configuration Spinner so it could be reused. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@679 180e2498-e6e9-4542-8430-84ac67f01cd8 --- .../rocket/MotorConfigSpinnerAdapter.java | 21 +++++++++++++++++++ .../openrocket/android/rocket/Overview.java | 6 +----- 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 android/src/net/sf/openrocket/android/rocket/MotorConfigSpinnerAdapter.java diff --git a/android/src/net/sf/openrocket/android/rocket/MotorConfigSpinnerAdapter.java b/android/src/net/sf/openrocket/android/rocket/MotorConfigSpinnerAdapter.java new file mode 100644 index 00000000..8c7bdf4b --- /dev/null +++ b/android/src/net/sf/openrocket/android/rocket/MotorConfigSpinnerAdapter.java @@ -0,0 +1,21 @@ +package net.sf.openrocket.android.rocket; + +import net.sf.openrocket.R; +import net.sf.openrocket.rocketcomponent.Rocket; +import android.content.Context; +import android.widget.ArrayAdapter; + +public class MotorConfigSpinnerAdapter extends ArrayAdapter { + + public MotorConfigSpinnerAdapter(Context context, Rocket rocket) { + super(context, R.layout.simple_spinner_item); + + String[] motorConfigs = rocket.getMotorConfigurationIDs(); + + for( String config: motorConfigs ) { + this.add(rocket.getMotorConfigurationNameOrDescription(config)); + } + + } + +} diff --git a/android/src/net/sf/openrocket/android/rocket/Overview.java b/android/src/net/sf/openrocket/android/rocket/Overview.java index 8692abf5..e3c6dd55 100644 --- a/android/src/net/sf/openrocket/android/rocket/Overview.java +++ b/android/src/net/sf/openrocket/android/rocket/Overview.java @@ -81,11 +81,7 @@ implements SharedPreferences.OnSharedPreferenceChangeListener final Configuration rocketConfiguration = rocketDocument.getDefaultConfiguration(); Rocket rocket = rocketDocument.getRocket(); - String[] motorConfigs = rocket.getMotorConfigurationIDs(); - ArrayAdapter spinnerAdapter = new ArrayAdapter(getActivity(),R.layout.simple_spinner_item); - for( String config: motorConfigs ) { - spinnerAdapter.add(rocket.getMotorConfigurationNameOrDescription(config)); - } + MotorConfigSpinnerAdapter spinnerAdapter = new MotorConfigSpinnerAdapter(getActivity(),rocket); AndroidLogWrapper.d(Overview.class, "spinnerAdapter = " + spinnerAdapter); AndroidLogWrapper.d(Overview.class, "configurationSpinner = " + configurationSpinner); -- 2.47.2