From 1a664d6081ac92dca78f1e0c56e92feb370a9989 Mon Sep 17 00:00:00 2001 From: Yuji Konishi Date: Mon, 10 Sep 2012 16:40:00 +0900 Subject: [PATCH] A29496 --- .gitignore | 2 + .../src/com/yuji/ef/EverFolderActivity.java | 3 +- .../src/com/yuji/ef/dao/NodeDaoImpl.java | 2 +- .../src/com/yuji/ef/task/NoteUpdateTask.java | 4 +- .../src/com/yuji/ef/utility/EvernoteUtil.java | 51 ++++++++++++++++++++++ .../src/com/yuji/ef/utility/FolderUtil.java | 8 +++- 6 files changed, 65 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8fd13e9..d7867ec 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ source/workspace/.metadata *.class source/workspace/EverFolder/bin .DS_Store +work +tmp diff --git a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java index a11a9b8..58d643a 100644 --- a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java +++ b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java @@ -221,11 +221,12 @@ public class EverFolderActivity extends BaseActivity implements LockListener { boolean ret = super.onCreateOptionsMenu(menu); int index = 0; + // TODO menu.add(Menu.NONE, Menu.FIRST + index++, Menu.NONE, "カット"); menu.add(Menu.NONE, Menu.FIRST + index++, Menu.NONE, "ペースト"); menu.add(Menu.NONE, Menu.FIRST + index++, Menu.NONE, "追加"); menu.add(Menu.NONE, Menu.FIRST + index++, Menu.NONE, "削除"); - menu.add(Menu.NONE, Menu.FIRST + index++, Menu.NONE, "リネーム"); + menu.add(Menu.NONE, Menu.FIRST + index++, Menu.NONE, "名称変更"); menu.add(Menu.NONE, Menu.FIRST + index++, Menu.NONE, "設定"); return ret; } diff --git a/source/workspace/EverFolder/src/com/yuji/ef/dao/NodeDaoImpl.java b/source/workspace/EverFolder/src/com/yuji/ef/dao/NodeDaoImpl.java index d784b74..86299e2 100644 --- a/source/workspace/EverFolder/src/com/yuji/ef/dao/NodeDaoImpl.java +++ b/source/workspace/EverFolder/src/com/yuji/ef/dao/NodeDaoImpl.java @@ -164,7 +164,7 @@ public class NodeDaoImpl implements IDao, NodeDao { public List searchBook(SQLiteDatabase db) { String selection = "TYPE = ?"; String[] selectionArgs = { String.valueOf(Node.TYPE_BOOK) }; - String orderBy = null; + String orderBy = "NAME";; List list = search(db, selection, selectionArgs, orderBy); return list; } 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 6f114db..463b3ef 100644 --- a/source/workspace/EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java +++ b/source/workspace/EverFolder/src/com/yuji/ef/task/NoteUpdateTask.java @@ -14,6 +14,7 @@ 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 { @@ -34,8 +35,9 @@ public class NoteUpdateTask implements AsyncTaskIF { public void doExecute() throws EfException { try { - // FolderUtil test = FolderUtil.getInstance(); + //FolderUtil test = FolderUtil.getInstance(); // test.createTestNote(); + EvernoteUtil.getInstance().createHelpData(); FolderUtil util = FolderUtil.getInstance(); util.update(isRoot, isBook, isNote); } catch (RollbackException e) { diff --git a/source/workspace/EverFolder/src/com/yuji/ef/utility/EvernoteUtil.java b/source/workspace/EverFolder/src/com/yuji/ef/utility/EvernoteUtil.java index 807e54b..e6e542d 100644 --- a/source/workspace/EverFolder/src/com/yuji/ef/utility/EvernoteUtil.java +++ b/source/workspace/EverFolder/src/com/yuji/ef/utility/EvernoteUtil.java @@ -371,6 +371,7 @@ public class EvernoteUtil { this.session = session; } + public void createNotes(String guid, String title, int size){ Note note; String token = getAuthenticationToken(); @@ -431,6 +432,56 @@ public class EvernoteUtil { } return newNote; } + + public void createHelpData(){ + String token = getAuthenticationToken(); + + try { + Notebook food = createHelpBook(token, "食べ歩き"); + createHelpNote(token, food, "ラーメン"); + createHelpNote(token, food, "寿司"); + createHelpNote(token, food, "カレー"); + + Notebook travelJapan = createHelpBook(token, "日本"); + + Notebook travelForeign = createHelpBook(token, "海外"); + createHelpNote(token, travelForeign, "ハワイ"); + createHelpNote(token, travelForeign, "タイ"); + createHelpNote(token, travelForeign, "バンコク"); + + Notebook computer = createHelpBook(token, "コンピュータ"); + createHelpNote(token, computer, "Mac"); + + Notebook jobProblem = createHelpBook(token, "懸案"); + Notebook jobOrder = createHelpBook(token, "発注"); + Notebook memoTodo = createHelpBook(token, "ToDo"); + Notebook memoSchedule = createHelpBook(token, "スケジュール"); + + } catch (EDAMUserException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (EDAMSystemException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (EDAMNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public Notebook createHelpBook(String token, String name) throws EDAMUserException, EDAMSystemException, TException{ + Notebook notebook = new Notebook(); + notebook.setName(name); + return noteStore.createNotebook(token, notebook); + } + + public Note createHelpNote(String toke, Notebook notebook, String name) throws EDAMUserException, EDAMSystemException, EDAMNotFoundException, TException{ + return createNote(notebook, name); + } + // public String getErrorMessage(Context context, Error code) { // if (code.equals(Error.NONE)) { // return ""; diff --git a/source/workspace/EverFolder/src/com/yuji/ef/utility/FolderUtil.java b/source/workspace/EverFolder/src/com/yuji/ef/utility/FolderUtil.java index 8e8eeed..4b8a320 100644 --- a/source/workspace/EverFolder/src/com/yuji/ef/utility/FolderUtil.java +++ b/source/workspace/EverFolder/src/com/yuji/ef/utility/FolderUtil.java @@ -2,8 +2,13 @@ package com.yuji.ef.utility; import java.util.List; +import org.apache.thrift.TException; + import android.database.sqlite.SQLiteDatabase; +import com.evernote.edam.error.EDAMNotFoundException; +import com.evernote.edam.error.EDAMSystemException; +import com.evernote.edam.error.EDAMUserException; import com.evernote.edam.notestore.NoteList; import com.evernote.edam.type.Note; import com.evernote.edam.type.Notebook; @@ -313,6 +318,5 @@ public class FolderUtil { EvernoteUtil util = EvernoteUtil.getInstance(); util.createNotes(guid, "テスト", 100); - - } + } } -- 2.11.0