UI.java削除

[train-delayed/source.git] / workspace / TrainDelayed / src / com / td / HistoryConfActivity.java

diff --git a/workspace/TrainDelayed/src/com/td/HistoryConfActivity.java b/workspace/TrainDelayed/src/com/td/HistoryConfActivity.java
index 1d81796..f16c820 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/HistoryConfActivity.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryConfActivity.java
@@ -6,14 +6,15 @@ import java.util.Date;
 import android.app.Activity;\r
 import android.os.Bundle;\r
 import android.view.View;\r
+import android.view.View.OnClickListener;\r
 import android.widget.AdapterView;\r
 import android.widget.AdapterView.OnItemSelectedListener;\r
 import android.widget.ArrayAdapter;\r
+import android.widget.Button;\r
 import android.widget.Spinner;\r
 import android.widget.TimePicker;\r
 import android.widget.TimePicker.OnTimeChangedListener;\r
 \r
-import com.td.R;\r
 import com.td.utility.EditPrefUtil;\r
 import com.td.utility.FormattedDate;\r
 \r
@@ -25,15 +26,15 @@ public class HistoryConfActivity extends Activity {
         super.onCreate(savedInstanceState);\r
         setContentView(R.layout.history_conf);\r
 \r
-        int prefYear = pref.getInt(UI.PREF_HIS_YEAR);\r
-        int prefMonth = pref.getInt(UI.PREF_HIS_MONTH);\r
-        int prefDay = pref.getInt(UI.PREF_HIS_DAY);\r
-        int prefStHour = pref.getInt(UI.PREF_HIS_ST_HOUR);\r
-        int prefStMinute = pref.getInt(UI.PREF_HIS_ST_MINUTE);\r
-        int prefEnHour = pref.getInt(UI.PREF_HIS_EN_HOUR);\r
-        int prefEnMinute = pref.getInt(UI.PREF_HIS_EN_MINUTE);\r
-        int prefYmdPos = pref.getInt(UI.PREF_HIS_YMD_POS);\r
-        int prefUnit = pref.getInt(UI.PREF_HIS_UNIT);\r
+        int prefYear = pref.getInt(HistoryActivity.PREF_HIS_YEAR);\r
+        int prefMonth = pref.getInt(HistoryActivity.PREF_HIS_MONTH);\r
+        int prefDay = pref.getInt(HistoryActivity.PREF_HIS_DAY);\r
+        int prefStHour = pref.getInt(HistoryActivity.PREF_HIS_ST_HOUR);\r
+        int prefStMinute = pref.getInt(HistoryActivity.PREF_HIS_ST_MINUTE);\r
+        int prefEnHour = pref.getInt(HistoryActivity.PREF_HIS_EN_HOUR);\r
+        int prefEnMinute = pref.getInt(HistoryActivity.PREF_HIS_EN_MINUTE);\r
+        int prefYmdPos = pref.getInt(HistoryActivity.PREF_HIS_YMD_POS);\r
+        int prefUnit = pref.getInt(HistoryActivity.PREF_HIS_UNIT);\r
 \r
         Calendar cal;\r
         Date date;\r
@@ -42,11 +43,11 @@ public class HistoryConfActivity extends Activity {
                cal.set(1900 + prefYear, prefMonth, prefDay);\r
         date = cal.getTime();\r
         int N = 7;\r
-        Spinner spinner1 = (Spinner) findViewById(R.id.spinner1);\r
+        Spinner spinner1 = (Spinner) findViewById(R.id.spinner71);\r
                spinner1.setOnItemSelectedListener(new OnItemSelectedListener(){\r
                        public void onItemSelected(AdapterView<?> parent, View view,\r
                                        int position, long id) {\r
-                               pref.put(UI.PREF_HIS_YMD_POS, position);\r
+                               pref.put(HistoryActivity.PREF_HIS_YMD_POS, position);\r
                        }\r
                        \r
                        public void onNothingSelected(AdapterView<?> view) {\r
@@ -66,31 +67,30 @@ public class HistoryConfActivity extends Activity {
                spinner1.setSelection(prefYmdPos);\r
         \r
 \r
-               TimePicker timePicker1 = (TimePicker) findViewById(R.id.timePicker1);\r
+               TimePicker timePicker1 = (TimePicker) findViewById(R.id.timePicker71);\r
                timePicker1.setOnTimeChangedListener(new OnTimeChangedListener(){\r
                        public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {\r
-                               pref.put(UI.PREF_HIS_ST_HOUR, hourOfDay);\r
-                               pref.put(UI.PREF_HIS_ST_MINUTE, minute);\r
+                               pref.put(HistoryActivity.PREF_HIS_ST_HOUR, hourOfDay);\r
+                               pref.put(HistoryActivity.PREF_HIS_ST_MINUTE, minute);\r
                        }});\r
                timePicker1.setCurrentHour(prefStHour);\r
                timePicker1.setCurrentMinute(prefStMinute);\r
                \r
-               \r
-               TimePicker timePicker2 = (TimePicker) findViewById(R.id.timePicker2);\r
+               TimePicker timePicker2 = (TimePicker) findViewById(R.id.timePicker72);\r
                timePicker2.setOnTimeChangedListener(new OnTimeChangedListener(){\r
                        public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {\r
-                               pref.put(UI.PREF_HIS_EN_HOUR, hourOfDay);\r
-                               pref.put(UI.PREF_HIS_EN_MINUTE, minute);\r
+                               pref.put(HistoryActivity.PREF_HIS_EN_HOUR, hourOfDay);\r
+                               pref.put(HistoryActivity.PREF_HIS_EN_MINUTE, minute);\r
                        }});\r
                timePicker2.setCurrentHour(prefEnHour);\r
                timePicker2.setCurrentMinute(prefEnMinute);\r
                \r
                \r
-               Spinner spinner2 = (Spinner) findViewById(R.id.spinner2);\r
+               Spinner spinner2 = (Spinner) findViewById(R.id.spinner72);\r
                spinner2.setOnItemSelectedListener(new OnItemSelectedListener(){\r
                        public void onItemSelected(AdapterView<?> parent, View view,\r
                                        int position, long id) {\r
-                               pref.put(UI.PREF_HIS_UNIT, String.valueOf(position));\r
+                               pref.put(HistoryActivity.PREF_HIS_UNIT, String.valueOf(position));\r
                        }\r
                        \r
                        public void onNothingSelected(AdapterView<?> view) {\r
@@ -104,7 +104,22 @@ public class HistoryConfActivity extends Activity {
                adapter2.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);\r
                spinner2.setAdapter(adapter2);\r
                spinner2.setSelection(prefUnit);\r
-    }\r
+\r
+               Button button1 = (Button) this.findViewById(R.id.button71);\r
+               button1.setOnClickListener(new OnClickListener() {\r
+                       public void onClick(View view) {\r
+                               pref.update();\r
+                               HistoryConfActivity.this.finish();\r
+                       }\r
+               });\r
+\r
+               Button button2 = (Button) this.findViewById(R.id.button72);\r
+               button2.setOnClickListener(new OnClickListener() {\r
+                       public void onClick(View view) {\r
+                               HistoryConfActivity.this.finish();\r
+                       }\r
+               });\r
+       }\r
 \r
        @Override\r
        protected void onStop() {\r