warning

diff --git a/.gitignore b/.gitignore
index d7867ec..e55129d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 source/workspace/.metadata
 *.class
 source/workspace/EverFolder/bin
+source/workspace/EverFolder/gen
 .DS_Store
 work
 tmp

diff --git a/source/workspace/EverFolder/gen/com/yuji/ef/R.java b/source/workspace/EverFolder/gen/com/yuji/ef/R.java
index 9bc3698..22b4e0b 100644 (file)
--- a/source/workspace/EverFolder/gen/com/yuji/ef/R.java
+++ b/source/workspace/EverFolder/gen/com/yuji/ef/R.java
@@ -69,21 +69,21 @@ public final class R {
         public static final int setting=0x7f030004;
     }
     public static final class string {
-        public static final int ErrorLogin=0x7f06002e;
-        public static final int ErrorNetwork=0x7f06002d;
-        public static final int ErrorSystem=0x7f06002f;
-        public static final int ErrorUpdate=0x7f06002c;
-        public static final int MenuAdd=0x7f060021;
-        public static final int MenuCut=0x7f06001f;
-        public static final int MenuDelete=0x7f060022;
-        public static final int MenuPaste=0x7f060020;
-        public static final int MenuRename=0x7f060023;
-        public static final int MenuSetting=0x7f060024;
+        public static final int ErrorLogin=0x7f06002d;
+        public static final int ErrorNetwork=0x7f06002c;
+        public static final int ErrorSystem=0x7f06002e;
+        public static final int ErrorUpdate=0x7f06002b;
+        public static final int MenuAdd=0x7f060020;
+        public static final int MenuCut=0x7f06001e;
+        public static final int MenuDelete=0x7f060021;
+        public static final int MenuPaste=0x7f06001f;
+        public static final int MenuRename=0x7f060022;
+        public static final int MenuSetting=0x7f060023;
         public static final int app_name=0x7f060000;
         public static final int cancelButton=0x7f060003;
         public static final int closeButton=0x7f060004;
-        public static final int dialogErrorTitle=0x7f060029;
-        public static final int dialogSystemError=0x7f06002a;
+        public static final int dialogErrorTitle=0x7f060028;
+        public static final int dialogSystemError=0x7f060029;
         public static final int mainAddMsg=0x7f060008;
         public static final int mainConfirmMsg=0x7f060006;
         public static final int mainConfirmTitle=0x7f060005;
@@ -93,29 +93,28 @@ public final class R {
         public static final int mainRightButton=0x7f06000c;
         public static final int mainUpdateMsg=0x7f060007;
         public static final int noButton=0x7f060002;
-        public static final int serviceUpdateDisableNetworkMsg=0x7f060025;
-        public static final int serviceUpdateNotLoggedkMsg=0x7f060026;
-        public static final int serviceUpdateReferenceDataMsg=0x7f060027;
-        public static final int serviceUpdateUnexpectedErrorkMsg=0x7f060028;
-        public static final int settingBookButton=0x7f06001a;
-        public static final int settingBookTitle=0x7f060019;
+        public static final int serviceUpdateDisableNetworkMsg=0x7f060024;
+        public static final int serviceUpdateNotLoggedkMsg=0x7f060025;
+        public static final int serviceUpdateReferenceDataMsg=0x7f060026;
+        public static final int serviceUpdateUnexpectedErrorkMsg=0x7f060027;
+        public static final int settingBookButton=0x7f060019;
+        public static final int settingBookTitle=0x7f060018;
         public static final int settingConfirmMsg=0x7f06000e;
         public static final int settingConfirmTitle=0x7f06000d;
         public static final int settingDoListMsg=0x7f060011;
         public static final int settingDoSelectMsg=0x7f060013;
         public static final int settingDoUpdateMsg=0x7f060012;
-        public static final int settingListButton=0x7f060018;
-        public static final int settingListTitle=0x7f060017;
+        public static final int settingListButton=0x7f060017;
         public static final int settingLoginButton=0x7f060015;
         public static final int settingLoginMsg=0x7f060010;
         public static final int settingLoginTitle=0x7f060014;
         public static final int settingLogoutButton=0x7f060016;
-        public static final int settingUpdateButton=0x7f06001c;
-        public static final int settingUpdateDateTitle=0x7f06001e;
+        public static final int settingUpdateButton=0x7f06001b;
+        public static final int settingUpdateDateTitle=0x7f06001d;
         public static final int settingUpdateMsg=0x7f06000f;
-        public static final int settingUpdateTimeTitle=0x7f06001d;
-        public static final int settingUpdateTitle=0x7f06001b;
-        public static final int toastSystem=0x7f06002b;
+        public static final int settingUpdateTimeTitle=0x7f06001c;
+        public static final int settingUpdateTitle=0x7f06001a;
+        public static final int toastSystem=0x7f06002a;
         public static final int yesButton=0x7f060001;
     }
     public static final class style {

diff --git a/source/workspace/EverFolder/res/values-ja/strings.xml b/source/workspace/EverFolder/res/values-ja/strings.xml
index c72e72a..3cada6a 100644 (file)
--- a/source/workspace/EverFolder/res/values-ja/strings.xml
+++ b/source/workspace/EverFolder/res/values-ja/strings.xml
@@ -40,7 +40,6 @@
     <string name="settingLoginTitle">ログイン</string>
     <string name="settingLoginButton">ログインする</string>
     <string name="settingLogoutButton">ログアウトする</string>
-    <string name="settingListTitle">ノートブック</string>
     <string name="settingListButton">ノートブックを取得する</string>
     <string name="settingBookTitle">同期するノートブック</string>
     <string name="settingBookButton">ノートブックを選択する</string>

diff --git a/source/workspace/EverFolder/res/values/strings.xml b/source/workspace/EverFolder/res/values/strings.xml
index f6f10de..e43c30b 100644 (file)
--- a/source/workspace/EverFolder/res/values/strings.xml
+++ b/source/workspace/EverFolder/res/values/strings.xml
@@ -25,9 +25,9 @@
     <string name="mainConfirmTitle">Message</string>
     <string name="mainConfirmMsg">・・・</string>
     <string name="mainUpdateMsg">Updating data</string>
-    <string name="mainAddMsg">Would you like to add?</string>
-    <string name="mainDeleteMsg">Would you like to delete?</string>
-    <string name="mainRenameMsg">Would you like to rename?</string>
+    <string name="mainAddMsg">Add?</string>
+    <string name="mainDeleteMsg">Delete?</string>
+    <string name="mainRenameMsg">Rename?</string>
     <string name="mainLeftButton">←</string>
     <string name="mainRightButton">→</string>
     <string name="settingConfirmTitle">Message</string>
@@ -40,7 +40,6 @@
     <string name="settingLoginTitle">Login</string>
     <string name="settingLoginButton">Login</string>
     <string name="settingLogoutButton">Logout</string>
-    <string name="settingListTitle">Notebook</string>
     <string name="settingListButton">Get the notebook</string>
     <string name="settingBookTitle">Notebook</string>
     <string name="settingBookButton">Select the notebook</string>

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
index 61b8413..86b81bd 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
@@ -37,7 +37,6 @@ import com.yuji.ef.dao.Node.Status;
 import com.yuji.ef.dao.NodeCacheDao;
 import com.yuji.ef.dao.NodeComparator;
 import com.yuji.ef.dao.NodeDao;
-import com.yuji.ef.dao.NodeDaoImpl;
 import com.yuji.ef.dao.RootNode;
 import com.yuji.ef.exception.EfError;
 import com.yuji.ef.exception.EfException;
@@ -66,7 +65,6 @@ public class EverFolderActivity extends BaseActivity implements LockListener {
        private IconFrameLayout layout;
        private TextView confirmMsg;
        private IconScrollView scrollView;
-       private LinearLayout buttonLayout;
        private Button leftButton;
        private Button rightButton;
 
@@ -125,7 +123,6 @@ public class EverFolderActivity extends BaseActivity implements LockListener {
                        layout.setActivity(this);
                        layout.setScrollView(scrollView);
 
-                       buttonLayout = (LinearLayout) findViewById(R.id.mainButtonLayout);
                        leftButton = (Button) findViewById(R.id.leftButton);
                        rightButton = (Button) findViewById(R.id.rightButton);
 
@@ -348,8 +345,6 @@ public class EverFolderActivity extends BaseActivity implements LockListener {
                                selectMenuRename();
                                break;
                        case Menu.FIRST + 5:
-                               // dummy();
-                               // dummy2();
                                intent = new Intent(this, (Class<?>) SettingActivity.class);
                                startActivityForResult(intent, 0);
                                break;
@@ -362,35 +357,6 @@ public class EverFolderActivity extends BaseActivity implements LockListener {
                return super.onOptionsItemSelected(item);
        }
 
-       private void dummy() {
-               NodeDaoImpl dao = (NodeDaoImpl) NodeCacheDao.getInstance();
-               List<Node> list = dao.search();
-               for (Node node : list) {
-                       System.out.println(node.toString());
-               }
-       }
-
-       private void dummy2() {
-               LockDao dao = (LockDao) LockDao.getInstance();
-               boolean b;
-
-               try {
-                       b = dao.lock(this, "key");
-                       b = dao.lock(this, "key");
-                       b = dao.lock(new Object(), "key");
-                       dao.unlock(this, "key");
-                       b = dao.lock(new Object(), "key");
-                       b = dao.lock(this, "key");
-                       b = dao.lock(this, "key");
-                       b = dao.lock(this, "key");
-                       dao.unlock(new Object(), "key");
-
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-       }
-
        private void selectMenuAdd() {
                setStatus(ScreenStatus.AddNode);
        }

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/Initialize.java b/source/workspace/EverFolder/src/com/yuji/ef/Initialize.java
index 6a438b4..3fe1330 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/Initialize.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/Initialize.java
@@ -12,7 +12,6 @@ import com.yuji.ef.exception.EfError;
 import com.yuji.ef.exception.EfException;
 import com.yuji.ef.pref.EditPrefUtil;
 import com.yuji.ef.service.NoteUpdatorService;
-import com.yuji.ef.utility.EvernoteUtil;
 
 public class Initialize {
        private static Context context;

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/OAuthActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/OAuthActivity.java
index 9785d81..489cd16 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/OAuthActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/OAuthActivity.java
@@ -1,14 +1,10 @@
 package com.yuji.ef;
 
-import java.util.Calendar;
-
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Toast;
 
 import com.evernote.client.oauth.android.EvernoteSession;
-import com.yuji.ef.common.Constant;
-import com.yuji.ef.pref.EditPrefUtil;
 import com.yuji.ef.utility.BaseActivity;
 import com.yuji.ef.utility.EvernoteUtil;
 import com.yuji.ef.utility.OAuthUtil;

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/dao/LockDao.java b/source/workspace/EverFolder/src/com/yuji/ef/dao/LockDao.java
index cb79c7d..3d59078 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/dao/LockDao.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/dao/LockDao.java
@@ -266,7 +266,7 @@ public class LockDao implements IDao<Lock> {
                return update(lock, getClazz(obj)) > 0;
        }
 
-       public void unlock(Class clazz, String key) {
+       public void unlock(Class<?> clazz, String key) {
                try {
                        this.delete(key, clazz.getName());
                } catch (Exception e) {

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/service/NoteUpdatorService.java b/source/workspace/EverFolder/src/com/yuji/ef/service/NoteUpdatorService.java
index 471e167..4acd008 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/service/NoteUpdatorService.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/service/NoteUpdatorService.java
@@ -14,7 +14,6 @@ import android.widget.Toast;
 import com.evernote.client.oauth.android.EvernoteSession;
 import com.yuji.ef.Initialize;
 import com.yuji.ef.R;
-import com.yuji.ef.SettingActivity;
 import com.yuji.ef.common.Constant;
 import com.yuji.ef.dao.LockDao;
 import com.yuji.ef.dao.NodeCacheDao;
@@ -216,8 +215,8 @@ public class NoteUpdatorService extends Service {
                }
 
                Calendar cal = Calendar.getInstance();
-               // cal.add(Calendar.HOUR, (int) updateTime);
-               cal.add(Calendar.SECOND, (int) 15); // TODO
+               cal.add(Calendar.HOUR, (int) updateTime);
+               //cal.add(Calendar.SECOND, (int) 15); // TODO
 
                long t = cal.getTimeInMillis();
                PendingIntent alarmSender = PendingIntent.getService(context, 0,

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java b/source/workspace/EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java
index 9e9223d..9416caa 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java
@@ -10,7 +10,6 @@ import com.yuji.ef.exception.EfException;
 import com.yuji.ef.exception.RollbackException;
 import com.yuji.ef.utility.AsyncTaskIF;
 import com.yuji.ef.utility.Debug;
-import com.yuji.ef.utility.EvernoteUtil;
 import com.yuji.ef.utility.FolderUtil;
 
 public class NoteUpdateTask implements AsyncTaskIF {

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/utility/OAuthUtil.java b/source/workspace/EverFolder/src/com/yuji/ef/utility/OAuthUtil.java
index e50793a..30cc209 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/utility/OAuthUtil.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/utility/OAuthUtil.java
@@ -2,13 +2,9 @@ package com.yuji.ef.utility;
 
 import java.io.File;
 import java.util.Calendar;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
 import android.os.Environment;
 
 import com.evernote.client.conn.ApplicationInfo;