路線編集画面修正

diff --git a/workspace/TrainDelayed/gen/com/td/R.java b/workspace/TrainDelayed/gen/com/td/R.java
index c6c91be..257ea97 100644 (file)
--- a/workspace/TrainDelayed/gen/com/td/R.java
+++ b/workspace/TrainDelayed/gen/com/td/R.java
@@ -16,7 +16,7 @@ public final class R {
         public static final int on=0x7f020002;\r
     }\r
     public static final class id {\r
-        public static final int LinearLayout34=0x7f050044;\r
+        public static final int LinearLayout34=0x7f050045;\r
         public static final int LinearLayout64=0x7f05002b;\r
         public static final int LinearLayout74=0x7f05000a;\r
         public static final int button01=0x7f050011;\r
@@ -29,10 +29,11 @@ public final class R {
         public static final int button09=0x7f05001f;\r
         public static final int button11=0x7f050005;\r
         public static final int button12=0x7f050006;\r
-        public static final int button31=0x7f050045;\r
-        public static final int button32=0x7f050046;\r
+        public static final int button31=0x7f050046;\r
+        public static final int button32=0x7f050047;\r
+        public static final int button33=0x7f050044;\r
         public static final int button41=0x7f050034;\r
-        public static final int button51=0x7f050049;\r
+        public static final int button51=0x7f05004a;\r
         public static final int button61=0x7f05002c;\r
         public static final int button62=0x7f05002d;\r
         public static final int button63=0x7f05002e;\r
@@ -47,7 +48,7 @@ public final class R {
         public static final int button84=0x7f05003b;\r
         public static final int button85=0x7f05003c;\r
         public static final int button86=0x7f05003d;\r
-        public static final int buttona1=0x7f05004f;\r
+        public static final int buttona1=0x7f050050;\r
         public static final int checkBox=0x7f050000;\r
         public static final int checkBox31=0x7f050042;\r
         public static final int checkBox32=0x7f050043;\r
@@ -66,7 +67,7 @@ public final class R {
         public static final int editText72=0x7f050009;\r
         public static final int editText81=0x7f050037;\r
         public static final int historyView11=0x7f050004;\r
-        public static final int imageView1=0x7f05004a;\r
+        public static final int imageView1=0x7f05004b;\r
         public static final int linearLayout00=0x7f05000d;\r
         public static final int linearLayout01=0x7f050010;\r
         public static final int linearLayout02=0x7f050012;\r
@@ -77,25 +78,25 @@ public final class R {
         public static final int linearLayout07=0x7f05001c;\r
         public static final int linearLayout09=0x7f05001e;\r
         public static final int linearLayout30=0x7f05003e;\r
-        public static final int linearLayouta0=0x7f05004c;\r
+        public static final int linearLayouta0=0x7f05004d;\r
         public static final int listView61=0x7f050020;\r
         public static final int listView81=0x7f050036;\r
         public static final int menu41=0x7f050033;\r
-        public static final int menu51=0x7f050048;\r
+        public static final int menu51=0x7f050049;\r
         public static final int scrollView01=0x7f05000f;\r
         public static final int scrollView11=0x7f050003;\r
         public static final int scrollView61=0x7f050021;\r
         public static final int spinner71=0x7f050007;\r
         public static final int text2=0x7f050001;\r
         public static final int textView01=0x7f05000e;\r
-        public static final int textView1=0x7f05004b;\r
+        public static final int textView1=0x7f05004c;\r
         public static final int textView11=0x7f050002;\r
         public static final int textView31=0x7f05003f;\r
         public static final int textView41=0x7f050032;\r
-        public static final int textView51=0x7f050047;\r
+        public static final int textView51=0x7f050048;\r
         public static final int textView81=0x7f050035;\r
-        public static final int textViewa1=0x7f05004d;\r
-        public static final int waitViewa1=0x7f05004e;\r
+        public static final int textViewa1=0x7f05004e;\r
+        public static final int waitViewa1=0x7f05004f;\r
     }\r
     public static final class layout {\r
         public static final int check_list_item_1=0x7f030000;\r

diff --git a/workspace/TrainDelayed/res/layout/train_edit.xml b/workspace/TrainDelayed/res/layout/train_edit.xml
index d04111f..66b9039 100644 (file)
--- a/workspace/TrainDelayed/res/layout/train_edit.xml
+++ b/workspace/TrainDelayed/res/layout/train_edit.xml
@@ -8,7 +8,7 @@
                android:background="#999999"\r
                android:padding="3dip"\r
                android:layout_width="fill_parent">\r
-               <TextView android:text="Twitterを検索する際に使用する路線名を設定します。検索に引っかかりやすい路線名に変更してください。"\r
+               <TextView android:text="Twitterを検索する際に使用する路線名を設定します。検索対象になりやすい路線名に変更してください。"\r
                        android:textAppearance="?android:attr/textAppearanceMedium"\r
                android:background="#cccccc"\r
                        android:id="@+id/textView31"\r
@@ -17,12 +17,13 @@
                        </TextView>\r
        </LinearLayout>\r
        <TextView android:text="路線名(編集不可)" android:background="#999999" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>\r
-       <EditText android:layout_height="wrap_content" android:id="@+id/editText31" android:layout_width="wrap_content" editable="false" android:focusable="false" android:cursorVisible="false" android:inputType="time" />\r
+       <EditText android:layout_height="wrap_content" android:id="@+id/editText31" android:layout_width="wrap_content" editable="false" android:focusable="false" android:cursorVisible="false" />\r
        <TextView android:text="検索時に使用する路線名" android:background="#999999" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>\r
-       <EditText android:layout_height="wrap_content" android:id="@+id/editText32" android:layout_width="wrap_content" editable="false" android:focusable="false" android:cursorVisible="false" android:inputType="time" />\r
+       <EditText android:layout_height="wrap_content" android:id="@+id/editText32" android:layout_width="wrap_content" />\r
        <TextView android:text="編集内容" android:background="#999999" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>\r
        <CheckBox android:layout_width="fill_parent" android:text="「線」を削除する" android:id="@+id/checkBox31" android:layout_height="fill_parent"></CheckBox>\r
        <CheckBox android:layout_width="fill_parent" android:text="「JR」を削除する" android:id="@+id/checkBox32" android:layout_height="fill_parent"></CheckBox>\r
+       <Button android:text="元の設定に戻す" android:id="@+id/button33" android:layout_width="wrap_content" android:layout_height="wrap_content" /> \r
 </LinearLayout>\r
 </ScrollView>\r
 <LinearLayout android:id="@+id/LinearLayout34" android:layout_width="fill_parent" android:layout_height="wrap_content">\r

diff --git a/workspace/TrainDelayed/src/com/td/TrainEditActivity.java b/workspace/TrainDelayed/src/com/td/TrainEditActivity.java
index 4eb14d9..3ae10bd 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/TrainEditActivity.java
+++ b/workspace/TrainDelayed/src/com/td/TrainEditActivity.java
@@ -12,16 +12,18 @@ import android.widget.EditText;
 \r
 import com.td.db.Train;\r
 import com.td.db.TrainDao;\r
+import com.td.webapi.RouteUpdater;\r
 \r
 public class TrainEditActivity extends Activity {\r
-       private static final String JR = "JR";\r
-       private static final String LINE = "\90ü";\r
+       public static final String JR = "JR";\r
+       public static final String LINE = "\90ü";\r
        private EditText editText1;\r
        private EditText editText2;\r
        private CheckBox checkBox1;\r
        private CheckBox checkBox2;\r
        private Button button1;\r
        private Button button2;\r
+       private Button button3;\r
        private long id;\r
 \r
        @Override\r
@@ -35,24 +37,10 @@ public class TrainEditActivity extends Activity {
                checkBox2 = (CheckBox) findViewById(R.id.checkBox32);\r
                button1 = (Button) findViewById(R.id.button31);\r
                button2 = (Button) findViewById(R.id.button32);\r
+               button3 = (Button) findViewById(R.id.button33);\r
                \r
-               button2.setOnClickListener(new OnClickListener(){\r
-                       public void onClick(View view) {\r
-                               TrainEditActivity.this.finish();\r
-                       }});\r
                editText1.setEnabled(false);\r
                \r
-           Bundle extras = getIntent().getExtras();\r
-           id = extras.getLong("ID");\r
-               Train train = TrainDao.getInstance().searchById(id);\r
-               if (train != null){\r
-                       String name = train.getName();\r
-                       String sname = train.getSearchText();\r
-                       editText1.setText(name);\r
-                       editText2.setText(sname);\r
-                       editText();\r
-               }\r
-               \r
                editText2.addTextChangedListener(new TextWatcher() {\r
                        public void afterTextChanged(Editable editable) {\r
                                editText();\r
@@ -71,28 +59,14 @@ public class TrainEditActivity extends Activity {
                \r
                checkBox1.setOnClickListener(new OnClickListener(){\r
                        public void onClick(View view) {\r
-                               String sname = editText2.getText().toString();\r
-                               if (checkBox1.isChecked()){\r
-                                       int len = sname.length();\r
-                                       sname = sname.substring(0, len - 1);\r
-                               }\r
-                               else {\r
-                                       sname += LINE;\r
-                               }\r
-                               editText2.setText(sname);\r
-                       }});\r
+                               editLine();\r
+                       }\r
+               });\r
                checkBox2.setOnClickListener(new OnClickListener(){\r
                        public void onClick(View view) {\r
-                               String sname = editText2.getText().toString();\r
-                               if (checkBox2.isChecked()){\r
-                                       int len = sname.length();\r
-                                       sname = sname.substring(2, len);\r
-                               }\r
-                               else {\r
-                                       sname = JR + sname;\r
-                               }                               \r
-                               editText2.setText(sname);\r
-                       }});\r
+                               editJR();\r
+                       }\r
+               });\r
                button1.setOnClickListener(new OnClickListener(){\r
                        public void onClick(View view) {\r
                                String sname = editText2.getText().toString();\r
@@ -103,6 +77,23 @@ public class TrainEditActivity extends Activity {
                        public void onClick(View view) {\r
                                TrainEditActivity.this.finish();\r
                        }});\r
+               button3.setOnClickListener(new OnClickListener(){\r
+                       public void onClick(View view) {\r
+                               String sname = editText1.getText().toString();\r
+                               sname = RouteUpdater.filter(sname);\r
+                               editText2.setText(sname);\r
+                       }});\r
+\r
+           Bundle extras = getIntent().getExtras();\r
+           id = extras.getLong("ID");\r
+               Train train = TrainDao.getInstance().searchById(id);\r
+               if (train != null){\r
+                       String name = train.getName();\r
+                       String sname = train.getSearchText();\r
+                       editText1.setText(name);\r
+                       editText2.setText(sname);\r
+                       editText();\r
+               }               \r
        }\r
        \r
        private void editText(){\r
@@ -115,8 +106,12 @@ public class TrainEditActivity extends Activity {
                         checkBox1.setEnabled(false);\r
                 }\r
                 else {\r
-                        String ch2 = sname.substring(len - 1, len);\r
-                        checkBox1.setChecked(ch2.equals(LINE));\r
+                        len = sname.length();\r
+                        String ch2 = "";\r
+                        if (sname.length() > 1){\r
+                                ch2 = sname.substring(len - 1, len);\r
+                        }\r
+                        checkBox1.setChecked(!ch2.equals(LINE));\r
                 }\r
                 \r
                 ch = name.substring(0, 2);\r
@@ -124,8 +119,35 @@ public class TrainEditActivity extends Activity {
                         checkBox2.setEnabled(false);\r
                 }                                      \r
                 else {\r
-                        String ch2 = name.substring(0, 2);\r
-                        checkBox2.setChecked(ch2.equals(JR));\r
+                        String ch2 = "";\r
+                        if (sname.length() > 2){\r
+                                ch2 = sname.substring(0, 2);\r
+                        }\r
+                        checkBox2.setChecked(!ch2.equals(JR));\r
                 }\r
        }\r
+\r
+       private void editLine() {\r
+               String sname = editText2.getText().toString();\r
+               if (checkBox1.isChecked()){\r
+                       int len = sname.length();\r
+                       sname = sname.substring(0, len - 1);\r
+               }\r
+               else {\r
+                       sname += LINE;\r
+               }\r
+               editText2.setText(sname);\r
+       }\r
+       \r
+       private void editJR() {\r
+               String sname = editText2.getText().toString();\r
+               if (checkBox2.isChecked()){\r
+                       int len = sname.length();\r
+                       sname = sname.substring(2, len);\r
+               }\r
+               else {\r
+                       sname = JR + sname;\r
+               }                               \r
+               editText2.setText(sname);\r
+       }\r
 }\r

diff --git a/workspace/TrainDelayed/src/com/td/db/Train.java b/workspace/TrainDelayed/src/com/td/db/Train.java
index 7559bd2..ed57822 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/db/Train.java
+++ b/workspace/TrainDelayed/src/com/td/db/Train.java
@@ -52,4 +52,8 @@ public class Train {
                this.name = name;\r
                this.searchText = name;\r
        }\r
+\r
+       public void setSname(String sname) {\r
+               this.searchText = sname;\r
+       }\r
 }\r

diff --git a/workspace/TrainDelayed/src/com/td/webapi/RouteUpdater.java b/workspace/TrainDelayed/src/com/td/webapi/RouteUpdater.java
index 60a0f22..9dea31e 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/webapi/RouteUpdater.java
+++ b/workspace/TrainDelayed/src/com/td/webapi/RouteUpdater.java
@@ -17,6 +17,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
 \r
 import android.database.sqlite.SQLiteDatabase;\r
 \r
+import com.td.TrainEditActivity;\r
 import com.td.db.DatabaseHelper;\r
 import com.td.db.Prefecture;\r
 import com.td.db.PrefectureDao;\r
@@ -83,7 +84,9 @@ public class RouteUpdater {
                                                continue;\r
                                        }\r
                                        train.setName(name);\r
-\r
+                                       String sname = filter(name);\r
+                                       train.setSname(sname);\r
+                                       \r
                                        long tid = trainDao.addNT(train);\r
                                        if (tid < 0) {\r
                                                // TODO\r
@@ -115,6 +118,26 @@ public class RouteUpdater {
                }\r
        }\r
 \r
+       public static String filter(String name) {\r
+               int len = name.length();\r
+               \r
+               String ch;\r
+               if (len > 1){\r
+                       ch = name.substring(len - 1, len);\r
+                       if (ch.equals(TrainEditActivity.LINE)){\r
+                               name = name.substring(0, len - 1);\r
+                               len--;\r
+                       }\r
+               }\r
+               if (len > 2){\r
+                       ch = name.substring(0, 2);\r
+                       if (ch.equals(TrainEditActivity.JR)){\r
+                               name = name.substring(2, len);\r
+                       }\r
+               }\r
+               return name;\r
+       }\r
+\r
        private String encode(String s) {\r
                try {\r
                        return URLEncoder.encode(s, "UTF-8");\r