T28114

T28112

diff --git a/workspace/EverClip/gen/com/yuji/ec/R.java b/workspace/EverClip/gen/com/yuji/ec/R.java
index dc0c367..f767658 100644 (file)
--- a/workspace/EverClip/gen/com/yuji/ec/R.java
+++ b/workspace/EverClip/gen/com/yuji/ec/R.java
@@ -78,46 +78,49 @@ 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=0x7f050027;
-        public static final int dialogSystemError=0x7f050028;
+        public static final int dialogErrorTitle=0x7f05002a;
+        public static final int dialogSystemError=0x7f05002b;
         public static final int mainConfirmTitle=0x7f05000a;
         public static final int mainMenuSetting=0x7f050008;
         public static final int mainTitle=0x7f050009;
         public static final int noButton=0x7f050003;
-        public static final int noteTypeConfirmTitle=0x7f05002a;
-        public static final int noteTypeDialogTitle=0x7f05001d;
-        public static final int noteTypeTitle=0x7f05001c;
-        public static final int selectTitle=0x7f050029;
+        public static final int noteTypeConfirmTitle=0x7f05002d;
+        public static final int noteTypeDialogTitle=0x7f050020;
+        public static final int noteTypeTitle=0x7f05001f;
+        public static final int selectTitle=0x7f05002c;
         public static final int sendButton=0x7f050001;
         public static final int settingConfirmNoteMsg=0x7f05000d;
         public static final int settingConfirmTitle=0x7f05000b;
         public static final int settingConfirmUserMsg=0x7f05000c;
         public static final int settingNoteButton=0x7f050011;
         public static final int settingNoteTitle=0x7f050010;
+        public static final int settingSortAsc=0x7f050013;
+        public static final int settingSortDes=0x7f050014;
         public static final int settingSortTitle=0x7f050012;
-        public static final int settingTimeButton=0x7f050016;
-        public static final int settingTimeText=0x7f05002c;
-        public static final int settingTimeTitle=0x7f050015;
-        public static final int settingUpdateButton=0x7f050014;
-        public static final int settingUpdateTitle=0x7f050013;
+        public static final int settingTimeButton=0x7f050019;
+        public static final int settingTimeCheck=0x7f050018;
+        public static final int settingTimeText=0x7f05002f;
+        public static final int settingTimeTitle=0x7f050017;
+        public static final int settingUpdateButton=0x7f050016;
+        public static final int settingUpdateTitle=0x7f050015;
         public static final int settingUserButton=0x7f05000f;
         public static final int settingUserTitle=0x7f05000e;
-        public static final int toastConnect=0x7f050021;
-        public static final int toastEvernoteSystem=0x7f050025;
-        public static final int toastFailedToGetList=0x7f050023;
-        public static final int toastFailedToWrite=0x7f050020;
-        public static final int toastInvalidAuth=0x7f050024;
-        public static final int toastNoteDoesNotExist=0x7f050022;
-        public static final int toastSystem=0x7f050026;
+        public static final int toastConnect=0x7f050024;
+        public static final int toastEvernoteSystem=0x7f050028;
+        public static final int toastFailedToGetList=0x7f050026;
+        public static final int toastFailedToWrite=0x7f050023;
+        public static final int toastInvalidAuth=0x7f050027;
+        public static final int toastNoteDoesNotExist=0x7f050025;
+        public static final int toastSystem=0x7f050029;
         public static final int updateButton=0x7f050004;
-        public static final int updatorConfirmTitle=0x7f050017;
-        public static final int updatorMessage=0x7f050018;
-        public static final int updatorNoteButton=0x7f05001a;
-        public static final int updatorNoteDialogTitle=0x7f05001b;
-        public static final int updatorNoteText=0x7f05002b;
-        public static final int updatorNoteTitle=0x7f050019;
-        public static final int userPasswordTitle=0x7f05001f;
-        public static final int userUserTitle=0x7f05001e;
+        public static final int updatorConfirmTitle=0x7f05001a;
+        public static final int updatorMessage=0x7f05001b;
+        public static final int updatorNoteButton=0x7f05001d;
+        public static final int updatorNoteDialogTitle=0x7f05001e;
+        public static final int updatorNoteText=0x7f05002e;
+        public static final int updatorNoteTitle=0x7f05001c;
+        public static final int userPasswordTitle=0x7f050022;
+        public static final int userUserTitle=0x7f050021;
         public static final int yesButton=0x7f050002;
     }
 }

diff --git a/workspace/EverClip/res/layout/setting.xml b/workspace/EverClip/res/layout/setting.xml
index 8394463..9662c7f 100644 (file)
--- a/workspace/EverClip/res/layout/setting.xml
+++ b/workspace/EverClip/res/layout/setting.xml
@@ -30,12 +30,12 @@
                        <TextView android:text="@+string/settingSortTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
                <Spinner android:id="@+id/settingSortSpinner" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_margin="5px"></Spinner>
                        <RadioGroup android:id="@+id/settingSortRadioGroup" android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5px">
-                               <RadioButton android:id="@+id/settingSortRadio1" android:text="昇順" android:layout_width="wrap_content" android:layout_height="wrap_content"></RadioButton>
-                               <RadioButton android:id="@+id/settingSortRadio2" android:text="降順" android:layout_width="wrap_content" android:layout_height="wrap_content"></RadioButton>
+                               <RadioButton android:id="@+id/settingSortRadio1" android:text="@+string/settingSortAsc" android:layout_width="wrap_content" android:layout_height="wrap_content"></RadioButton>
+                               <RadioButton android:id="@+id/settingSortRadio2" android:text="@+string/settingSortDes" android:layout_width="wrap_content" android:layout_height="wrap_content"></RadioButton>
                        </RadioGroup>
                        
                        <TextView android:text="@+string/settingTimeTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
-                       <CheckBox android:text="自動更新を有効にする" android:id="@+id/settingTimeCheckBox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5px"></CheckBox> 
+                       <CheckBox android:text="@+string/settingTimeCheck" android:id="@+id/settingTimeCheckBox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5px"></CheckBox> 
                        <LinearLayout android:id="@+id/settingTimeLayout" android:layout_width="fill_parent" android:layout_height="wrap_content">
                                <TextView android:id="@+id/settingTimeText" android:text="@+string/settingTimeText" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="left|center" android:background="#cccccc" android:layout_width="wrap_content" android:layout_weight="1" android:layout_height="fill_parent" android:layout_marginLeft="10px" android:paddingLeft="10px"></TextView>
                                <Button android:id="@+id/settingTimeButton" android:text="@+string/settingTimeButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="5px" /> 

diff --git a/workspace/EverClip/res/values-ja/strings.xml b/workspace/EverClip/res/values-ja/strings.xml
new file mode 100644 (file)
index 0000000..93da54c
--- /dev/null
+++ b/workspace/EverClip/res/values-ja/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">EverClip</string>
+
+    <string name="sendButton">送信</string>
+    <string name="yesButton">はい</string>
+    <string name="noButton">いいえ</string>
+    <string name="updateButton">更新</string>
+    <string name="deleteButton">削除</string>
+    <string name="cancelButton">取消</string>
+    <string name="closeButton">閉じる</string>
+
+    <string name="mainMenuSetting">設定</string>
+    
+       <string name="mainTitle">EverMemo</string>
+       <string name="mainConfirmTitle">フィルター</string>
+
+    <string name="settingConfirmTitle">確認</string>
+    <string name="settingConfirmUserMsg">Evernoteにログインするための、ユーザ/パスワードを設定してください</string>
+    <string name="settingConfirmNoteMsg">ノート一覧取得先を設定してください</string>
+    <string name="settingUserTitle">ユーザ</string>
+    <string name="settingUserButton">ユーザ/パスワードを設定する</string>
+    <string name="settingNoteTitle">ノート一覧取得先</string>
+    <string name="settingNoteButton">ノート一覧取得先を設定する</string>
+    <string name="settingSortTitle">ノートの並び順</string>
+    <string name="settingSortAsc">昇順</string>
+    <string name="settingSortDes">降順</string>
+    <string name="settingUpdateTitle">ノート一覧</string>
+    <string name="settingUpdateButton">ノート一覧を取得する</string>
+    <string name="settingTimeTitle">ノート一覧自動更新時間</string>
+    <string name="settingTimeCheck">自動更新を有効にする</string>
+    <string name="settingTimeButton">変更</string>
+
+       <string name="updatorConfirmTitle">確認</string>
+       <string name="updatorMessage">ノート取得先の種類\n・全てのノート\n・ノートブック\n・タグ\nを選択してください。\nノートブック、タグを選択した場合は、「選択」ボタンを押して、ノートブック、タグを選択してください。</string>
+       <string name="updatorNoteTitle">ノート取得先の種類</string>
+    <string name="updatorNoteButton">選択</string>
+    <string name="updatorNoteDialogTitle">更新中</string>
+    
+    <string name="noteTypeTitle">ノート取得先</string>
+    <string name="noteTypeDialogTitle">一覧取得中</string>
+    
+    <string name="userUserTitle">ユーザ</string>
+    <string name="userPasswordTitle">パスワード</string>
+
+    <string name="toastFailedToWrite">書き込みに失敗しました</string>
+    <string name="toastConnect">Evernoteとの接続に失敗しました</string>
+    <string name="toastNoteDoesNotExist">ノートがありません</string>
+    <string name="toastFailedToGetList">リストの取得に失敗しました</string>
+    <string name="toastInvalidAuth">認証に失敗しました</string>
+    <string name="toastEvernoteSystem">Evernoteとの連係に失敗しました</string>
+    <string name="toastSystem">システムエラーが発生しました</string>
+
+    <string name="dialogErrorTitle">エラー</string>
+    <string name="dialogSystemError">システムエラーが発生しました</string>
+    
+       <string-array name="note_item_array">
+           <item>全てのノート</item>
+           <item>ノートブック</item>
+           <item>タグ</item>
+       </string-array>
+       <string-array name="note_order_array">
+           <item>作成日</item>
+           <item>更新日</item>
+           <item>テキスト</item>
+       </string-array>
+</resources>

diff --git a/workspace/EverClip/res/values/strings.xml b/workspace/EverClip/res/values/strings.xml
index 32fa92f..c118cbe 100644 (file)
--- a/workspace/EverClip/res/values/strings.xml
+++ b/workspace/EverClip/res/values/strings.xml
@@ -2,63 +2,66 @@
 <resources>
     <string name="app_name">EverClip</string>
 
-    <string name="sendButton">送信</string>
-    <string name="yesButton">はい</string>
-    <string name="noButton">いいえ</string>
-    <string name="updateButton">更新</string>
-    <string name="deleteButton">削除</string>
-    <string name="cancelButton">取消</string>
-    <string name="closeButton">閉じる</string>
+    <string name="sendButton">Send</string>
+    <string name="yesButton">Yes</string>
+    <string name="noButton">No</string>
+    <string name="updateButton">Update</string>
+    <string name="deleteButton">Delete</string>
+    <string name="cancelButton">Cancel</string>
+    <string name="closeButton">Close</string>
 
-    <string name="mainMenuSetting">設定</string>
+    <string name="mainMenuSetting">Settings</string>
     
        <string name="mainTitle">EverMemo</string>
-       <string name="mainConfirmTitle">フィルター</string>
+       <string name="mainConfirmTitle">Filter</string>
 
-    <string name="settingConfirmTitle">確認</string>
-    <string name="settingConfirmUserMsg">Evernoteにログインするための、ユーザ/パスワードを設定してください</string>
-    <string name="settingConfirmNoteMsg">ノート一覧取得先を設定してください</string>
-    <string name="settingUserTitle">ユーザ</string>
-    <string name="settingUserButton">ユーザ/パスワードを設定する</string>
-    <string name="settingNoteTitle">ノート一覧取得先</string>
-    <string name="settingNoteButton">ノート一覧取得先を設定する</string>
-    <string name="settingSortTitle">ノートの並び順</string>
-    <string name="settingUpdateTitle">ノート一覧</string>
-    <string name="settingUpdateButton">ノート一覧を取得する</string>
-    <string name="settingTimeTitle">ノート一覧自動更新時間</string>
-    <string name="settingTimeButton">更新</string>
+    <string name="settingConfirmTitle">Confirm</string>
+    <string name="settingConfirmUserMsg">Please set the user and password to login to Evernote.</string>
+    <string name="settingConfirmNoteMsg">Please set the list of where to get notes.</string>
+    <string name="settingUserTitle">User</string>
+    <string name="settingUserButton">Set user and password</string>
+    <string name="settingNoteTitle">Get a list notes</string>
+    <string name="settingNoteButton">Set the destination to get a list notes</string>
+    <string name="settingSortTitle">Order of the notes</string>
+    <string name="settingSortAsc">Ascendin</string>
+    <string name="settingSortDes">Descending</string>
+    <string name="settingUpdateTitle">List of Notes</string>
+    <string name="settingUpdateButton">get a list notes</string>
+    <string name="settingTimeTitle">Automatic update time</string>
+    <string name="settingTimeCheck">Enable automatic updates</string>
+    <string name="settingTimeButton">Edit</string>
 
-       <string name="updatorConfirmTitle">確認</string>
-       <string name="updatorMessage">ノート取得先の種類\n・全てのノート\n・ノートブック\n・タグ\nを選択してください。\nノートブック、タグを選択した場合は、「更新」ボタンを押して、ノートブック、タグを選択してください。</string>
-       <string name="updatorNoteTitle">ノート取得先の種類</string>
-    <string name="updatorNoteButton">更新</string>
-    <string name="updatorNoteDialogTitle">更新中</string>
+       <string name="updatorConfirmTitle">Confirm</string>
+       <string name="updatorMessage">Please select the type of destination to get the notes.\n・All notes\n・Notebook\n・Tag\n\nIf you choose Notebook or Tag, press the "Select" button, please select notebook or tags.</string>
+       <string name="updatorNoteTitle">Type of list notes</string>
+    <string name="updatorNoteButton">Select</string>
+    <string name="updatorNoteDialogTitle">Updating</string>
     
-    <string name="noteTypeTitle">ノート取得先</string>
-    <string name="noteTypeDialogTitle">一覧取得中</string>
+    <string name="noteTypeTitle">Destination to get the notes</string>
+    <string name="noteTypeDialogTitle">Getting</string>
     
-    <string name="userUserTitle">ユーザ</string>
-    <string name="userPasswordTitle">パスワード</string>
+    <string name="userUserTitle">User</string>
+    <string name="userPasswordTitle">Password</string>
 
-    <string name="toastFailedToWrite">書き込みに失敗しました</string>
-    <string name="toastConnect">Evernoteとの接続に失敗しました</string>
-    <string name="toastNoteDoesNotExist">ノートがありません</string>
-    <string name="toastFailedToGetList">リストの取得に失敗しました</string>
-    <string name="toastInvalidAuth">認証に失敗しました</string>
-    <string name="toastEvernoteSystem">Evernoteとの連係に失敗しました</string>
-    <string name="toastSystem">システムエラーが発生しました</string>
+    <string name="toastFailedToWrite">Failed to write.</string>
+    <string name="toastConnect">Failed to connect Evernote.</string>
+    <string name="toastNoteDoesNotExist">Note does not exist.</string>
+    <string name="toastFailedToGetList">Failed to get list.</string>
+    <string name="toastInvalidAuth">Invalid Auth.</string>
+    <string name="toastEvernoteSystem">Failed to cooperate with Evernote.</string>
+    <string name="toastSystem">System error has occurred.</string>
 
-    <string name="dialogErrorTitle">エラー</string>
-    <string name="dialogSystemError">システムエラーが発生しました</string>
+    <string name="dialogErrorTitle">Error</string>
+    <string name="dialogSystemError">System error has occurred.</string>
     
        <string-array name="note_item_array">
-           <item>全てのノート</item>
-           <item>ノートブック</item>
-           <item>タグ</item>
+           <item>All notes</item>
+           <item>Notebook</item>
+           <item>Tag</item>
        </string-array>
        <string-array name="note_order_array">
-           <item>作成日</item>
-           <item>更新日</item>
-           <item>テキスト</item>
+           <item>Created date</item>
+           <item>Updated date</item>
+           <item>Text</item>
        </string-array>
 </resources>

diff --git a/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java b/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java
index a079030..71fd346 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java
@@ -19,7 +19,6 @@ import android.widget.TextView;
 
 import com.yuji.ec.common.CommonUtil;
 import com.yuji.ec.common.Constant;
-import com.yuji.ec.db.INoteItem;
 import com.yuji.ec.db.Note;
 import com.yuji.ec.db.NoteDao;
 import com.yuji.ec.db.NoteListItem;

diff --git a/workspace/EverClip/src/com/yuji/ec/Initialize.java b/workspace/EverClip/src/com/yuji/ec/Initialize.java
index 258c1b3..f4f1a69 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/Initialize.java
+++ b/workspace/EverClip/src/com/yuji/ec/Initialize.java
@@ -4,7 +4,6 @@ import android.content.Context;
 \r
 import com.yuji.ec.common.CommonUtil;\r
 import com.yuji.ec.db.DatabaseHelper;\r
-import com.yuji.ec.utility.ECException;\r
 import com.yuji.ec.utility.EvernoteUtil;\r
 import com.yuji.ec.utility.PasswordUtil;\r
 \r

diff --git a/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java b/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
index 6c10640..b4f105e 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
@@ -15,7 +15,6 @@ import android.widget.Toast;
 \r
 import com.yuji.ec.common.Constant;\r
 import com.yuji.ec.db.INoteItem;\r
-import com.yuji.ec.db.NoteDao;\r
 import com.yuji.ec.db.NoteListItem;\r
 import com.yuji.ec.task.NoteTypeListTask;\r
 import com.yuji.ec.utility.AsyncTaskCommand;\r

diff --git a/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
index 40dcf6d..9c3f269 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/NoteUpdatorActivity.java
@@ -185,16 +185,9 @@ public class NoteUpdatorActivity extends BaseActivity {
        }
 
        private void setStatus() {
-               /*
-                * \81\9b\91Î\8fÛ type guid guidType(guid\82Ì\90Ý\92è\83^\83C\83~\83\93\83O\82Å\90Ý\92è\81A\8f\89\8aú\92lnull)
-                * 
-                * \81\9b\8dX\90V\83{\83^\83\93\82Ì\8a\88\90«\83\8b\81[\83\8b(\8a\88\90«\82Ì\8fð\8c\8f) type1=type2 guid1<>guid2 guidType=type2
-                * 
-                * type1<>type2 guidType=type2
-                */
-               int srcNoteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE,
-                               Constant.NOTE_ITEM_TYPE_ALL);
-               String srcGuid = pref.get(Constant.PREF_NOTE_ITEM_GUID);
+               //int srcNoteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE,
+               //              Constant.NOTE_ITEM_TYPE_ALL);
+               //String srcGuid = pref.get(Constant.PREF_NOTE_ITEM_GUID);
 
                int noteItemType = noteTypeSpinner.getSelectedItemPosition();
                int guidType = pref.getInt(Constant.PREF_NOTE_ITEM_GUID_TYPE_TMP, -1);
@@ -202,17 +195,6 @@ public class NoteUpdatorActivity extends BaseActivity {
                boolean enabled = false;
                if (noteItemType == Constant.NOTE_ITEM_TYPE_ALL) {
                        enabled = true;
-//             } else if (srcNoteItemType == noteItemType) {
-//                     if (!CommonUtil.isNull(guid) && !guid.equals(srcGuid)) {
-//                             if (guidType >= 0 && guidType == noteItemType) {
-//                                     enabled = true;
-//                             }
-//                     }
-//             } else {
-//                     if (guidType >= 0 && guidType == noteItemType) {
-//                             enabled = true;
-//                     }
-//             }
                }
                else if (guidType >= 0 && guidType == noteItemType) {
                        enabled = true;

diff --git a/workspace/EverClip/src/com/yuji/ec/db/DatabaseHelper.java b/workspace/EverClip/src/com/yuji/ec/db/DatabaseHelper.java
index 21813ac..2a03271 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/db/DatabaseHelper.java
+++ b/workspace/EverClip/src/com/yuji/ec/db/DatabaseHelper.java
@@ -8,7 +8,6 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;\r
 \r
 import com.yuji.ec.utility.Debug;\r
-import com.yuji.ec.utility.ECException;\r
 \r
 public class DatabaseHelper extends SQLiteOpenHelper {\r
        private static DatabaseHelper instance = null;\r

diff --git a/workspace/EverClip/src/com/yuji/ec/service/NoteUpdatorService.java b/workspace/EverClip/src/com/yuji/ec/service/NoteUpdatorService.java
index bc1ab13..aaa50ea 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/service/NoteUpdatorService.java
+++ b/workspace/EverClip/src/com/yuji/ec/service/NoteUpdatorService.java
@@ -18,6 +18,8 @@ import com.yuji.ec.utility.EditPrefUtil;
 import com.yuji.ec.utility.NoteUpdator;\r
 \r
 public class NoteUpdatorService extends Service {\r
+       private static final boolean DEBUG = false;\r
+\r
        public class KitchenTimerBinder extends Binder {\r
                public NoteUpdatorService getService() {\r
                        return NoteUpdatorService.this;\r
@@ -34,9 +36,12 @@ public class NoteUpdatorService extends Service {
        @Override\r
        public void onCreate() {\r
                super.onCreate();\r
-               Toast toast = Toast.makeText(getApplicationContext(), "onCreate()",\r
-                               Toast.LENGTH_SHORT);\r
-               toast.show();\r
+\r
+               if (DEBUG) {\r
+                       Toast toast = Toast.makeText(getApplicationContext(), "onCreate()",\r
+                                       Toast.LENGTH_SHORT);\r
+                       toast.show();\r
+               }\r
        }\r
 \r
        private Runnable task = new Runnable() {\r
@@ -97,9 +102,11 @@ public class NoteUpdatorService extends Service {
                action = intent.getAction();\r
                action = (action == null) ? "" : action;\r
 \r
-               Toast toast = Toast.makeText(getApplicationContext(), "onStart() "\r
-                               + action + " " + startId, Toast.LENGTH_SHORT);\r
-               toast.show();\r
+               if (DEBUG) {\r
+                       Toast toast = Toast.makeText(getApplicationContext(), "onStart() "\r
+                                       + action + " " + startId, Toast.LENGTH_SHORT);\r
+                       toast.show();\r
+               }\r
 \r
                Thread thread = new Thread(null, task, "AlarmService_Service");\r
                thread.start();\r
@@ -108,40 +115,44 @@ public class NoteUpdatorService extends Service {
        @Override\r
        public void onDestroy() {\r
                super.onDestroy();\r
-               Toast toast = Toast.makeText(getApplicationContext(), "onDestroy()",\r
-                               Toast.LENGTH_SHORT);\r
-               toast.show();\r
+\r
+               if (DEBUG) {\r
+                       Toast toast = Toast.makeText(getApplicationContext(),\r
+                                       "onDestroy()", Toast.LENGTH_SHORT);\r
+                       toast.show();\r
+               }\r
        }\r
 \r
        @Override\r
        public IBinder onBind(Intent intent) {\r
-               Toast toast = Toast.makeText(getApplicationContext(), "onBind()",\r
-                               Toast.LENGTH_SHORT);\r
-               toast.show();\r
+               if (DEBUG) {\r
+                       Toast toast = Toast.makeText(getApplicationContext(), "onBind()",\r
+                                       Toast.LENGTH_SHORT);\r
+                       toast.show();\r
+               }\r
 \r
-               // binder = new KitchenTimerBinder();\r
                return binder;\r
        }\r
 \r
        @Override\r
        public void onRebind(Intent intent) {\r
-               Toast toast = Toast.makeText(getApplicationContext(), "onRebind()",\r
-                               Toast.LENGTH_SHORT);\r
-               toast.show();\r
+               if (DEBUG) {\r
+                       Toast toast = Toast.makeText(getApplicationContext(), "onRebind()",\r
+                                       Toast.LENGTH_SHORT);\r
+                       toast.show();\r
+               }\r
        }\r
 \r
        @Override\r
        public boolean onUnbind(Intent intent) {\r
-               Toast toast = Toast.makeText(getApplicationContext(), "onUnbind()",\r
-                               Toast.LENGTH_SHORT);\r
-               toast.show();\r
+               if (DEBUG) {\r
+                       Toast toast = Toast.makeText(getApplicationContext(), "onUnbind()",\r
+                                       Toast.LENGTH_SHORT);\r
+                       toast.show();\r
+               }\r
                return true;\r
        }\r
 \r
-       public void schedule(long delay) {\r
-\r
-       }\r
-\r
        public static void stopService(Context context) {\r
                PendingIntent alarmSender = PendingIntent.getService(context, 0,\r
                                new Intent(context, NoteUpdatorService.class),\r

diff --git a/workspace/EverClip/src/com/yuji/ec/task/NoteTypeListTask.java b/workspace/EverClip/src/com/yuji/ec/task/NoteTypeListTask.java
index 8a3986c..6193298 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/task/NoteTypeListTask.java
+++ b/workspace/EverClip/src/com/yuji/ec/task/NoteTypeListTask.java
@@ -3,7 +3,6 @@ package com.yuji.ec.task;
 import java.lang.ref.WeakReference;
 import java.util.List;
 
-import com.evernote.edam.notestore.NoteList;
 import com.evernote.edam.type.Notebook;
 import com.evernote.edam.type.Tag;
 import com.yuji.ec.NoteTypeListActivity;
@@ -11,7 +10,6 @@ import com.yuji.ec.common.Constant;
 import com.yuji.ec.db.INoteItem;
 import com.yuji.ec.utility.AsyncTaskIF;
 import com.yuji.ec.utility.EvernoteUtil;
-import com.yuji.ec.utility.NoteUpdator;
 
 public class NoteTypeListTask implements AsyncTaskIF {
        private EvernoteUtil util = EvernoteUtil.getInstance();

diff --git a/workspace/EverClip/src/com/yuji/ec/task/NoteUpdateTask.java b/workspace/EverClip/src/com/yuji/ec/task/NoteUpdateTask.java
index 83826f0..0d47423 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/task/NoteUpdateTask.java
+++ b/workspace/EverClip/src/com/yuji/ec/task/NoteUpdateTask.java
@@ -4,7 +4,6 @@ import java.lang.ref.WeakReference;
 
 import com.evernote.edam.notestore.NoteList;
 import com.yuji.ec.NoteUpdatorActivity;
-import com.yuji.ec.SettingActivity;
 import com.yuji.ec.utility.AsyncTaskIF;
 import com.yuji.ec.utility.EvernoteUtil;
 import com.yuji.ec.utility.NoteUpdator;

diff --git a/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java b/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java
index 6d26357..10ff414 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java
+++ b/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java
@@ -15,7 +15,6 @@ import com.evernote.edam.error.EDAMErrorCode;
 import com.evernote.edam.error.EDAMNotFoundException;
 import com.evernote.edam.error.EDAMSystemException;
 import com.evernote.edam.error.EDAMUserException;
-import com.evernote.edam.notestore.NoteCollectionCounts;
 import com.evernote.edam.notestore.NoteFilter;
 import com.evernote.edam.notestore.NoteList;
 import com.evernote.edam.notestore.NoteStore;
@@ -369,7 +368,7 @@ public class EvernoteUtil {
                                String guid = n.getGuid();
                                Note nc = getNote(guid);
                                String content = nc.getContent();
-                               if (parser.parse(content)){
+                               if (!parser.parse(content)){
                                        return null;
                                }
                                String text = parser.getText();

diff --git a/workspace/EverClip/src/com/yuji/ec/utility/HtmlParser.java b/workspace/EverClip/src/com/yuji/ec/utility/HtmlParser.java
index 8739f87..5b38c1f 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/utility/HtmlParser.java
+++ b/workspace/EverClip/src/com/yuji/ec/utility/HtmlParser.java
@@ -17,14 +17,10 @@ import com.yuji.ec.common.CommonUtil;
 public class HtmlParser implements ContentHandler {\r
        // http://java.sun.com/javase/ja/6/docs/ja/api/index.html?org/xml/sax/ContentHandler.html\r
        // http://www35.atwiki.jp/nikoban/pages/23.html\r
-       private final static String NL = System.getProperty("line.separator");\r
+       //private final static String NL = System.getProperty("line.separator");\r
        private StringBuffer sb = null;\r
        \r
        public boolean parse(String str){\r
-//             String str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"\r
-//                             +"<!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\">"\r
-//                             +"<en-note><div><br clear=\"none\"/></div><hr /><h3>2012\94N4\8c\8e5\93ú 13:08</h3><hr /><div><div>\82 \82©\82³\82½\82È\82½\82È</div><div><br clear='none'/></div><div><br clear='none'/></div><div><br clear='none'/></div><div>\82 \82½</div></div><hr /><h3>2012\94N4\8c\8e5\93ú 16:17</h3><hr /><div><div>\83e\83X\83g</div></div><hr /><h3>2012\94N4\8c\8e5\93ú 20:24</h3><hr /><div><div>\82 \82©\82³\82½\82È</div><div>\82Í\82È\82Ü\82â\82è\82í</div></div></en-note>";\r
-\r
                boolean result = false;\r
                try {\r
                sb = new StringBuffer();\r