Mac移行後

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

diff --git a/workspace/TrainDelayed/src/com/td/TrainEditActivity.java b/workspace/TrainDelayed/src/com/td/TrainEditActivity.java
old mode 100644 (file)
new mode 100755 (executable)
index 6938bf5..e3369b8
--- a/workspace/TrainDelayed/src/com/td/TrainEditActivity.java
+++ b/workspace/TrainDelayed/src/com/td/TrainEditActivity.java
@@ -15,6 +15,7 @@ import com.td.db.Train;
 import com.td.db.TrainDao;\r
 import com.td.service.TrainDelayedServiceImpl;\r
 import com.td.utility.BaseActivity;\r
+import com.td.utility.Debug;\r
 import com.td.utility.EditPrefUtil;\r
 import com.td.utility.Util;\r
 import com.td.webapi.RouteUpdater;\r
@@ -89,9 +90,9 @@ public class TrainEditActivity extends BaseActivity {
                                String sname = train.getSearchText();\r
                                TrainDao.getInstance().set(id, sname, true);\r
 \r
-                       TrainDelayedServiceImpl.clearSchedule(pref);\r
+                               TrainDelayedServiceImpl.clearSchedule(pref);\r
 \r
-                       setResult(RESULT_OK);\r
+                               setResult(RESULT_OK);\r
                                finish();\r
                        }\r
                });\r
@@ -107,7 +108,7 @@ public class TrainEditActivity extends BaseActivity {
                                String sname = RouteUpdater.filter(name);\r
                                editText2.setText(sname);\r
                                train.setSearchText(sname);\r
-                               \r
+\r
                                initStatus();\r
                        }\r
                });\r
@@ -140,8 +141,7 @@ public class TrainEditActivity extends BaseActivity {
                        editText2.setText(sname);\r
                        initStatus();\r
                } catch (Exception e) {\r
-                       // TODO\r
-                       e.printStackTrace();\r
+                       Debug.d(this, null, e);\r
                }\r
        }\r
 \r
@@ -157,13 +157,12 @@ public class TrainEditActivity extends BaseActivity {
                                pref.update();\r
                        }\r
                } catch (Exception e) {\r
-                       // TODO\r
-                       e.printStackTrace();\r
+                       Debug.d(this, null, e);\r
                }\r
        }\r
 \r
        private void editText() {\r
-               if (train == null){\r
+               if (train == null) {\r
                        return;\r
                }\r
                String sname = editText2.getText().toString();\r
@@ -189,65 +188,54 @@ public class TrainEditActivity extends BaseActivity {
                        editText2.setText(sname);\r
                        train.setSearchText(sname);\r
                } catch (Exception e) {\r
-                       // TODO\r
-                       e.printStackTrace();\r
+                       Debug.d(this, null, e);\r
                }\r
        }\r
 \r
        private void editJR() {\r
-               try {\r
-                       if (train == null) {\r
-                               return;\r
-                       }\r
-                       String sname = train.getSearchText();\r
-                       if (checkBox2.isChecked()) {\r
-                               int len = sname.length();\r
-                               int slen = JR.length();\r
-                               if (len >= slen && sname.substring(0, slen).equals(JR)) {\r
-                                       sname = sname.substring(slen, len);\r
-                               }\r
-                       } else {\r
-                               sname = JR + sname;\r
+               if (train == null) {\r
+                       return;\r
+               }\r
+               String sname = train.getSearchText();\r
+               if (checkBox2.isChecked()) {\r
+                       int len = sname.length();\r
+                       int slen = JR.length();\r
+                       if (len >= slen && sname.substring(0, slen).equals(JR)) {\r
+                               sname = sname.substring(slen, len);\r
                        }\r
-                       editText2.setText(sname);\r
-                       train.setSearchText(sname);\r
-               } catch (Exception e) {\r
-                       // TODO\r
-                       e.printStackTrace();\r
+               } else {\r
+                       sname = JR + sname;\r
                }\r
+               editText2.setText(sname);\r
+               train.setSearchText(sname);\r
        }\r
 \r
        private void initStatus() {\r
-               try {\r
-                       String name = train.getName();\r
-                       String sname = train.getSearchText();\r
+               String name = train.getName();\r
+               String sname = train.getSearchText();\r
 \r
-                       int len = name.length();\r
-                       String ch = name.substring(len - 1, len);\r
-                       if (!ch.equals(LINE)) {\r
-                               checkBox1.setEnabled(false);\r
-                       } else {\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
+               int len = name.length();\r
+               String ch = name.substring(len - 1, len);\r
+               if (!ch.equals(LINE)) {\r
+                       checkBox1.setEnabled(false);\r
+               } else {\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
-                       if (!ch.equals(JR)) {\r
-                               checkBox2.setEnabled(false);\r
-                       } else {\r
-                               String ch2 = "";\r
-                               if (sname.length() > 2) {\r
-                                       ch2 = sname.substring(0, 2);\r
-                               }\r
-                               checkBox2.setChecked(!ch2.equals(JR));\r
+               ch = name.substring(0, 2);\r
+               if (!ch.equals(JR)) {\r
+                       checkBox2.setEnabled(false);\r
+               } else {\r
+                       String ch2 = "";\r
+                       if (sname.length() > 2) {\r
+                               ch2 = sname.substring(0, 2);\r
                        }\r
-               } catch (Exception e) {\r
-                       // TODO\r
-                       e.printStackTrace();\r
+                       checkBox2.setChecked(!ch2.equals(JR));\r
                }\r
        }\r
 \r