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

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 (file)
index 0000000..8c7bdf4
--- /dev/null
+++ b/android/src/net/sf/openrocket/android/rocket/MotorConfigSpinnerAdapter.java
@@ -0,0 +1,21 @@
+package net.sf.openrocket.android.rocket;\r
+\r
+import net.sf.openrocket.R;\r
+import net.sf.openrocket.rocketcomponent.Rocket;\r
+import android.content.Context;\r
+import android.widget.ArrayAdapter;\r
+\r
+public class MotorConfigSpinnerAdapter extends ArrayAdapter<String> {\r
+\r
+       public MotorConfigSpinnerAdapter(Context context, Rocket rocket) {\r
+               super(context, R.layout.simple_spinner_item);\r
+               \r
+               String[] motorConfigs = rocket.getMotorConfigurationIDs();\r
+\r
+               for( String config: motorConfigs ) {\r
+                       this.add(rocket.getMotorConfigurationNameOrDescription(config));\r
+               }\r
+               \r
+       }\r
+\r
+}\r

diff --git a/android/src/net/sf/openrocket/android/rocket/Overview.java b/android/src/net/sf/openrocket/android/rocket/Overview.java
index 8692abf5a84746802ab2c237deee372d4920d88d..e3c6dd55f386f4f01f93777f27890e253bcd0798 100644 (file)
--- 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();\r
                Rocket rocket = rocketDocument.getRocket();\r
 \r
-               String[] motorConfigs = rocket.getMotorConfigurationIDs();\r
-               ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<String>(getActivity(),R.layout.simple_spinner_item);\r
-               for( String config: motorConfigs ) {\r
-                       spinnerAdapter.add(rocket.getMotorConfigurationNameOrDescription(config));\r
-               }\r
+               MotorConfigSpinnerAdapter spinnerAdapter = new MotorConfigSpinnerAdapter(getActivity(),rocket);\r
 \r
                AndroidLogWrapper.d(Overview.class, "spinnerAdapter = " + spinnerAdapter);\r
                AndroidLogWrapper.d(Overview.class, "configurationSpinner = " + configurationSpinner);\r