Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / src / net / sf / openrocket / android / simulation / SimulationSeriesDialog.java

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java b/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java
deleted file mode 100644 (file)
index bdcb4d4..0000000
--- a/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package net.sf.openrocket.android.simulation;\r
-\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-\r
-import net.sf.openrocket.R;\r
-import net.sf.openrocket.android.Application;\r
-import net.sf.openrocket.document.OpenRocketDocument;\r
-import net.sf.openrocket.simulation.FlightDataType;\r
-import android.content.DialogInterface;\r
-import android.os.Bundle;\r
-import android.support.v4.app.DialogFragment;\r
-import android.view.LayoutInflater;\r
-import android.view.View;\r
-import android.view.ViewGroup;\r
-import android.widget.ArrayAdapter;\r
-import android.widget.Button;\r
-import android.widget.Spinner;\r
-import android.widget.TextView;\r
-\r
-public class SimulationSeriesDialog extends DialogFragment {\r
-       \r
-       public interface OnConfirmListener {\r
-               public void onConfirm();\r
-       }\r
-\r
-       private Spinner series1Spinner;\r
-       private Spinner series2Spinner;\r
-\r
-       private SimulationChart chart;\r
-       private OnConfirmListener listener;\r
-\r
-       public static SimulationSeriesDialog newInstance( SimulationChart chart ) {\r
-               SimulationSeriesDialog d = new SimulationSeriesDialog();\r
-               d.chart = chart;\r
-               return d;\r
-       }\r
-\r
-       public void setOnConfirmListener(OnConfirmListener listener) {\r
-               this.listener = listener;\r
-       }\r
-\r
-       @Override\r
-       public void onCreate(Bundle savedInstanceState) {\r
-               super.onCreate(savedInstanceState);\r
-               if (savedInstanceState != null ) {\r
-                       chart = (SimulationChart) savedInstanceState.getSerializable("chart");\r
-               }\r
-       }\r
-\r
-       @Override\r
-       public void onSaveInstanceState(Bundle arg0) {\r
-               super.onSaveInstanceState(arg0);\r
-               arg0.putSerializable("chart", chart);\r
-       }\r
-\r
-       @Override\r
-       public View onCreateView(final LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {\r
-\r
-               View v = inflater.inflate(R.layout.simulation_series_dialog, container, false);\r
-               \r
-               OpenRocketDocument rocketDocument = ((Application)getActivity().getApplication()).getRocketDocument();\r
-\r
-               Button okButton = (Button) v.findViewById(R.id.simulationOkButton);\r
-               okButton.setOnClickListener( new View.OnClickListener() {\r
-\r
-                       @Override\r
-                       public void onClick(View v) {\r
-                               chart.setSeries1((FlightDataType)series1Spinner.getSelectedItem());\r
-                               chart.setSeries2((FlightDataType)series2Spinner.getSelectedItem());\r
-\r
-                               if ( listener != null ) {\r
-                                       listener.onConfirm();\r
-                               }\r
-                               SimulationSeriesDialog.this.dismiss();\r
-                       }\r
-                       \r
-               });\r
-\r
-               series1Spinner = (Spinner) v.findViewById(R.id.simulationSeries1);\r
-               series2Spinner = (Spinner) v.findViewById(R.id.simulationSeries2);\r
-\r
-               List<FlightDataType> selectableSeries = new ArrayList<FlightDataType>();\r
-               for( FlightDataType fdt : chart.getFlightDataBranch(rocketDocument).getTypes() ) {\r
-                       if ( fdt == FlightDataType.TYPE_TIME ) { \r
-\r
-                       } else {\r
-                               selectableSeries.add(fdt);\r
-                       }\r
-               }\r
-               ArrayAdapter<FlightDataType> serieses = new ArrayAdapter<FlightDataType>(getActivity(),R.layout.simple_spinner_item,selectableSeries) {\r
-\r
-                       @Override\r
-                       public View getView(int position, View convertView,     ViewGroup parent) {\r
-                               View v = convertView;\r
-                               if ( v == null ) {\r
-                                       LayoutInflater li = inflater;\r
-                                       v = li.inflate(R.layout.simple_spinner_item,null);\r
-                               }\r
-                               FlightDataType fdt = this.getItem(position);\r
-                               ((TextView)v.findViewById(android.R.id.text1)).setText( fdt.toString() );\r
-                               return v;\r
-                       }\r
-\r
-               };\r
-               series1Spinner.setAdapter(serieses);\r
-               series2Spinner.setAdapter(serieses);\r
-\r
-\r
-               return v;\r
-       }\r
-\r
-}\r