git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@800
180e2498-e6e9-4542-8430-
84ac67f01cd8
package net.sf.openrocket.android.motor;\r
\r
package net.sf.openrocket.android.motor;\r
\r
-import java.util.ArrayList;\r
+import java.util.List;\r
\r
import net.sf.openrocket.R;\r
\r
import net.sf.openrocket.R;\r
+import net.sf.openrocket.android.db.ConversionUtils;\r
import android.app.AlertDialog;\r
import android.app.Dialog;\r
import android.os.Bundle;\r
import android.app.AlertDialog;\r
import android.app.Dialog;\r
import android.os.Bundle;\r
@Override\r
public void onClick(View v) {\r
String s = ((TextView)v).getText().toString();\r
@Override\r
public void onClick(View v) {\r
String s = ((TextView)v).getText().toString();\r
- long value = Long.parseLong(s);\r
+ double value = ConversionUtils.stringToDelay(s);\r
if ( delaySelectedListener != null ) {\r
delaySelectedListener.onDelaySelected(value);\r
}\r
if ( delaySelectedListener != null ) {\r
delaySelectedListener.onDelaySelected(value);\r
}\r
savedInstanceState = getArguments();\r
}\r
double[] delays = savedInstanceState.getDoubleArray(delaysArg);\r
savedInstanceState = getArguments();\r
}\r
double[] delays = savedInstanceState.getDoubleArray(delaysArg);\r
- ArrayList<Long> delayList = new ArrayList<Long>(delays.length);\r
- for( int i =0; i< delays.length; i++ ) {\r
- delayList.add( Math.round(delays[i]) );\r
- }\r
+ List<String> delayList = ConversionUtils.delaysToStringList(delays);\r
\r
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());\r
builder.setTitle("Enter or Choose Delay");\r
\r
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());\r
builder.setTitle("Enter or Choose Delay");\r
View v = li.inflate(R.layout.motor_config_delay_dialog, null);\r
builder.setView(v);\r
\r
View v = li.inflate(R.layout.motor_config_delay_dialog, null);\r
builder.setView(v);\r
\r
- ArrayAdapter<Long> listAdapter = new ArrayAdapter<Long>(getActivity(),android.R.layout.simple_list_item_1,delayList) {\r
+ ArrayAdapter<String> listAdapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_list_item_1,delayList) {\r
\r
@Override\r
public View getView(int position, View convertView, ViewGroup parent) {\r
\r
@Override\r
public View getView(int position, View convertView, ViewGroup parent) {\r
convertView = getActivity().getLayoutInflater().inflate( android.R.layout.simple_list_item_1, null);\r
}\r
TextView tv = (TextView) convertView.findViewById(android.R.id.text1);\r
convertView = getActivity().getLayoutInflater().inflate( android.R.layout.simple_list_item_1, null);\r
}\r
TextView tv = (TextView) convertView.findViewById(android.R.id.text1);\r
- tv.setText( String.valueOf(getItem(position)) );\r
+ tv.setText( getItem(position) );\r
tv.setOnClickListener( MotorDelayDialogFragment.this );\r
return convertView;\r
}\r
tv.setOnClickListener( MotorDelayDialogFragment.this );\r
return convertView;\r
}\r