OSDN Git Service

UI.java削除
authorYuji Konishi <yuji.k64613@gmail.com>
Sat, 9 Jul 2011 07:18:29 +0000 (16:18 +0900)
committerYuji Konishi <yuji.k64613@gmail.com>
Sat, 9 Jul 2011 07:18:29 +0000 (16:18 +0900)
リストのアダプタのクラス名変更
一通りの画面を作成(通知設定画面未作成)

31 files changed:
workspace/TrainDelayed/bin/TrainDelayed.apk
workspace/TrainDelayed/bin/classes.dex
workspace/TrainDelayed/bin/resources.ap_
workspace/TrainDelayed/gen/com/td/R.java
workspace/TrainDelayed/res/layout/check_list_item_1.xml [new file with mode: 0644]
workspace/TrainDelayed/res/layout/history.xml
workspace/TrainDelayed/res/layout/history_conf.xml
workspace/TrainDelayed/res/layout/main.xml
workspace/TrainDelayed/res/layout/monitor_time.xml
workspace/TrainDelayed/res/layout/search_word.xml
workspace/TrainDelayed/res/layout/simple_list_item_1.xml [new file with mode: 0644]
workspace/TrainDelayed/res/layout/train_list.xml
workspace/TrainDelayed/res/values/strings.xml
workspace/TrainDelayed/src/com/td/HistoryActivity.java
workspace/TrainDelayed/src/com/td/HistoryConfActivity.java
workspace/TrainDelayed/src/com/td/MonitorTimeActivity.java
workspace/TrainDelayed/src/com/td/SearchWordActivity.java
workspace/TrainDelayed/src/com/td/TrainDelayedActivity.java
workspace/TrainDelayed/src/com/td/TrainListActivity.java
workspace/TrainDelayed/src/com/td/TrainListViewArrayAdapter.java [new file with mode: 0644]
workspace/TrainDelayed/src/com/td/UI.java [deleted file]
workspace/TrainDelayed/src/com/td/db/DatabaseHelper.java
workspace/TrainDelayed/src/com/td/db/HistoryDao.java
workspace/TrainDelayed/src/com/td/db/KeywordDao.java
workspace/TrainDelayed/src/com/td/db/Monitor.java [new file with mode: 0644]
workspace/TrainDelayed/src/com/td/db/MonitorDao.java [new file with mode: 0644]
workspace/TrainDelayed/src/com/td/db/TrainDao.java
workspace/TrainDelayed/src/com/td/utility/DateUtil.java
workspace/TrainDelayed/src/com/td/utility/ListViewArrayAdapter.java [deleted file]
workspace/TrainDelayed/src/com/td/utility/TdException.java
workspace/TrainDelayed/src/com/td/utility/Util.java [new file with mode: 0644]

index b61bf88..88ab95f 100644 (file)
Binary files a/workspace/TrainDelayed/bin/TrainDelayed.apk and b/workspace/TrainDelayed/bin/TrainDelayed.apk differ
index 27b5ee3..fad00c5 100644 (file)
Binary files a/workspace/TrainDelayed/bin/classes.dex and b/workspace/TrainDelayed/bin/classes.dex differ
index b2a643e..eef50ce 100644 (file)
Binary files a/workspace/TrainDelayed/bin/resources.ap_ and b/workspace/TrainDelayed/bin/resources.ap_ differ
index 6f58e52..627f194 100644 (file)
@@ -16,60 +16,89 @@ public final class R {
         public static final int on=0x7f020002;\r
     }\r
     public static final class id {\r
-        public static final int LinearLayout74=0x7f050007;\r
-        public static final int button1=0x7f05000a;\r
-        public static final int button11=0x7f050001;\r
-        public static final int button12=0x7f050002;\r
-        public static final int button2=0x7f05000b;\r
-        public static final int button3=0x7f05000c;\r
-        public static final int button4=0x7f05000d;\r
-        public static final int button5=0x7f05000e;\r
-        public static final int button6=0x7f05000f;\r
-        public static final int button71=0x7f050008;\r
-        public static final int button72=0x7f050018;\r
-        public static final int button73=0x7f050009;\r
-        public static final int button81=0x7f05001c;\r
-        public static final int button82=0x7f05001d;\r
-        public static final int button83=0x7f05001e;\r
-        public static final int button84=0x7f05001f;\r
-        public static final int button85=0x7f050020;\r
-        public static final int button86=0x7f050021;\r
-        public static final int checkBox1=0x7f050011;\r
-        public static final int checkBox2=0x7f050012;\r
-        public static final int checkBox3=0x7f050013;\r
-        public static final int checkBox4=0x7f050014;\r
-        public static final int checkBox5=0x7f050015;\r
-        public static final int checkBox6=0x7f050016;\r
-        public static final int checkBox7=0x7f050017;\r
-        public static final int editText81=0x7f05001b;\r
-        public static final int imageView1=0x7f050023;\r
-        public static final int listView1=0x7f050010;\r
-        public static final int listView81=0x7f05001a;\r
-        public static final int menu1=0x7f050022;\r
-        public static final int spcv=0x7f050000;\r
-        public static final int spinner1=0x7f050003;\r
-        public static final int spinner2=0x7f050006;\r
-        public static final int textView1=0x7f050019;\r
-        public static final int timePicker1=0x7f050004;\r
-        public static final int timePicker2=0x7f050005;\r
+        public static final int LinearLayout01=0x7f05000d;\r
+        public static final int LinearLayout02=0x7f050011;\r
+        public static final int LinearLayout03=0x7f050013;\r
+        public static final int LinearLayout04=0x7f050015;\r
+        public static final int LinearLayout05=0x7f050017;\r
+        public static final int LinearLayout06=0x7f050019;\r
+        public static final int LinearLayout07=0x7f05001b;\r
+        public static final int LinearLayout09=0x7f05001d;\r
+        public static final int LinearLayout64=0x7f05002a;\r
+        public static final int LinearLayout74=0x7f05000a;\r
+        public static final int button01=0x7f050010;\r
+        public static final int button02=0x7f050012;\r
+        public static final int button03=0x7f050014;\r
+        public static final int button04=0x7f050016;\r
+        public static final int button05=0x7f050018;\r
+        public static final int button06=0x7f05001a;\r
+        public static final int button07=0x7f05001c;\r
+        public static final int button09=0x7f05001e;\r
+        public static final int button11=0x7f050004;\r
+        public static final int button12=0x7f050005;\r
+        public static final int button51=0x7f05003b;\r
+        public static final int button61=0x7f05002b;\r
+        public static final int button62=0x7f05002c;\r
+        public static final int button63=0x7f05002d;\r
+        public static final int button64=0x7f05002e;\r
+        public static final int button65=0x7f05002f;\r
+        public static final int button66=0x7f050030;\r
+        public static final int button71=0x7f05000b;\r
+        public static final int button72=0x7f05000c;\r
+        public static final int button81=0x7f050034;\r
+        public static final int button82=0x7f050035;\r
+        public static final int button83=0x7f050036;\r
+        public static final int button84=0x7f050037;\r
+        public static final int button85=0x7f050038;\r
+        public static final int button86=0x7f050039;\r
+        public static final int checkBox=0x7f050000;\r
+        public static final int checkBox61=0x7f050021;\r
+        public static final int checkBox62=0x7f050022;\r
+        public static final int checkBox63=0x7f050023;\r
+        public static final int checkBox64=0x7f050024;\r
+        public static final int checkBox65=0x7f050025;\r
+        public static final int checkBox66=0x7f050026;\r
+        public static final int checkBox67=0x7f050027;\r
+        public static final int editText81=0x7f050033;\r
+        public static final int imageView1=0x7f05003c;\r
+        public static final int listView61=0x7f05001f;\r
+        public static final int listView81=0x7f050032;\r
+        public static final int menu51=0x7f05003a;\r
+        public static final int scrollView01=0x7f05000f;\r
+        public static final int scrollView61=0x7f050020;\r
+        public static final int spcv=0x7f050003;\r
+        public static final int spinner71=0x7f050006;\r
+        public static final int spinner72=0x7f050007;\r
+        public static final int text2=0x7f050001;\r
+        public static final int textView01=0x7f05000e;\r
+        public static final int textView1=0x7f050031;\r
+        public static final int textView11=0x7f050002;\r
+        public static final int timePicker61=0x7f050028;\r
+        public static final int timePicker62=0x7f050029;\r
+        public static final int timePicker71=0x7f050008;\r
+        public static final int timePicker72=0x7f050009;\r
     }\r
     public static final class layout {\r
-        public static final int history=0x7f030000;\r
-        public static final int history_conf=0x7f030001;\r
-        public static final int main=0x7f030002;\r
-        public static final int monitor_time=0x7f030003;\r
-        public static final int search_word=0x7f030004;\r
-        public static final int train_list=0x7f030005;\r
-        public static final int train_row=0x7f030006;\r
+        public static final int check_list_item_1=0x7f030000;\r
+        public static final int history=0x7f030001;\r
+        public static final int history_conf=0x7f030002;\r
+        public static final int main=0x7f030003;\r
+        public static final int monitor_time=0x7f030004;\r
+        public static final int search_word=0x7f030005;\r
+        public static final int simple_list_item_1=0x7f030006;\r
+        public static final int train_list=0x7f030007;\r
+        public static final int train_row=0x7f030008;\r
     }\r
     public static final class string {\r
         public static final int app_name=0x7f040001;\r
+        public static final int exit_button=0x7f040009;\r
         public static final int hello=0x7f040000;\r
-        public static final int history_button=0x7f040002;\r
-        public static final int keyword_button=0x7f040006;\r
-        public static final int monitor_button=0x7f040007;\r
-        public static final int route_button=0x7f040005;\r
-        public static final int start_service_button=0x7f040003;\r
-        public static final int stop_service_button=0x7f040004;\r
+        public static final int history_button=0x7f040007;\r
+        public static final int keyword_button=0x7f040008;\r
+        public static final int monitor_button=0x7f040004;\r
+        public static final int route_button=0x7f040003;\r
+        public static final int start_service_button=0x7f040005;\r
+        public static final int stop_service_button=0x7f040006;\r
+        public static final int update_route_button=0x7f040002;\r
     }\r
 }\r
diff --git a/workspace/TrainDelayed/res/layout/check_list_item_1.xml b/workspace/TrainDelayed/res/layout/check_list_item_1.xml
new file mode 100644 (file)
index 0000000..f6a816b
--- /dev/null
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<LinearLayout \r
+  xmlns:android="http://schemas.android.com/apk/res/android"\r
+  android:orientation="horizontal"\r
+  android:layout_width="fill_parent"\r
+  android:layout_height="fill_parent"\r
+  android:gravity="center_vertical"\r
+>\r
+       <CheckBox\r
+           android:focusable="false"\r
+           android:focusableInTouchMode="false"\r
+           android:id="@+id/checkBox"\r
+           android:layout_width="wrap_content"\r
+           android:layout_height="wrap_content"\r
+           android:paddingLeft="5dp"\r
+           android:paddingRight="5dp" />\r
+       <TextView\r
+               android:id="@+id/text2"\r
+               android:layout_width="fill_parent"\r
+               android:layout_height="wrap_content"\r
+               android:textAppearance="?android:attr/textAppearanceLarge"\r
+               android:gravity="center_vertical"\r
+               android:paddingLeft="6dip"\r
+               android:minHeight="?android:attr/listPreferredItemHeight"\r
+       />\r
+</LinearLayout>
\ No newline at end of file
index de6d14b..8a256bd 100644 (file)
@@ -4,6 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     >
+<TextView android:text="20xx/00/00 00:00 - 00:00" android:id="@+id/textView11" android:background="#999999" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
     <com.td.HistoryView
               android:id="@+id/spcv"
               android:layout_margin="0dip"
index da73915..50ee84c 100644 (file)
@@ -2,18 +2,18 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">\r
 <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">\r
 <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">\r
-       <TextView android:text="日付" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>\r
-    <Spinner android:layout_height="wrap_content" android:id="@+id/spinner1" android:layout_width="fill_parent"></Spinner>\r
-       <TextView android:text="é\96\8bå§\8bæ\99\82å\88»" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>\r
-       <TimePicker android:layout_width="fill_parent" android:id="@+id/timePicker1" android:layout_height="fill_parent"></TimePicker>\r
-       <TextView android:text="終了時刻" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>\r
-       <TimePicker android:layout_width="fill_parent" android:id="@+id/timePicker2" android:layout_height="fill_parent"></TimePicker>\r
-       <TextView android:text="間隔" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>\r
-    <Spinner android:layout_height="wrap_content" android:id="@+id/spinner2" android:layout_width="fill_parent"></Spinner>\r
+       <TextView android:text="日付" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>\r
+    <Spinner android:layout_height="wrap_content" android:id="@+id/spinner71" android:layout_width="fill_parent"></Spinner>\r
+       <TextView android:text="é\96\93é\9a\94" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>\r
+    <Spinner android:layout_height="wrap_content" android:id="@+id/spinner72" android:layout_width="fill_parent"></Spinner>\r
+       <TextView android:text="開始時刻" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>\r
+       <TimePicker android:layout_width="wrap_content" android:id="@+id/timePicker71" android:layout_height="fill_parent"></TimePicker>\r
+       <TextView android:text="終了時刻" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>\r
+       <TimePicker android:layout_width="wrap_content" android:id="@+id/timePicker72" android:layout_height="fill_parent"></TimePicker>\r
 </LinearLayout>\r
 </ScrollView>\r
 <LinearLayout android:id="@+id/LinearLayout74" android:layout_width="fill_parent" android:layout_height="wrap_content">\r
-       <Button android:text="定" android:layout_weight="1" android:id="@+id/button71" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
-       <Button android:text="戻る" android:layout_weight="1" android:id="@+id/button73" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
+       <Button android:text="定" android:layout_weight="1" android:id="@+id/button71" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
+       <Button android:text="戻る" android:layout_weight="1" android:id="@+id/button72" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
 </LinearLayout>\r
 </LinearLayout>\r
index ac7a67d..5cf3a1c 100644 (file)
@@ -4,10 +4,85 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     >
-<Button android:text="@+string/monitor_button" android:id="@+id/button1" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
-<Button android:text="@+string/keyword_button" android:id="@+id/button2" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
-<Button android:text="@+string/history_button" android:id="@+id/button3" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
-<Button android:text="@+string/start_service_button" android:id="@+id/button4" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
-<Button android:text="@+string/stop_service_button" android:id="@+id/button5" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
-<Button android:text="@+string/route_button" android:id="@+id/button6" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
+<LinearLayout
+        android:id="@+id/LinearLayout01"
+        android:layout_height="wrap_content"
+        android:background="#999999"
+        android:padding="3dip"
+        android:layout_width="fill_parent">
+       <TextView android:text="京浜東北線、東海道線、京浜急行線を監視しています。"
+               android:textAppearance="?android:attr/textAppearanceMedium"
+        android:background="#cccccc"
+               android:id="@+id/textView01"
+               android:layout_width="fill_parent"
+               android:layout_height="wrap_content">
+               </TextView>
+</LinearLayout>
+<ScrollView android:id="@+id/scrollView01" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
+<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
+<LinearLayout
+        android:id="@+id/LinearLayout01"
+        android:layout_height="wrap_content"
+        android:background="#ffffff"
+        android:padding="1dip"
+        android:layout_width="fill_parent">
+       <Button android:text="@+string/update_route_button" android:id="@+id/button01" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
+</LinearLayout>
+<LinearLayout
+        android:id="@+id/LinearLayout02"
+        android:layout_height="wrap_content"
+        android:background="#ffffff"
+        android:padding="1dip"
+        android:layout_width="fill_parent">
+       <Button android:text="@+string/route_button" android:id="@+id/button02" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
+</LinearLayout>
+<LinearLayout
+        android:id="@+id/LinearLayout03"
+        android:layout_height="wrap_content"
+        android:background="#ffffff"
+        android:padding="1dip"
+        android:layout_width="fill_parent">
+       <Button android:text="@+string/monitor_button" android:id="@+id/button03" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
+</LinearLayout>
+<LinearLayout
+        android:id="@+id/LinearLayout04"
+        android:layout_height="wrap_content"
+        android:background="#ffffff"
+        android:padding="1dip"
+        android:layout_width="fill_parent">
+       <Button android:text="@+string/start_service_button" android:id="@+id/button04" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
+</LinearLayout>
+<LinearLayout
+        android:id="@+id/LinearLayout05"
+        android:layout_height="wrap_content"
+        android:background="#ffffff"
+        android:padding="1dip"
+        android:layout_width="fill_parent">
+       <Button android:text="@+string/stop_service_button" android:id="@+id/button05" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
+</LinearLayout>
+<LinearLayout
+        android:id="@+id/LinearLayout06"
+        android:layout_height="wrap_content"
+        android:background="#ffffff"
+        android:padding="1dip"
+        android:layout_width="fill_parent">
+       <Button android:text="@+string/history_button" android:id="@+id/button06" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
+</LinearLayout>
+<LinearLayout
+        android:id="@+id/LinearLayout07"
+        android:layout_height="wrap_content"
+        android:background="#ffffff"
+        android:padding="1dip"
+        android:layout_width="fill_parent">
+       <Button android:text="@+string/keyword_button" android:id="@+id/button07" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
+</LinearLayout>
+</LinearLayout>
+</ScrollView>
+<LinearLayout
+        android:id="@+id/LinearLayout09"
+        android:layout_height="wrap_content"
+        android:padding="1dip"
+        android:layout_width="fill_parent">
+       <Button android:text="@+string/exit_button" android:id="@+id/button09" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
+</LinearLayout>
 </LinearLayout>
index be98bb8..f60269d 100644 (file)
@@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="utf-8" ?> \r
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">\r
-<TextView android:text="設定内容" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>\r
-<ListView android:id="@+id/listView1" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="2"></ListView>\r
-<ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">\r
+<TextView android:text="設定内容" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>\r
+<ListView android:id="@+id/listView61" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="2"></ListView>\r
+<ScrollView android:id="@+id/scrollView61" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">\r
 <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">\r
-       <TextView android:text="曜日" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>\r
-       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox1" android:layout_height="fill_parent"></CheckBox>\r
-       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox2" android:layout_height="fill_parent"></CheckBox>\r
-       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox3" android:layout_height="fill_parent"></CheckBox>\r
-       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox4" android:layout_height="fill_parent"></CheckBox>\r
-       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox5" android:layout_height="fill_parent"></CheckBox>\r
-       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox6" android:layout_height="fill_parent"></CheckBox>\r
-       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox7" android:layout_height="fill_parent"></CheckBox>\r
-       <TextView android:text="開始時刻" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>\r
-       <TimePicker android:layout_width="fill_parent" android:id="@+id/timePicker1" android:layout_height="fill_parent"></TimePicker>\r
-       <TextView android:text="終了時刻" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>\r
-       <TimePicker android:layout_width="fill_parent" android:id="@+id/timePicker2" android:layout_height="fill_parent"></TimePicker>\r
+       <TextView android:text="曜日" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>\r
+       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox61" android:layout_height="fill_parent"></CheckBox>\r
+       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox62" android:layout_height="fill_parent"></CheckBox>\r
+       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox63" android:layout_height="fill_parent"></CheckBox>\r
+       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox64" android:layout_height="fill_parent"></CheckBox>\r
+       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox65" android:layout_height="fill_parent"></CheckBox>\r
+       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox66" android:layout_height="fill_parent"></CheckBox>\r
+       <CheckBox android:layout_width="fill_parent" android:text="CheckBox" android:id="@+id/checkBox67" android:layout_height="fill_parent"></CheckBox>\r
+       <TextView android:text="開始時刻" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>\r
+       <TimePicker android:layout_width="fill_parent" android:id="@+id/timePicker61" android:layout_height="fill_parent"></TimePicker>\r
+       <TextView android:text="終了時刻" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>\r
+       <TimePicker android:layout_width="fill_parent" android:id="@+id/timePicker62" android:layout_height="fill_parent"></TimePicker>\r
 </LinearLayout>\r
 </ScrollView>\r
-<LinearLayout android:id="@+id/LinearLayout74" android:layout_width="fill_parent" android:layout_height="wrap_content">\r
-       <Button android:text="追加" android:layout_weight="1" android:id="@+id/button71" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
-       <Button android:text="更新" android:layout_weight="1" android:id="@+id/button72" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
-       <Button android:text="戻る" android:layout_weight="1" android:id="@+id/button73" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
+<LinearLayout android:id="@+id/LinearLayout64" android:layout_width="fill_parent" android:layout_height="wrap_content">\r
+       <Button android:text="追加" android:layout_weight="3" android:id="@+id/button61" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
+       <Button android:text="更新" android:layout_weight="3" android:id="@+id/button62" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
+       <Button android:text="削除" android:layout_weight="3" android:id="@+id/button63" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
+       <Button android:text="確定" android:layout_weight="1" android:id="@+id/button64" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
+       <Button android:text="取消" android:layout_weight="3" android:id="@+id/button65" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
+       <Button android:text="戻る" android:layout_weight="3" android:id="@+id/button66" android:layout_width="fill_parent" android:layout_height="wrap_content" /> \r
 </LinearLayout>\r
 </LinearLayout>\r
index 8f53b20..4925fd9 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?> \r
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">\r
-            <TextView android:text="キーワード" android:id="@+id/textView1" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>\r
+            <TextView android:text="キーワード" android:id="@+id/textView1" android:background="#cccccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>\r
             <ListView android:id="@+id/listView81" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"></ListView>\r
             <EditText android:text="" android:id="@+id/editText81" android:layout_width="fill_parent" android:layout_height="wrap_content" android:inputType="text"></EditText>\r
 <LinearLayout android:id="@+id/LinearLayout74" android:layout_width="fill_parent" android:layout_height="wrap_content">\r
diff --git a/workspace/TrainDelayed/res/layout/simple_list_item_1.xml b/workspace/TrainDelayed/res/layout/simple_list_item_1.xml
new file mode 100644 (file)
index 0000000..633e1b9
--- /dev/null
@@ -0,0 +1,9 @@
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"\r
+android:id="@android:id/text1"\r
+android:layout_width="fill_parent"\r
+android:layout_height="wrap_content"\r
+android:textAppearance="?android:attr/textAppearanceLarge"\r
+android:gravity="center_vertical"\r
+android:paddingLeft="6dip"\r
+android:minHeight="?android:attr/listPreferredItemHeight"\r
+/>\r
index d1c717e..e0c2635 100644 (file)
@@ -4,6 +4,10 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     >
-<ListView android:id="@+id/menu1" android:layout_width="wrap_content"
-       android:layout_height="wrap_content"></ListView>
+       <ListView android:id="@+id/menu51" android:layout_width="wrap_content"
+               android:layout_height="wrap_content" android:layout_weight="1">
+       </ListView>
+       <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+               <Button android:text="戻る" android:layout_weight="1" android:id="@+id/button51" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
+       </LinearLayout>
 </LinearLayout>
index 93871b0..0190a47 100644 (file)
@@ -3,10 +3,12 @@
     <string name="hello">Hello World, TrainDelayedActivity!</string>
     <string name="app_name">TrainDelayed</string>
 
-    <string name="history_button">履歴を表示する</string>
+    <string name="update_route_button">路線の情報を更新する</string>
+    <string name="route_button">監視する路線を設定する</string>
+    <string name="monitor_button">監視する時間を設定する</string>
     <string name="start_service_button">監視を開始する</string>
     <string name="stop_service_button">監視を停止する</string>
-    <string name="route_button">路線を設定する</string>
-    <string name="keyword_button">検索キーワードを設定する</string>
-    <string name="monitor_button">監視時間を設定する</string>
+    <string name="history_button">履歴を表示する</string>
+    <string name="keyword_button">æ¤\9cç´¢ã\81\99ã\82\8bã\82­ã\83¼ã\83¯ã\83¼ã\83\89ã\82\92設å®\9aã\81\99ã\82\8b</string>
+    <string name="exit_button">終了する</string>
 </resources>
index 41cea8c..f683ab0 100644 (file)
@@ -15,6 +15,7 @@ import android.os.Bundle;
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
 import android.widget.Button;\r
+import android.widget.TextView;\r
 \r
 import com.td.db.History;\r
 import com.td.db.HistoryDao;\r
@@ -38,6 +39,7 @@ public class HistoryActivity extends BaseActivity {
 \r
        public static final int[] unit = { 10, 30, 60 };\r
 \r
+       private TextView textView1;\r
        private EditPrefUtil pref = new EditPrefUtil(this);\r
 \r
        private int prefYear;\r
@@ -75,47 +77,49 @@ public class HistoryActivity extends BaseActivity {
                                }\r
                        });\r
 \r
-                       HistoryDao dao = HistoryDao.getInstance();\r
-                       // List<History> list = dao.search(this);\r
-                       Calendar cal = Calendar.getInstance();\r
-                       Date date = cal.getTime();\r
-                       int ymd = DateUtil.getYmd(date);\r
-                       List<History> list = dao.search(this, ymd, DateUtil.HM_MIN,\r
-                                       DateUtil.HM_MAX);\r
-\r
-                       DefaultCategoryDataset dataset = new DefaultCategoryDataset();\r
-                       for (History history : list) {\r
-                               int period = history.getPeriod();\r
-                               double val = 0;\r
-                               if (period > 0) {\r
-                                       // TODO\r
-                                       // val = history.getNum() * 60 / period;\r
-                                       val = history.getNum();\r
-                               }\r
-                               int hm = history.getHm();\r
-                               String text = (hm / 100) + ":" + (hm % 100);\r
-                               String route = "<none>";\r
-                               switch (history.getRouteId()) {\r
-                               case 1:\r
-                                       route = "\8b\9e\95l\93\8c\96k\90ü";\r
-                                       break;\r
-                               case 2:\r
-                                       route = "\93\8c\8aC\93¹\90ü";\r
-                                       break;\r
-                               case 3:\r
-                                       route = "\8b\9e\8b}\90ü";\r
-                                       break;\r
-                               }\r
-                               Debug.d(this, route + " " + text + " " + val);\r
-                               dataset.setValue(val, route, text);\r
-                       }\r
-\r
-                       AFreeChart chart = ChartFactory.createLineChart("\82Â\82Ô\82â\82«\97\9a\97ð", "\8e\9e\8d\8f",\r
-                                       "\82Â\82Ô\82â\82«\90\94(\89ñ/\8e\9e)", dataset, PlotOrientation.VERTICAL, true,\r
-                                       false, false);\r
-\r
-                       HistoryView spcv = (HistoryView) findViewById(R.id.spcv);\r
-                       spcv.setChart(chart);\r
+                       textView1 = (TextView) findViewById(R.id.textView11);\r
+                       \r
+//                     HistoryDao dao = HistoryDao.getInstance();\r
+//                     // List<History> list = dao.search(this);\r
+//                     Calendar cal = Calendar.getInstance();\r
+//                     Date date = cal.getTime();\r
+//                     int ymd = DateUtil.getYmd(date);\r
+//                     List<History> list = dao.search(this, ymd, DateUtil.HM_MIN,\r
+//                                     DateUtil.HM_MAX);\r
+//\r
+//                     DefaultCategoryDataset dataset = new DefaultCategoryDataset();\r
+//                     for (History history : list) {\r
+//                             int period = history.getPeriod();\r
+//                             double val = 0;\r
+//                             if (period > 0) {\r
+//                                     // TODO\r
+//                                     // val = history.getNum() * 60 / period;\r
+//                                     val = history.getNum();\r
+//                             }\r
+//                             int hm = history.getHm();\r
+//                             String text = (hm / 100) + ":" + (hm % 100);\r
+//                             String route = "<none>";\r
+//                             switch (history.getRouteId()) {\r
+//                             case 1:\r
+//                                     route = "\8b\9e\95l\93\8c\96k\90ü";\r
+//                                     break;\r
+//                             case 2:\r
+//                                     route = "\93\8c\8aC\93¹\90ü";\r
+//                                     break;\r
+//                             case 3:\r
+//                                     route = "\8b\9e\8b}\90ü";\r
+//                                     break;\r
+//                             }\r
+//                             Debug.d(this, route + " " + text + " " + val);\r
+//                             dataset.setValue(val, route, text);\r
+//                     }\r
+//\r
+//                     AFreeChart chart = ChartFactory.createLineChart("\82Â\82Ô\82â\82«\97\9a\97ð", "\8e\9e\8d\8f",\r
+//                                     "\82Â\82Ô\82â\82«\90\94(\89ñ/\8e\9e)", dataset, PlotOrientation.VERTICAL, true,\r
+//                                     false, false);\r
+//\r
+//                     HistoryView spcv = (HistoryView) findViewById(R.id.spcv);\r
+//                     spcv.setChart(chart);\r
                } catch (Exception e) {\r
                        // TODO\r
                        Debug.d(this, null, e);\r
@@ -160,6 +164,63 @@ public class HistoryActivity extends BaseActivity {
                        prefUnit = pref.getInt(PREF_HIS_UNIT, 0);\r
 \r
                        pref.update();\r
+                       \r
+                       \r
+                       HistoryDao dao = HistoryDao.getInstance();\r
+//                     // List<History> list = dao.search(this);\r
+//                     Calendar cal = Calendar.getInstance();\r
+//                     Date date = cal.getTime();\r
+//                     int ymd = DateUtil.getYmd(date);\r
+                       // TODO\r
+//                     int ymd = (1900 + currentDate.getYear()) * 10000\r
+//                                     + (currentDate.getMonth() + 1) * 100\r
+//                                     + currentDate.getDate();\r
+//                     int from = prefStHour * 100 + prefStMinute;\r
+//                     int to = prefEnHour * 100 + prefEnMinute;\r
+                       int ymd = DateUtil.getYmd(currentDate.getYear(), currentDate.getMonth(), currentDate.getDate());\r
+                       int from = DateUtil.getHm(prefStHour, prefStMinute);\r
+                       int to = DateUtil.getHm(prefEnHour, prefEnMinute);\r
+                       List<History> list = dao.search(this, ymd, from, to);\r
+\r
+                       DefaultCategoryDataset dataset = new DefaultCategoryDataset();\r
+                       for (History history : list) {\r
+                               int period = history.getPeriod();\r
+                               double val = 0;\r
+                               if (period > 0) {\r
+                                       // TODO\r
+                                       // val = history.getNum() * 60 / period;\r
+                                       val = history.getNum();\r
+                               }\r
+                               int hm = history.getHm();\r
+                               // TODO\r
+                               //String text = (hm / 100) + ":" + (hm % 100);\r
+                               String text = DateUtil.formattedDate(hm);\r
+                               String route = "<none>";\r
+                               switch (history.getRouteId()) {\r
+                               case 1:\r
+                                       route = "\8b\9e\95l\93\8c\96k\90ü";\r
+                                       break;\r
+                               case 2:\r
+                                       route = "\93\8c\8aC\93¹\90ü";\r
+                                       break;\r
+                               case 3:\r
+                                       route = "\8b\9e\8b}\90ü";\r
+                                       break;\r
+                               }\r
+                               Debug.d(this, route + " " + text + " " + val);\r
+                               dataset.setValue(val, route, text);\r
+                       }\r
+\r
+                       AFreeChart chart = ChartFactory.createLineChart("\82Â\82Ô\82â\82«\97\9a\97ð", "\8e\9e\8d\8f",\r
+                                       "\82Â\82Ô\82â\82«\90\94(\89ñ/\8e\9e)", dataset, PlotOrientation.VERTICAL, true,\r
+                                       false, false);\r
+\r
+                       HistoryView spcv = (HistoryView) findViewById(R.id.spcv);\r
+                       spcv.setChart(chart);\r
+                       \r
+                       String text = DateUtil.formattedDate(ymd, from, to);\r
+                       textView1.setText(text);\r
+                       \r
                } catch (Exception e) {\r
                        // TODO\r
                        Debug.d(this, null, e);\r
index 1d81796..f16c820 100644 (file)
@@ -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
index 12a5788..b5699be 100644 (file)
 package com.td;\r
 \r
+import java.util.ArrayList;\r
+import java.util.List;\r
+\r
 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.OnItemClickListener;\r
+import android.widget.AdapterView.OnItemSelectedListener;\r
+import android.widget.ArrayAdapter;\r
+import android.widget.Button;\r
 import android.widget.CheckBox;\r
-import android.widget.CompoundButton;\r
-import android.widget.CompoundButton.OnCheckedChangeListener;\r
+import android.widget.ListView;\r
+import android.widget.ScrollView;\r
+import android.widget.TimePicker;\r
 \r
-import com.td.R;\r
-import com.td.utility.EditPrefUtil;\r
+import com.td.db.Monitor;\r
+import com.td.db.MonitorDao;\r
+import com.td.utility.DateUtil;\r
 \r
 public class MonitorTimeActivity extends Activity {\r
-       private static int N = 7;//TODO\r
-       private EditPrefUtil pref = new EditPrefUtil(this);\r
-       private int[] week = new int[N];\r
-    private CheckBox[] checkBoxes = new CheckBox[N];\r
-       \r
-    @Override\r
-    public void onCreate(Bundle savedInstanceState) {\r
-        super.onCreate(savedInstanceState);\r
-        setContentView(R.layout.monitor_time);\r
-\r
-               int n = 0;\r
-           week[n++] = pref.getInt(UI.PREF_MOT_WEEK0, 0);\r
-           week[n++] = pref.getInt(UI.PREF_MOT_WEEK1, 1);\r
-           week[n++] = pref.getInt(UI.PREF_MOT_WEEK2, 1);\r
-           week[n++] = pref.getInt(UI.PREF_MOT_WEEK3, 1);\r
-           week[n++] = pref.getInt(UI.PREF_MOT_WEEK4, 1);\r
-           week[n++] = pref.getInt(UI.PREF_MOT_WEEK5, 1);\r
-           week[n++] = pref.getInt(UI.PREF_MOT_WEEK6, 0);\r
-           \r
+       private static int N = 7;// TODO\r
+       private CheckBox[] checkBoxes = new CheckBox[N];\r
+\r
+       private MonitorDao dao;\r
+       private List<Monitor> list = new ArrayList<Monitor>();\r
+       private Monitor curMonitor = null;\r
+\r
+       private View mode = null;\r
+       private ListView listView;\r
+       private ScrollView scrollView;\r
+       private TimePicker timePicker1;\r
+       private TimePicker timePicker2;\r
+       private Button addButton;\r
+       private Button updateButton;\r
+       private Button deleteButton;\r
+       private Button confButton;\r
+       private Button cancelButton;\r
+       private Button closeButton;\r
+\r
+       @Override\r
+       public void onCreate(Bundle savedInstanceState) {\r
+               super.onCreate(savedInstanceState);\r
+               setContentView(R.layout.monitor_time);\r
+\r
+               listView = (ListView) findViewById(R.id.listView61);\r
+               scrollView = (ScrollView) findViewById(R.id.scrollView61);\r
+               timePicker1 = (TimePicker) findViewById(R.id.timePicker61);\r
+               timePicker2 = (TimePicker) findViewById(R.id.timePicker62);\r
+               addButton = (Button) findViewById(R.id.button61);\r
+               updateButton = (Button) findViewById(R.id.button62);\r
+               deleteButton = (Button) findViewById(R.id.button63);\r
+               confButton = (Button) findViewById(R.id.button64);\r
+               cancelButton = (Button) findViewById(R.id.button65);\r
+               closeButton = (Button) findViewById(R.id.button66);\r
                CheckBox checkBox;\r
-               for (int i = 0; i < N; i++){\r
-                       switch (i){\r
+               for (int i = 0; i < N; i++) {\r
+                       switch (i) {\r
                        case 0:\r
-                               checkBox = (CheckBox) findViewById(R.id.checkBox1);\r
+                               checkBox = (CheckBox) findViewById(R.id.checkBox61);\r
                                break;\r
                        case 1:\r
-                               checkBox = (CheckBox) findViewById(R.id.checkBox2);\r
+                               checkBox = (CheckBox) findViewById(R.id.checkBox62);\r
                                break;\r
                        case 2:\r
-                               checkBox = (CheckBox) findViewById(R.id.checkBox3);\r
+                               checkBox = (CheckBox) findViewById(R.id.checkBox63);\r
                                break;\r
                        case 3:\r
-                               checkBox = (CheckBox) findViewById(R.id.checkBox4);\r
+                               checkBox = (CheckBox) findViewById(R.id.checkBox64);\r
                                break;\r
                        case 4:\r
-                               checkBox = (CheckBox) findViewById(R.id.checkBox5);\r
+                               checkBox = (CheckBox) findViewById(R.id.checkBox65);\r
                                break;\r
                        case 5:\r
-                               checkBox = (CheckBox) findViewById(R.id.checkBox6);\r
+                               checkBox = (CheckBox) findViewById(R.id.checkBox66);\r
                                break;\r
                        case 6:\r
-                               checkBox = (CheckBox) findViewById(R.id.checkBox7);\r
+                               checkBox = (CheckBox) findViewById(R.id.checkBox67);\r
                                break;\r
                        default:\r
                                checkBox = null;\r
                                break;\r
                        }\r
                        checkBoxes[i] = checkBox;\r
-                       checkBox.setOnCheckedChangeListener(new OnCheckedChangeListener(){\r
-                               public void onCheckedChanged(CompoundButton buttonView,\r
-                                               boolean isChecked) {\r
-                                       int index = getCheckBoxIndex(buttonView);\r
-                                       if (index >= 0){\r
-                                               pref.put(UI.PREF_MOT_WEEK[index], toInt(isChecked));\r
-                                               \r
-                                       }                                       \r
-                               }});\r
-                       checkBox.setChecked(toBoolean(week[i]));\r
                }\r
-    }\r
-\r
-    private boolean toBoolean(int n){\r
-       return (n != 0)? true : false;\r
-    }\r
-    \r
-    private int toInt(boolean b){\r
-       return (b)? 1 : 0;\r
-    }\r
-    \r
-    private int getCheckBoxIndex(CompoundButton checkBox){\r
-       for (int i = 0; i < checkBoxes.length; i++){\r
-               if (checkBoxes[i] == checkBox){\r
-                       return i;\r
-               }\r
-       }\r
-       return -1;\r
-    }\r
-    \r
+\r
+               dao = MonitorDao.getInstance();\r
+               updateList();\r
+\r
+               listView.setOnItemClickListener(new OnItemClickListener() {\r
+                       public void onItemClick(AdapterView<?> parent, View view,\r
+                                       int position, long id) {\r
+                               selectedItemView(parent, view, position, id);\r
+                       }\r
+               });\r
+               listView.setOnItemSelectedListener(new OnItemSelectedListener() {\r
+                       public void onItemSelected(AdapterView<?> parent, View view,\r
+                                       int position, long id) {\r
+                               selectedItemView(parent, view, position, id);\r
+                       }\r
+\r
+                       public void onNothingSelected(AdapterView<?> arg0) {\r
+                               ;\r
+                       }\r
+               });\r
+\r
+               addButton.setOnClickListener(new OnClickListener() {\r
+                       public void onClick(View view) {\r
+                               clickAddButton();\r
+                       }\r
+               });\r
+\r
+               updateButton.setOnClickListener(new OnClickListener() {\r
+                       public void onClick(View view) {\r
+                               clickUpdateButton();\r
+                       }\r
+               });\r
+\r
+               deleteButton.setOnClickListener(new OnClickListener() {\r
+                       public void onClick(View view) {\r
+                               clickDeleteButton();\r
+                       }\r
+               });\r
+\r
+               cancelButton.setOnClickListener(new OnClickListener() {\r
+                       public void onClick(View view) {\r
+                               clickCancelButton();\r
+                       }\r
+               });\r
+\r
+               confButton.setOnClickListener(new OnClickListener() {\r
+                       public void onClick(View view) {\r
+                               clickConfButton();\r
+                       }\r
+               });\r
+\r
+               closeButton.setOnClickListener(new OnClickListener() {\r
+                       public void onClick(View view) {\r
+                               clickCloseButton();\r
+                       }\r
+               });\r
+       }\r
+\r
+       private void updateList() {\r
+               list = dao.search();\r
+               ArrayAdapter<Monitor> adapter = new ArrayAdapter<Monitor>(this,\r
+                               android.R.layout.simple_list_item_1, list);\r
+               listView.setAdapter(adapter);\r
+       }\r
+\r
        @Override\r
        protected void onStart() {\r
                super.onStart();\r
+\r
+               setStatus(null);\r
        }\r
 \r
-       @Override\r
-       protected void onStop() {\r
-               pref.update();\r
+       private void selectedItemView(AdapterView<?> parent, View view,\r
+                       int position, long id) {\r
+               curMonitor = list.get(position);\r
+               // String text = curMonitor.getText();\r
+               // editText.setText(text);\r
+               setItems(curMonitor);\r
                \r
-               super.onStop();\r
+               setStatus(listView);\r
        }\r
+\r
+       private void clickAddButton() {\r
+               // editText.setText("");\r
+               Monitor monitor = Monitor.getMonitor();\r
+               setItems(monitor);\r
+\r
+               curMonitor = null;\r
+               setStatus(addButton);\r
+               // changedEditText();\r
+       }\r
+\r
+       private void clickUpdateButton() {\r
+               setStatus(updateButton);\r
+               // changedEditText();\r
+       }\r
+\r
+       private void clickDeleteButton() {\r
+               setStatus(deleteButton);\r
+       }\r
+\r
+       private void clickCancelButton() {\r
+               curMonitor = null;\r
+               setStatus(cancelButton);\r
+       }\r
+\r
+       private void clickConfButton() {\r
+               Monitor monitor;\r
+               int id;\r
+\r
+               if (mode == addButton) {\r
+                       monitor = getMonitor(-1);\r
+                       dao.add(monitor);\r
+                       updateList();\r
+               } else if (mode == updateButton) {\r
+                       monitor = getMonitor(curMonitor.getId());\r
+                       dao.set(monitor);\r
+                       updateList();\r
+               } else if (mode == deleteButton) {\r
+                       id = curMonitor.getId();\r
+                       dao.delete(id);\r
+                       updateList();\r
+               }\r
+               curMonitor = null;\r
+               setStatus(confButton);\r
+       }\r
+\r
+       private void clickCloseButton() {\r
+               setStatus(closeButton);\r
+               this.finish();\r
+       }\r
+\r
+       private void setStatus(View view) {\r
+               if (view == null) {\r
+                       listView.setEnabled(true);\r
+                       scrollView.setVisibility(View.GONE);\r
+                       setItemsEnabled(false);\r
+                       addButton.setVisibility(View.VISIBLE);\r
+                       addButton.setEnabled(true);\r
+                       updateButton.setVisibility(View.VISIBLE);\r
+                       updateButton.setEnabled(false);\r
+                       deleteButton.setVisibility(View.VISIBLE);\r
+                       deleteButton.setEnabled(false);\r
+                       confButton.setVisibility(View.GONE);\r
+                       confButton.setEnabled(true);\r
+                       cancelButton.setVisibility(View.GONE);\r
+                       closeButton.setVisibility(View.VISIBLE);\r
+               } else if (view == listView) {\r
+                       scrollView.setVisibility(View.VISIBLE);\r
+                       setItemsEnabled(false);\r
+                       addButton.setEnabled(false);\r
+                       updateButton.setEnabled(true);\r
+                       deleteButton.setEnabled(true);\r
+                       cancelButton.setVisibility(View.VISIBLE);\r
+                       closeButton.setVisibility(View.GONE);\r
+               } else if (view == addButton) {\r
+                       listView.setEnabled(false);\r
+                       scrollView.setVisibility(View.VISIBLE);\r
+                       setItemsEnabled(true);\r
+                       addButton.setVisibility(View.GONE);\r
+                       updateButton.setVisibility(View.GONE);\r
+                       deleteButton.setVisibility(View.GONE);\r
+                       confButton.setVisibility(View.VISIBLE);\r
+                       cancelButton.setVisibility(View.VISIBLE);\r
+                       closeButton.setVisibility(View.GONE);\r
+               } else if (view == updateButton) {\r
+                       setItemsEnabled(true);\r
+                       addButton.setVisibility(View.GONE);\r
+                       updateButton.setVisibility(View.GONE);\r
+                       deleteButton.setVisibility(View.GONE);\r
+                       confButton.setVisibility(View.VISIBLE);\r
+                       cancelButton.setVisibility(View.VISIBLE);\r
+                       closeButton.setVisibility(View.GONE);\r
+               } else if (view == deleteButton) {\r
+                       addButton.setVisibility(View.GONE);\r
+                       updateButton.setVisibility(View.GONE);\r
+                       deleteButton.setVisibility(View.GONE);\r
+                       confButton.setVisibility(View.VISIBLE);\r
+                       cancelButton.setVisibility(View.VISIBLE);\r
+                       closeButton.setVisibility(View.GONE);\r
+               } else if (view == confButton) {\r
+                       setStatus(null);\r
+               } else if (view == cancelButton) {\r
+                       setStatus(null);\r
+               } else if (view == closeButton) {\r
+                       setStatus(null);\r
+               }\r
+               mode = view;\r
+       }\r
+\r
+       private void setItemsEnabled(boolean enabled) {\r
+               //listView.setEnabled(enabled);\r
+               scrollView.setEnabled(enabled);\r
+               timePicker1.setEnabled(enabled);\r
+               timePicker2.setEnabled(enabled);\r
+               for (int i = 0; i < N; i++) {\r
+                       checkBoxes[i].setEnabled(enabled);\r
+               }\r
+       }\r
+\r
+       private void setItems(Monitor monitor){\r
+               int from = monitor.getFrom();\r
+               int to = monitor.getTo();\r
+               \r
+               timePicker1.setCurrentHour(from / 100);\r
+               timePicker1.setCurrentMinute(from % 100);\r
+               timePicker2.setCurrentHour(to / 100);\r
+               timePicker2.setCurrentMinute(to % 100);\r
+               for (int i = 0; i < N; i++) {\r
+                       checkBoxes[i].setChecked(monitor.getWeek(i));\r
+               }\r
+       }\r
+       \r
+       private Monitor getMonitor(int id){\r
+               int h1 = timePicker1.getCurrentHour();\r
+               int m1 = timePicker1.getCurrentMinute();\r
+               int h2 = timePicker2.getCurrentHour();\r
+               int m2 = timePicker2.getCurrentMinute();\r
+               int hm1 = DateUtil.getHm(h1, m1);\r
+               int hm2 = DateUtil.getHm(h2, m2);\r
+\r
+               Monitor monitor = new Monitor(id, hm1, hm2);\r
+               for (int i = 0; i < N; i++){\r
+                       monitor.setWeek(i, checkBoxes[i].isChecked());\r
+               }\r
+               return monitor;\r
+       }\r
+\r
+       // TODO\r
+//     private int getCheckBoxIndex(CompoundButton checkBox) {\r
+//             for (int i = 0; i < checkBoxes.length; i++) {\r
+//                     if (checkBoxes[i] == checkBox) {\r
+//                             return i;\r
+//                     }\r
+//             }\r
+//             return -1;\r
+//     }\r
 }\r
index 7e470db..9290751 100644 (file)
@@ -218,10 +218,11 @@ public class SearchWordActivity extends Activity {
                        deleteButton.setVisibility(View.VISIBLE);\r
                        deleteButton.setEnabled(false);\r
                        confButton.setVisibility(View.GONE);\r
+                       confButton.setEnabled(true);\r
                        cancelButton.setVisibility(View.GONE);\r
                        closeButton.setVisibility(View.VISIBLE);\r
                }\r
-               if (view == listView) {\r
+               else if (view == listView) {\r
                        editText.setVisibility(View.VISIBLE);\r
                        editText.setEnabled(false);\r
                        addButton.setEnabled(false);\r
index 22c2833..da703d8 100644 (file)
@@ -16,23 +16,6 @@ import com.td.service.TrainDelayedServiceImpl;
 import com.td.utility.BaseActivity;
 
 public class TrainDelayedActivity extends BaseActivity {
-       public static final String PREF_MOT_WEEK0 = "MOT_WEEK0";
-       public static final String PREF_MOT_WEEK1 = "MOT_WEEK1";
-       public static final String PREF_MOT_WEEK2 = "MOT_WEEK2";
-       public static final String PREF_MOT_WEEK3 = "MOT_WEEK3";
-       public static final String PREF_MOT_WEEK4 = "MOT_WEEK4";
-       public static final String PREF_MOT_WEEK5 = "MOT_WEEK5";
-       public static final String PREF_MOT_WEEK6 = "MOT_WEEK6";
-       public static final String[] PREF_MOT_WEEK = {
-               PREF_MOT_WEEK0,
-               PREF_MOT_WEEK1,
-               PREF_MOT_WEEK2,
-               PREF_MOT_WEEK3,
-               PREF_MOT_WEEK4,
-               PREF_MOT_WEEK5,
-               PREF_MOT_WEEK6
-       };
-
        private AsyncTwitterFactory factory = new AsyncTwitterFactory();
        private AsyncTwitter twitter = factory.getInstance();
 
@@ -48,63 +31,40 @@ public class TrainDelayedActivity extends BaseActivity {
                final TrainTwitterAdapter listener = new TrainTwitterAdapter(this);
                twitter.addListener(listener);
 
-               Button button1 = (Button) this.findViewById(R.id.button1);
-               button1.setOnClickListener(new OnClickListener() {
-                       public void onClick(View view) {
-                               Intent intent = new Intent(TrainDelayedActivity.this,
-                                               (Class<?>)MonitorTimeActivity.class);
-                               startActivityForResult(intent, -1);
-                       }
-               });
-
-               Button button2 = (Button) this.findViewById(R.id.button2);
+               Button button2 = (Button) this.findViewById(R.id.button02);
                button2.setOnClickListener(new OnClickListener() {
                        public void onClick(View view) {
                                Intent intent = new Intent(TrainDelayedActivity.this,
-                                               (Class<?>)SearchWordActivity.class);
+                                               (Class<?>) TrainListActivity.class);
                                startActivityForResult(intent, -1);
                        }
                });
 
-               Button button3 = (Button) this.findViewById(R.id.button3);
+               Button button3 = (Button) this.findViewById(R.id.button03);
                button3.setOnClickListener(new OnClickListener() {
                        public void onClick(View view) {
-                               HistoryActivity.init(TrainDelayedActivity.this);
                                Intent intent = new Intent(TrainDelayedActivity.this,
-                                               (Class<?>) HistoryActivity.class);
+                                               (Class<?>)MonitorTimeActivity.class);
                                startActivityForResult(intent, -1);
                        }
                });
-
-               Button button4 = (Button) this.findViewById(R.id.button4);
+               
+               Button button4 = (Button) this.findViewById(R.id.button04);
                button4.setOnClickListener(new OnClickListener() {
                        public void onClick(View view) {
                                // \83T\81[\83r\83X\82ð\8aJ\8en
                                Intent intent = new Intent(TrainDelayedActivity.this,
                                                TrainDelayedServiceImpl.class);
                                startService(intent);
-
-                               // IntentFilter filter = new
-                               // IntentFilter(TrainDelayedServiceImpl.ACTION);
-                               // registerReceiver(receiver, filter);
-                               //
-                               // // \83T\81[\83r\83X\82É\83o\83C\83\93\83h
-                               // bindService(intent, serviceConnection,
-                               // Context.BIND_AUTO_CREATE);
                        }
                });
 
-               Button button5 = (Button) this.findViewById(R.id.button5);
+               Button button5 = (Button) this.findViewById(R.id.button05);
                button5.setOnClickListener(new OnClickListener() {
                        public void onClick(View view) {
-                               // if (trainDelayedService != null){
-                               // trainDelayedService.cancel();
-                               // }
-                               HistoryDao.getInstance().delete(TrainDelayedActivity.this);
                                // TODO
-                               // unbindService(serviceConnection); // \83o\83C\83\93\83h\89ð\8f\9c
-                               // unregisterReceiver(receiver); // \93o\98^\89ð\8f\9c
-                               // trainDelayedService.stopSelf(); // \83T\81[\83r\83X\82Í\95K\97v\82È\82¢\82Ì\82Å\8fI\97¹\82³\82¹\82é\81B
+                               HistoryDao.getInstance().delete(TrainDelayedActivity.this);
+
                                Intent intent = new Intent(TrainDelayedActivity.this,
                                                TrainDelayedServiceImpl.class);
                                PendingIntent alarmSender = PendingIntent.getService(
@@ -113,15 +73,32 @@ public class TrainDelayedActivity extends BaseActivity {
                                alerm.cancel(alarmSender);
                        }
                });
-
-               Button button6 = (Button) this.findViewById(R.id.button6);
+               
+               Button button6 = (Button) this.findViewById(R.id.button06);
                button6.setOnClickListener(new OnClickListener() {
                        public void onClick(View view) {
+                               HistoryActivity.init(TrainDelayedActivity.this);
                                Intent intent = new Intent(TrainDelayedActivity.this,
-                                               (Class<?>) TrainListActivity.class);
+                                               (Class<?>) HistoryActivity.class);
+                               startActivityForResult(intent, -1);
+                       }
+               });
+                       
+               Button button7 = (Button) this.findViewById(R.id.button07);
+               button7.setOnClickListener(new OnClickListener() {
+                       public void onClick(View view) {
+                               Intent intent = new Intent(TrainDelayedActivity.this,
+                                               (Class<?>)SearchWordActivity.class);
                                startActivityForResult(intent, -1);
                        }
                });
+
+               Button button9 = (Button) this.findViewById(R.id.button09);
+               button9.setOnClickListener(new OnClickListener() {
+                       public void onClick(View view) {
+                               TrainDelayedActivity.this.finish();
+                       }
+               });
        }
 
        // private class TrainDelayedReceiver extends BroadcastReceiver {
index c094087..dc3a2d6 100644 (file)
@@ -4,45 +4,52 @@ import java.util.List;
 \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.OnItemClickListener;\r
-import android.widget.ImageView;\r
+import android.widget.Button;\r
+import android.widget.CheckBox;\r
 import android.widget.ListView;\r
 \r
 import com.td.db.Train;\r
 import com.td.db.TrainDao;\r
 import com.td.utility.BaseActivity;\r
-import com.td.utility.ListViewArrayAdapter;\r
 \r
 public class TrainListActivity extends BaseActivity {\r
-       private ListView listView;\r
-       \r
        @Override\r
        public void onCreate(Bundle savedInstanceState) {\r
                super.onCreate(savedInstanceState);\r
                setContentView(R.layout.train_list);\r
                \r
-               final List<Train> list = TrainDao.getInstance().search();\r
                \r
-               listView = (ListView) findViewById(R.id.menu1);\r
-               ListViewArrayAdapter adapter = new ListViewArrayAdapter(this,\r
+               ListView listView = (ListView) findViewById(R.id.menu51);\r
+               Button button1 = (Button) findViewById(R.id.button51);\r
+               \r
+               final List<Train> list = TrainDao.getInstance().search();\r
+               TrainListViewArrayAdapter adapter = new TrainListViewArrayAdapter(this,\r
                                android.R.layout.simple_list_item_1, list);\r
                listView.setAdapter(adapter);\r
 \r
                listView.setOnItemClickListener(new OnItemClickListener() {\r
                        public void onItemClick(AdapterView<?> parent, View view, int position,\r
                                        long id) {\r
-                               ImageView image = (ImageView)view.findViewById(R.id.imageView1);\r
                                Train item = list.get(position);\r
                                boolean selected = item.isSelected();\r
                                \r
                                selected = !selected;\r
                                item.setSelected(selected);\r
-                               image.setImageResource((selected)? R.drawable.on : R.drawable.off);\r
+                               \r
+                       CheckBox checkbox = (CheckBox)view.findViewById(R.id.checkBox);\r
+                       checkbox.setChecked(selected);\r
                                \r
                                int n = item.getId();\r
                                TrainDao.getInstance().set(n, selected);\r
                        }\r
                });\r
+               \r
+               button1.setOnClickListener(new OnClickListener(){\r
+                       public void onClick(View view) {\r
+                               TrainListActivity.this.finish();\r
+                       }});\r
        }\r
 }\r
diff --git a/workspace/TrainDelayed/src/com/td/TrainListViewArrayAdapter.java b/workspace/TrainDelayed/src/com/td/TrainListViewArrayAdapter.java
new file mode 100644 (file)
index 0000000..bae1984
--- /dev/null
@@ -0,0 +1,43 @@
+package com.td;\r
+\r
+import java.util.List;\r
+\r
+import android.content.Context;\r
+import android.view.LayoutInflater;\r
+import android.view.View;\r
+import android.view.ViewGroup;\r
+import android.widget.ArrayAdapter;\r
+import android.widget.CheckBox;\r
+import android.widget.TextView;\r
+\r
+import com.td.db.Train;\r
+\r
+public class TrainListViewArrayAdapter extends ArrayAdapter<Train> {\r
+    private LayoutInflater inflater;\r
+\r
+    public TrainListViewArrayAdapter(Context context, int resourceId, List<Train> items) {\r
+        super(context, resourceId, items);\r
+        this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);\r
+    }\r
+\r
+    @Override\r
+    public View getView(int position, View convertView, ViewGroup parent){\r
+        View view = convertView;  \r
+        if(view == null){  \r
+            view = inflater.inflate(R.layout.check_list_item_1, null);  \r
+        }      \r
+\r
+        Train item = getItem(position);\r
+        \r
+        boolean selected = item.isSelected();\r
+        CheckBox checkbox = (CheckBox)view.findViewById(R.id.checkBox);\r
+        checkbox.setEnabled(false);\r
+        checkbox.setChecked(selected);\r
+\r
+        TextView text = (TextView)view.findViewById(R.id.text2);  \r
+        text.setText(item.getName());  \r
+        \r
+        return view;\r
+    }\r
+    \r
+}\r
diff --git a/workspace/TrainDelayed/src/com/td/UI.java b/workspace/TrainDelayed/src/com/td/UI.java
deleted file mode 100644 (file)
index 2a2e645..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.td;\r
-\r
-import java.util.Calendar;\r
-import java.util.Date;\r
-\r
-import android.app.Activity;\r
-import android.content.Intent;\r
-import android.os.Bundle;\r
-import android.view.View;\r
-import android.view.View.OnClickListener;\r
-import android.widget.Button;\r
-\r
-import com.td.R;\r
-import com.td.utility.EditPrefUtil;\r
-\r
-public class UI extends Activity {\r
-       public static final String PREF_HIS_YEAR = "HIS_YEAR";\r
-       public static final String PREF_HIS_MONTH = "HIS_MONTH";\r
-       public static final String PREF_HIS_DAY = "HIS_DAY";\r
-       public static final String PREF_HIS_YMD_POS = "HIS_YMD_POS";\r
-\r
-       public static final String PREF_HIS_ST_HOUR = "HIS_ST_HOUR";\r
-       public static final String PREF_HIS_ST_MINUTE = "HIS_ST_MINUTE";\r
-       public static final String PREF_HIS_EN_HOUR = "HIS_EN_HOUR";\r
-       public static final String PREF_HIS_EN_MINUTE = "HIS_EN_MINUTE";\r
-       \r
-       public static final String PREF_HIS_UNIT = "HIS_UNIT";\r
-       \r
-       public static final String PREF_MOT_WEEK0 = "MOT_WEEK0";\r
-       public static final String PREF_MOT_WEEK1 = "MOT_WEEK1";\r
-       public static final String PREF_MOT_WEEK2 = "MOT_WEEK2";\r
-       public static final String PREF_MOT_WEEK3 = "MOT_WEEK3";\r
-       public static final String PREF_MOT_WEEK4 = "MOT_WEEK4";\r
-       public static final String PREF_MOT_WEEK5 = "MOT_WEEK5";\r
-       public static final String PREF_MOT_WEEK6 = "MOT_WEEK6";\r
-       public static final String[] PREF_MOT_WEEK = {\r
-               PREF_MOT_WEEK0,\r
-               PREF_MOT_WEEK1,\r
-               PREF_MOT_WEEK2,\r
-               PREF_MOT_WEEK3,\r
-               PREF_MOT_WEEK4,\r
-               PREF_MOT_WEEK5,\r
-               PREF_MOT_WEEK6\r
-       };\r
-\r
-       public static final int[] unit = { 10, 30, 60 };\r
-       \r
-       private EditPrefUtil pref = new EditPrefUtil(this);\r
-       \r
-       private int prefYear;\r
-       private int prefMonth;\r
-       private int prefDay;\r
-       private int prefYmdPos;\r
-       private int prefUnit;\r
-\r
-       private int prefStHour;\r
-       private int prefStMinute;\r
-       private int prefEnHour;\r
-       private int prefEnMinute;\r
-\r
-       private Date currentDate;\r
-       \r
-    @Override\r
-    public void onCreate(Bundle savedInstanceState) {\r
-        super.onCreate(savedInstanceState);\r
-        setContentView(R.layout.main);\r
-\r
-               Button button1 = (Button) findViewById(R.id.button1);\r
-               button1.setOnClickListener(new OnClickListener() {\r
-                       public void onClick(View view) {\r
-                               Intent intent = new Intent(UI.this, (Class<?>)HistoryConfActivity.class);\r
-                               startActivityForResult(intent, -1);     \r
-                       }\r
-               });             \r
-               \r
-               Button button2 = (Button) findViewById(R.id.button2);\r
-               button2.setOnClickListener(new OnClickListener() {\r
-                       public void onClick(View view) {\r
-                               Intent intent = new Intent(UI.this, (Class<?>)MonitorTimeActivity.class);\r
-                               startActivityForResult(intent, -1);     \r
-                       }\r
-               });             \r
-    }\r
-\r
-       @Override\r
-       protected void onStart() {\r
-               super.onStart();\r
-\r
-               Calendar cal = Calendar.getInstance();\r
-        Date date = cal.getTime();\r
-        prefYear = pref.getInt(PREF_HIS_YEAR, date.getYear());\r
-        prefMonth = pref.getInt(PREF_HIS_MONTH, date.getMonth());\r
-        prefDay = pref.getInt(PREF_HIS_DAY, date.getDate());\r
-        \r
-               int H = 3;\r
-        prefEnHour = pref.getInt(PREF_HIS_EN_HOUR, date.getHours());\r
-        prefEnMinute = pref.getInt(PREF_HIS_EN_MINUTE, date.getMinutes());\r
-        cal = Calendar.getInstance();\r
-        cal.set(Calendar.HOUR_OF_DAY, prefEnHour);\r
-        cal.set(Calendar.MINUTE, prefEnMinute);\r
-        date = cal.getTime();\r
-               cal.add(Calendar.HOUR, -H);\r
-        Date startDate = cal.getTime();\r
-        int hour = 0;\r
-        int minute = 0;\r
-        if (date.getDate() == startDate.getDate()){\r
-               hour = startDate.getHours();\r
-               minute = startDate.getMinutes();\r
-        }\r
-        prefStHour = pref.getInt(PREF_HIS_ST_HOUR, hour);\r
-        prefStMinute = pref.getInt(PREF_HIS_ST_MINUTE, minute);\r
-\r
-        int M = 7;\r
-        prefYmdPos = pref.getInt(PREF_HIS_YMD_POS, M - 1);\r
-        \r
-        cal.add(Calendar.DATE, -(M - (prefYmdPos + 1)));\r
-        currentDate = cal.getTime();\r
-        \r
-               prefUnit = pref.getInt(PREF_HIS_UNIT, 0);\r
-               \r
-               pref.update();\r
-       }\r
-\r
-       @Override\r
-       protected void onDestroy() {\r
-               // init();\82É\82·\82é\r
-               pref.remove(PREF_HIS_YEAR);\r
-               pref.remove(PREF_HIS_MONTH);\r
-               pref.remove(PREF_HIS_DAY);\r
-               pref.remove(PREF_HIS_YMD_POS);\r
-               pref.remove(PREF_HIS_UNIT);\r
-               \r
-               pref.remove(PREF_MOT_WEEK0);\r
-               pref.remove(PREF_MOT_WEEK1);\r
-               pref.remove(PREF_MOT_WEEK2);\r
-               pref.remove(PREF_MOT_WEEK3);\r
-               pref.remove(PREF_MOT_WEEK4);\r
-               pref.remove(PREF_MOT_WEEK5);\r
-               pref.remove(PREF_MOT_WEEK6);\r
-\r
-               pref.update();\r
-               \r
-               super.onDestroy();\r
-       }\r
-}\r
index 4527aca..a3346c2 100644 (file)
@@ -29,6 +29,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                try {\r
                        TrainDao.getInstance().start(db);\r
                        KeywordDao.getInstance().start(db);\r
+                       MonitorDao.getInstance().start(db);\r
                }\r
                catch (Exception e){\r
                        Debug.d(context, null, e);\r
@@ -44,6 +45,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
        public void onCreate(SQLiteDatabase db) {\r
                TrainDao trainDao = TrainDao.getInstance();\r
                KeywordDao keywordDao = KeywordDao.getInstance();\r
+               MonitorDao monitorDao = MonitorDao.getInstance();\r
 \r
                try {\r
                        trainDao.onCreate(db);\r
@@ -52,10 +54,14 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                        keywordDao.onCreate(db);\r
                        keywordDao.start(db);\r
 \r
+                       monitorDao.onCreate(db);\r
+                       monitorDao.start(db);\r
+\r
                        db.beginTransaction();\r
                        try {\r
                                trainDao.init(db);\r
                                keywordDao.init(db);\r
+                               monitorDao.init(db);\r
 \r
                                db.setTransactionSuccessful();\r
                        } finally {\r
index 9baadaa..3929ad8 100644 (file)
@@ -24,7 +24,7 @@ public class HistoryDao {
                \r
        }\r
        \r
-       public List<History> search(Context context, String selection, String[] selectionArgs){\r
+       private List<History> search(Context context, String selection, String[] selectionArgs){\r
                ContentResolver resolver = context.getContentResolver();\r
                Cursor cursor = resolver.query(HistoryContentProvider.CONTENT_URI,\r
                                HistoryContentProvider.Projection.projection,\r
index 31d58ae..f24555d 100644 (file)
@@ -28,7 +28,7 @@ public class KeywordDao {
        \r
        public void onCreate(SQLiteDatabase db) {\r
                db.execSQL(\r
-                               "CREATE TABLE keyword ("\r
+                               "CREATE TABLE KEYWORD ("\r
                                + android.provider.BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"\r
                                + "TEXT TEXT"\r
                                + ");");\r
diff --git a/workspace/TrainDelayed/src/com/td/db/Monitor.java b/workspace/TrainDelayed/src/com/td/db/Monitor.java
new file mode 100644 (file)
index 0000000..897dc6e
--- /dev/null
@@ -0,0 +1,72 @@
+package com.td.db;\r
+\r
+import java.util.Calendar;\r
+import java.util.Date;\r
+\r
+import com.td.utility.DateUtil;\r
+\r
+public class Monitor {\r
+       private int id;\r
+       private boolean[] week;\r
+       private int from;\r
+       private int to;\r
+       \r
+       public Monitor(int id,  int from, int to){\r
+               this.id = id;\r
+               this.from = from;\r
+               this.to = to;\r
+               \r
+               week = new boolean[7]; //TODO\r
+               for (int i = 0; i < week.length; i++){\r
+                       week[i] = false;\r
+               }\r
+       }\r
+       \r
+       public Monitor(int from, int to){\r
+               this(-1, from, to);\r
+       }\r
+       \r
+       public static Monitor getMonitor(){\r
+               Calendar cal = Calendar.getInstance();\r
+               Date date = cal.getTime();\r
+               int from = DateUtil.getHm(date);\r
+               int to = DateUtil.getHm(date);\r
+\r
+               return new Monitor(-1, from, to);\r
+       }\r
+       \r
+       public boolean getWeek(int index) {\r
+               return week[index];\r
+       }\r
+\r
+       public void setWeek(int index, boolean status) {\r
+               week[index] = status;\r
+       }\r
+\r
+       public int getId() {\r
+               return id;\r
+       }\r
+\r
+       public int getFrom() {\r
+               return from;\r
+       }\r
+\r
+       public int getTo() {\r
+               return to;\r
+       }\r
+\r
+       @Override\r
+       public String toString(){\r
+               StringBuffer sb = new StringBuffer();\r
+               sb.append(DateUtil.formattedDate(from));\r
+               sb.append(" - ");\r
+               sb.append(DateUtil.formattedDate(to));\r
+               sb.append(" ");\r
+               for (int i = 0; i < week.length; i++){\r
+                       if (week[i]){\r
+                               sb.append(DateUtil.toName(i));                          \r
+                       }\r
+               }\r
+               return sb.toString();\r
+       }\r
+}\r
diff --git a/workspace/TrainDelayed/src/com/td/db/MonitorDao.java b/workspace/TrainDelayed/src/com/td/db/MonitorDao.java
new file mode 100644 (file)
index 0000000..a3e39e7
--- /dev/null
@@ -0,0 +1,210 @@
+package com.td.db;\r
+\r
+import java.util.ArrayList;\r
+import java.util.List;\r
+\r
+import android.database.Cursor;\r
+import android.database.sqlite.SQLiteDatabase;\r
+import android.database.sqlite.SQLiteStatement;\r
+\r
+import com.td.utility.Debug;\r
+import com.td.utility.Util;\r
+\r
+public class MonitorDao {\r
+       private static MonitorDao instance = null;\r
+       private SQLiteStatement insertStmt = null;\r
+       private SQLiteStatement updateStmt = null;\r
+       private SQLiteStatement deleteStmt = null;\r
+       \r
+       public static MonitorDao getInstance(){\r
+               if (instance == null){\r
+                       instance = new MonitorDao();\r
+               }\r
+               return instance;\r
+       }       \r
+       \r
+       private MonitorDao(){\r
+\r
+       }\r
+       \r
+       public void onCreate(SQLiteDatabase db) {\r
+               db.execSQL(\r
+                               "CREATE TABLE MONITOR ("\r
+                               + android.provider.BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"\r
+                               + "WEEK0 INTEGER,"\r
+                               + "WEEK1 INTEGER,"\r
+                               + "WEEK2 INTEGER,"\r
+                               + "WEEK3 INTEGER,"\r
+                               + "WEEK4 INTEGER,"\r
+                               + "WEEK5 INTEGER,"\r
+                               + "WEEK6 INTEGER,"\r
+                               + "FRM INTEGER,"\r
+                               + "TT INTEGER"\r
+                               + ");");\r
+       }\r
+       \r
+       public void init(SQLiteDatabase db)\r
+       {\r
+               Monitor monitor = new Monitor(600, 800);\r
+               int n = 1;\r
+               monitor.setWeek(n++, true);\r
+               monitor.setWeek(n++, true);\r
+               monitor.setWeek(n++, true);\r
+               monitor.setWeek(n++, true);\r
+               monitor.setWeek(n++, true);\r
+               add(db, monitor);                       \r
+       }\r
+\r
+       public void start(SQLiteDatabase db) {\r
+               insertStmt = db.compileStatement(\r
+                               "INSERT INTO MONITOR ("\r
+                                               + "WEEK0,"\r
+                                               + "WEEK1,"\r
+                                               + "WEEK2,"\r
+                                               + "WEEK3,"\r
+                                               + "WEEK4,"\r
+                                               + "WEEK5,"\r
+                                               + "WEEK6,"\r
+                                               + "FRM,"\r
+                                               + "TT"\r
+                               + ") VALUES ("\r
+                               + "?,?,?,?,?,?,?,?,?"\r
+                               + ");");                \r
+               updateStmt = db.compileStatement(\r
+                               "UPDATE MONITOR SET "\r
+                                               + "WEEK0 = ?,"\r
+                                               + "WEEK1 = ?,"\r
+                                               + "WEEK2 = ?,"\r
+                                               + "WEEK3 = ?,"\r
+                                               + "WEEK4 = ?,"\r
+                                               + "WEEK5 = ?,"\r
+                                               + "WEEK6 = ?,"\r
+                                               + "FRM = ?,"\r
+                                               + "TT = ? "\r
+                               + "WHERE " + android.provider.BaseColumns._ID + " = ?;");\r
+               deleteStmt = db.compileStatement(\r
+                               "DELETE FROM MONITOR  "\r
+                               + "WHERE " + android.provider.BaseColumns._ID + " = ?;");\r
+       }\r
+       \r
+       public List<Monitor> search(){\r
+               return search(null, null, "FRM, TT");\r
+       }\r
+       \r
+       private List<Monitor> search(String selection, String[] selectionArgs, String orderBy){\r
+               List<Monitor> list = new ArrayList<Monitor>();\r
+               try {\r
+                       DatabaseHelper helper = DatabaseHelper.getInstance();\r
+                       SQLiteDatabase db = helper.getReadableDatabase();\r
+\r
+                       Cursor cursor = db.query(\r
+                                       "MONITOR",\r
+                                       new String[] {\r
+                                       android.provider.BaseColumns._ID, "WEEK0", "WEEK1",\r
+                                       "WEEK2", "WEEK3", "WEEK4", "WEEK5", "WEEK6", "FRM", "TT"                                                        },\r
+                                                       selection, selectionArgs, null, null, orderBy);\r
+                       cursor.moveToFirst();\r
+                       int size = cursor.getCount();\r
+                       for (int i = 0; i < size; i++) {\r
+                               Monitor monitor = new Monitor(\r
+                                               cursor.getInt(0),\r
+                                               cursor.getInt(8),\r
+                                               cursor.getInt(9));\r
+                               for (int j = 0; j < 7; j++) { // TODO\r
+                                       monitor.setWeek(j, Util.toBoolean(cursor.getInt(j + 1)));\r
+                               }\r
+                               list.add(monitor);\r
+                           cursor.moveToNext();\r
+                       }\r
+                       cursor.close();\r
+//             } catch (SQLException e){\r
+//                     // TODO\r
+//                     Debug.d(this, null, e);\r
+               } catch (Exception e){\r
+                       // TODO\r
+                       Debug.d(this, null, e);\r
+               }\r
+               finally {\r
+                       // TODO\r
+               }\r
+               return list;\r
+       }\r
+       \r
+       public void add(Monitor monitor) {\r
+               DatabaseHelper helper = DatabaseHelper.getInstance();\r
+               SQLiteDatabase db = helper.getWritableDatabase();\r
+               add(db, monitor);\r
+       }\r
+       \r
+       private void add(SQLiteDatabase db, Monitor monitor) {\r
+               db.beginTransaction();\r
+               try {\r
+                       int i = 1;\r
+                       int n = 0;\r
+                       SQLiteStatement stmt = insertStmt;\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, monitor.getFrom());\r
+                       stmt.bindLong(i++, monitor.getTo());\r
+                       stmt.executeInsert();\r
+                       db.setTransactionSuccessful();\r
+//             } catch (SQLException e){\r
+//                     Debug.d(this, null, e);\r
+//                     // TODO\r
+//                     e.printStackTrace();\r
+               } finally {\r
+                       db.endTransaction();\r
+               }\r
+       }\r
+\r
+       public void set(Monitor monitor) {\r
+               DatabaseHelper helper = DatabaseHelper.getInstance();\r
+               SQLiteDatabase db = helper.getWritableDatabase();\r
+               db.beginTransaction();\r
+               try {\r
+                       int i = 1;\r
+                       int n = 0;\r
+                       SQLiteStatement stmt = updateStmt;\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, Util.toInt(monitor.getWeek(n++)));\r
+                       stmt.bindLong(i++, monitor.getFrom());\r
+                       stmt.bindLong(i++, monitor.getTo());\r
+                       stmt.bindLong(i++, monitor.getId());\r
+                       stmt.execute();\r
+                       db.setTransactionSuccessful();\r
+               } catch (Exception e){\r
+                       // TODO\r
+                       Debug.d(this, null, e);\r
+               } finally {\r
+                       db.endTransaction();\r
+               }\r
+       }\r
+\r
+       public void delete(int id) {\r
+               DatabaseHelper helper = DatabaseHelper.getInstance();\r
+               SQLiteDatabase db = helper.getWritableDatabase();\r
+               db.beginTransaction();\r
+               try {\r
+                       int i = 1;\r
+                       SQLiteStatement stmt = deleteStmt;\r
+                       stmt.bindLong(i++, id);\r
+                       stmt.execute();\r
+                       db.setTransactionSuccessful();\r
+               } catch (Exception e){\r
+                       // TODO\r
+                       Debug.d(this, null, e);\r
+               } finally {\r
+                       db.endTransaction();\r
+               }\r
+       }\r
+}\r
index c8492b9..7de2db6 100644 (file)
@@ -8,6 +8,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteStatement;\r
 \r
 import com.td.utility.Debug;\r
+import com.td.utility.Util;\r
 \r
 public class TrainDao {\r
        private static TrainDao instance = null;\r
@@ -92,7 +93,7 @@ public class TrainDao {
                String selection = "SELECTED = ?";\r
                String[] selectionArgs = new String[1];\r
                \r
-               selectionArgs[0] = (selected)? "1" : "0";\r
+               selectionArgs[0] = String.valueOf(Util.toInt(selected));\r
                \r
                return search(selection, selectionArgs);\r
        }\r
@@ -149,7 +150,7 @@ public class TrainDao {
                        SQLiteStatement stmt = insertStmt;\r
                        stmt.bindString(i++, train.getName());\r
                        stmt.bindString(i++, train.getSearchText());\r
-                       stmt.bindLong(i++, train.isSelected()? 1 : 0);\r
+                       stmt.bindLong(i++, Util.toInt(train.isSelected()));\r
                        stmt.executeInsert();\r
                        db.setTransactionSuccessful();\r
 //             } catch (SQLException e){\r
@@ -168,7 +169,7 @@ public class TrainDao {
                try {\r
                        int i = 1;\r
                        SQLiteStatement stmt = updateStmt;\r
-                       stmt.bindLong(i++, (selected)? 1 : 0);\r
+                       stmt.bindLong(i++, Util.toInt(selected));\r
                        stmt.bindLong(i++, id);\r
                        stmt.execute();\r
                        db.setTransactionSuccessful();\r
index 0248d12..6426dd4 100644 (file)
@@ -1,24 +1,69 @@
 package com.td.utility;\r
 \r
+import java.text.DecimalFormat;\r
 import java.util.Date;\r
 \r
 public class DateUtil {\r
        public static final int HM_MIN = 0;\r
        public static final int HM_MAX = 9999;\r
        public static final int LEN = 10;\r
+       private static DecimalFormat fmt2 = new DecimalFormat("00");\r
        \r
        public static int getYmd(Date date){\r
-               int y = date.getYear() + 1900;\r
-               int m = date.getMonth() + 1;\r
+               int y = date.getYear();\r
+               int m = date.getMonth();\r
                int d = date.getDate();\r
 \r
-               return y * 10000 + m * 100 + d;         \r
+               return getYmd(y, m, d);\r
+       }\r
+\r
+       public static int getYmd(int y, int m, int d){\r
+               return (1900 + y) * 10000 + (m + 1) * 100 + d;          \r
        }\r
        \r
        public static int getHm(Date date){\r
                int h = date.getHours();\r
-               int mi = date.getMinutes();\r
+               int m = date.getMinutes();\r
+\r
+               return getHm(h, m);\r
+       }\r
+\r
+       public static int getHm(int h, int m){\r
+               return h * 100 + m;             \r
+       }\r
+       \r
+       public static String toName(int index){\r
+               String[] names = {\r
+                               "\93ú", "\8c\8e", "\89Î", "\90\85", "\96Ø", "\8bà", "\93y"\r
+               };\r
+               return names[index];\r
+       }\r
+       \r
+       public static String formattedDate(int hm){\r
+               StringBuffer sb = new StringBuffer();\r
+               sb.append(fmt2.format((int) (hm / 100)));\r
+               sb.append(":");\r
+               sb.append(fmt2.format((int) (hm % 100)));\r
+               return sb.toString();\r
+       }\r
 \r
-               return h * 100 + mi;\r
+       public static String formattedDate(int ymd, int from, int to){\r
+               StringBuffer sb = new StringBuffer();\r
+               sb.append(formattedYmd(ymd));\r
+               sb.append(" ");\r
+               sb.append(formattedDate(from));\r
+               sb.append(" - ");\r
+               sb.append(formattedDate(to));\r
+               return sb.toString();\r
+       }\r
+       \r
+       public static String formattedYmd(int ymd){\r
+               StringBuffer sb = new StringBuffer();\r
+               sb.append(ymd / 10000);\r
+               sb.append("/");\r
+               sb.append(fmt2.format((int) (ymd % 10000 / 100)));\r
+               sb.append("/");\r
+               sb.append(fmt2.format((int) (ymd % 100)));\r
+               return sb.toString();\r
        }\r
 }\r
diff --git a/workspace/TrainDelayed/src/com/td/utility/ListViewArrayAdapter.java b/workspace/TrainDelayed/src/com/td/utility/ListViewArrayAdapter.java
deleted file mode 100644 (file)
index b3a76b3..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.td.utility;\r
-\r
-import java.util.List;\r
-\r
-import android.content.Context;\r
-import android.view.LayoutInflater;\r
-import android.view.View;\r
-import android.view.ViewGroup;\r
-import android.widget.ArrayAdapter;\r
-import android.widget.ImageView;\r
-import android.widget.TextView;\r
-\r
-import com.td.R;\r
-import com.td.db.Train;\r
-\r
-public class ListViewArrayAdapter extends ArrayAdapter<Train> {\r
-    private LayoutInflater inflater;\r
-\r
-    public ListViewArrayAdapter(Context context, int resourceId, List<Train> items) {\r
-        super(context, resourceId, items);\r
-        this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);\r
-    }\r
-\r
-    @Override\r
-    public View getView(int position, View convertView, ViewGroup parent){\r
-        View view = convertView;  \r
-        if(view == null){  \r
-            //1\8ds\95ªlayout\82©\82çView\82Ì\89ò\82ð\90\90¬\r
-            //view = inflater.inflate(android.R.layout.simple_list_item_1, null);  \r
-            view = inflater.inflate(R.layout.train_row, null);  \r
-        }      \r
-\r
-        //Train item = items[position];  \r
-        Train item = getItem(position);\r
-        \r
-        boolean selected = item.isSelected();\r
-        ImageView image = (ImageView)view.findViewById(R.id.imageView1);  \r
-               image.setImageResource((selected)? R.drawable.on : R.drawable.off);\r
-\r
-        //TextView idText01 = (TextView)view.findViewById(android.R.id.text1);  \r
-        TextView text = (TextView)view.findViewById(R.id.textView1);  \r
-        text.setText(item.getName());\r
-        \r
-        return view;\r
-    }\r
-    \r
-}\r
index a2d233b..33a726b 100644 (file)
@@ -1,6 +1,8 @@
 package com.td.utility;\r
 \r
 public class TdException extends Exception {\r
+       private static final long serialVersionUID = 3460190302913953440L;\r
+\r
        public TdException() {\r
                \r
        }\r
diff --git a/workspace/TrainDelayed/src/com/td/utility/Util.java b/workspace/TrainDelayed/src/com/td/utility/Util.java
new file mode 100644 (file)
index 0000000..71121a7
--- /dev/null
@@ -0,0 +1,11 @@
+package com.td.utility;\r
+\r
+public class Util {\r
+    public static boolean toBoolean(int n){\r
+       return (n != 0)? true : false;\r
+    }\r
+    \r
+    public static int toInt(boolean b){\r
+       return (b)? 1 : 0;\r
+    }\r
+}\r