A27980

diff --git a/workspace/EverMemo/gen/com/yuji/em/R.java b/workspace/EverMemo/gen/com/yuji/em/R.java
index 7a8d6d2..98b973e 100644 (file)
--- a/workspace/EverMemo/gen/com/yuji/em/R.java
+++ b/workspace/EverMemo/gen/com/yuji/em/R.java
@@ -75,20 +75,22 @@ public final class R {
         public static final int cancelButton=0x7f050006;
         public static final int closeButton=0x7f050007;
         public static final int deleteButton=0x7f050005;
+        public static final int dialogErrorTitle=0x7f050021;
+        public static final int dialogSystemError=0x7f050022;
         public static final int headerEditTitle=0x7f050019;
         public static final int headerExplainText1=0x7f05001a;
         public static final int headerExplainText2=0x7f05001b;
         public static final int headerExplainText3=0x7f05001c;
         public static final int headerExplainText4=0x7f05001d;
         public static final int mainMenuSetting=0x7f050008;
-        public static final int mainTitle=0x7f050021;
+        public static final int mainTitle=0x7f050023;
         public static final int noButton=0x7f050003;
         public static final int noteListGetting=0x7f050018;
         public static final int selectListConfirmDeleteMsg=0x7f05000b;
         public static final int selectListConfirmNoteMsg=0x7f05000c;
         public static final int selectListConfirmTitle=0x7f05000a;
         public static final int selectListTitle=0x7f050009;
-        public static final int selectTitle=0x7f050022;
+        public static final int selectTitle=0x7f050024;
         public static final int sendButton=0x7f050001;
         public static final int settingConfirmNoteMsg=0x7f050011;
         public static final int settingConfirmTitle=0x7f05000f;

diff --git a/workspace/EverMemo/res/values-ja/strings.xml b/workspace/EverMemo/res/values-ja/strings.xml
index deb90a0..6a93373 100644 (file)
--- a/workspace/EverMemo/res/values-ja/strings.xml
+++ b/workspace/EverMemo/res/values-ja/strings.xml
@@ -41,4 +41,7 @@
     <string name="toastFailedToWrite">書き込みに失敗しました</string>
     <string name="toastNoteDoesNotExist">ノートがありません</string>
     <string name="toastFailedToGetList">リストの取得に失敗しました</string>
+
+    <string name="dialogErrorTitle">エラー</string>
+    <string name="dialogSystemError">システムエラーが発生しました</string>
 </resources>

diff --git a/workspace/EverMemo/res/values/strings.xml b/workspace/EverMemo/res/values/strings.xml
index 4d37e80..758d6c6 100644 (file)
--- a/workspace/EverMemo/res/values/strings.xml
+++ b/workspace/EverMemo/res/values/strings.xml
@@ -41,4 +41,7 @@
     <string name="toastFailedToWrite">Failed to write.</string>
     <string name="toastNoteDoesNotExist">Note does not exist.</string>
     <string name="toastFailedToGetList">Failed to get list.</string>
+
+    <string name="dialogErrorTitle">Error</string>
+    <string name="dialogSystemError">System error has occurred.</string>
 </resources>

diff --git a/workspace/EverMemo/src/com/yuji/em/EverMemoActivity.java b/workspace/EverMemo/src/com/yuji/em/EverMemoActivity.java
index b778f37..e041e47 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/EverMemoActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/EverMemoActivity.java
@@ -112,21 +112,6 @@ public class EverMemoActivity extends BaseActivity {
                updateText();
        }
 
-       // @Override
-       // protected void onResume() {
-       // super.onResume();
-       // try {
-       // InputMethodManager imm =
-       // (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
-       // imm.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT);
-       // editText.setFocusable(true);
-       // }
-       // catch (Exception e){
-       // // TODO
-       // e.printStackTrace();
-       // }
-       // }
-
        private void toggleButtonOnCheckedChanged(CompoundButton buttonView,
                        boolean isChecked) {
                if (checkFlag) {
@@ -183,16 +168,11 @@ public class EverMemoActivity extends BaseActivity {
                                intent = new Intent(this, (Class<?>) SettingActivity.class);
                                startActivityForResult(intent, 0);
                                break;
-                       // case Menu.FIRST + 1:
-                       // intent = new Intent(this, (Class<?>) UserPasswordActivity.class);
-                       // startActivity(intent);
-                       // break;
                        default:
                                break;
                        }
                } catch (Exception e) {
-                       // TODO
-                       // terminate(e);
+                       terminate(e);
                }
                return super.onOptionsItemSelected(item);
        }
@@ -211,10 +191,6 @@ public class EverMemoActivity extends BaseActivity {
 
        private void sendButtonOnClick() {
                try {
-                       // NoteList noteList = util.getNoteList();
-                       // List<Note> list = noteList.getNotes();
-                       // Note note = list.get(0);
-
                        Note note = noteList.get(selectedIndex);
                        String guid = note.getGuid();
 
@@ -264,9 +240,10 @@ public class EverMemoActivity extends BaseActivity {
 
                        editText.setText("");
                } catch (RuntimeException e) {
-                       Debug.d(this, null, e); // TODO
+                       Debug.d(this, null, e);
                        throw e;
                } catch (Exception e) {
+                       // TODO
                        e.printStackTrace();
                }
        }

diff --git a/workspace/EverMemo/src/com/yuji/em/Initialize.java b/workspace/EverMemo/src/com/yuji/em/Initialize.java
index 1eb3276..78cc8fc 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/Initialize.java
+++ b/workspace/EverMemo/src/com/yuji/em/Initialize.java
@@ -6,7 +6,7 @@ import com.yuji.em.utility.EvernoteUtil;
 import android.content.Context;
 
 public class Initialize {
-       private static boolean isInit = true; // TODO false\82É\82È\82Á\82Ä\82¢\82½\81B\82È\82¼\81B
+       private static boolean isInit = true; // false\82É\82È\82Á\82Ä\82¢\82½\81B\82È\82¼\81B
        
        public static void initialize(Context context){
                if (!isInit){

diff --git a/workspace/EverMemo/src/com/yuji/em/NoteListActivity.java b/workspace/EverMemo/src/com/yuji/em/NoteListActivity.java
index 04e4a68..b953caf 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/NoteListActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/NoteListActivity.java
@@ -135,7 +135,7 @@ public class NoteListActivity extends BaseActivity {
                NoteListItem item;
                for (com.evernote.edam.type.Note note : notes) {
                        long l = note.getUpdated();
-                       // long l = note.getCreated(); // TODO \83\\81[\83g\8f\87\82Í\81A\8dX\90V\93ú?
+                       // long l = note.getCreated(); // \83\\81[\83g\8f\87\82Í\81A\8dX\90V\93ú
                        String title = DateUtils.formatDateTime(this, l,
                                        DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE);
                        if (!title.equals(oldTitle)) {

diff --git a/workspace/EverMemo/src/com/yuji/em/utility/BaseActivity.java b/workspace/EverMemo/src/com/yuji/em/utility/BaseActivity.java
index 91f255e..24d5f5c 100755 (executable)
--- a/workspace/EverMemo/src/com/yuji/em/utility/BaseActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/utility/BaseActivity.java
@@ -11,6 +11,7 @@ import android.view.Window;
 import android.view.WindowManager;\r
 \r
 import com.yuji.em.Initialize;\r
+import com.yuji.em.R;\r
 \r
 public class BaseActivity extends Activity {\r
        @Override\r
@@ -121,9 +122,8 @@ public class BaseActivity extends Activity {
        if (t != null){\r
                Debug.d(target, null, t);\r
        }\r
-       // TODO\r
-//             showDialog(getString(R.string.system_error_title_msg),\r
-//                             getString(R.string.system_error_msg));\r
+               showDialog(getString(R.string.dialogErrorTitle),\r
+                               getString(R.string.dialogSystemError));\r
        }\r
 \r
     public void terminate(Throwable t){\r

diff --git a/workspace/EverMemo/src/com/yuji/em/utility/Debug.java b/workspace/EverMemo/src/com/yuji/em/utility/Debug.java
index 6d747ef..5446336 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/utility/Debug.java
+++ b/workspace/EverMemo/src/com/yuji/em/utility/Debug.java
@@ -55,7 +55,6 @@ public class Debug {
        }\r
 \r
        public static void d(Object target, String msg, Throwable t){\r
-               // TODO\r
 //             if (t != null){\r
 //                     l(t.getMessage());\r
 //             }\r

diff --git a/workspace/EverMemo/src/com/yuji/em/utility/EvernoteUtil.java b/workspace/EverMemo/src/com/yuji/em/utility/EvernoteUtil.java
index 0e02f6d..c84845a 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/utility/EvernoteUtil.java
+++ b/workspace/EverMemo/src/com/yuji/em/utility/EvernoteUtil.java
@@ -103,7 +103,7 @@ public class EvernoteUtil {
                }
                String content = note.getContent();
 
-               // TODO\81@#27970
+               // #27970
                // \8c©\82Â\82©\82ç\82È\82¢\8fê\8d\87
                String endTag = "</en-note>";
                int pos = content.indexOf(endTag);
@@ -152,7 +152,7 @@ public class EvernoteUtil {
                                                userStoreTrans);
                                UserStore.Client userStore = new UserStore.Client(userStoreProt);
 
-                               // TODO
+                               // #27612
                                // http://www.antun.net/tips/api/evernote.html
                                // expiredTime=time.time()+(authResult.expiration/1000.0-authResult.currentTime/1000.0)
                                // # expiredTime<time.time() \82È\82ç\94F\8fØ\82µ\92¼\82µ\82Ä\81AauthenticationToken

diff --git a/workspace/EverMemo/src/com/yuji/em/utility/PrefUtilImpl.java b/workspace/EverMemo/src/com/yuji/em/utility/PrefUtilImpl.java
index b05c9f0..99eaf8d 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/utility/PrefUtilImpl.java
+++ b/workspace/EverMemo/src/com/yuji/em/utility/PrefUtilImpl.java
@@ -20,7 +20,7 @@ public class PrefUtilImpl implements PrefUtil {
                                                Context.CONTEXT_RESTRICTED);\r
                                pref = ctxt.getSharedPreferences("EverMemoActivity",\r
                                                Context.MODE_WORLD_READABLE\r
-                                                               | Context.MODE_WORLD_WRITEABLE); // TODO \83\82\81[\83h\r
+                                                               | Context.MODE_WORLD_WRITEABLE);\r
                        } catch (NameNotFoundException e) {\r
                                // TODO\r
                                // Debug.l(e.getMessage());\r