From 3a2cf2f51fbde276012f678292ec8e6f7b9a4a10 Mon Sep 17 00:00:00 2001
From: yuki <kimaira7@gmail.com>
Date: Wed, 3 Jul 2013 13:16:39 +0900
Subject: [PATCH] =?utf8?q?Evernote=E9=96=A2=E9=80=A3=E3=83=8E=E3=83=BC?=
 =?utf8?q?=E3=83=88=E5=8F=96=E5=BE=97=E3=82=B9=E3=83=AC=E3=83=83=E3=83=89?=
 =?utf8?q?=E3=81=ABLogger=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cx/fbn/nevernote/gui/RensoNoteList.java        |  2 +-
 .../nevernote/threads/ENRelatedNotesRunner.java    | 28 +++++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/cx/fbn/nevernote/gui/RensoNoteList.java b/src/cx/fbn/nevernote/gui/RensoNoteList.java
index 8fabaf7..9355541 100644
--- a/src/cx/fbn/nevernote/gui/RensoNoteList.java
+++ b/src/cx/fbn/nevernote/gui/RensoNoteList.java
@@ -77,7 +77,7 @@ public class RensoNoteList extends QListWidget {
 		this.guid = new String();
 		mergedHistory = new HashMap<String, Integer>();
 		enRelatedNotesCache = new HashMap<String, List<String>>();
-		this.enRelatedNotesRunner = new ENRelatedNotesRunner(this.syncRunner);
+		this.enRelatedNotesRunner = new ENRelatedNotesRunner(this.syncRunner, logger);
 		this.enRelatedNotesRunner.enRelatedNotesSignal.getENRelatedNotesFinished.connect(this, "enRelatedNotesComplete()");
 		this.enRelatedNotesThread = new QThread(enRelatedNotesRunner, "ENRelatedNotes Thread");
 		this.enRelatedNotesThread.start();
diff --git a/src/cx/fbn/nevernote/threads/ENRelatedNotesRunner.java b/src/cx/fbn/nevernote/threads/ENRelatedNotesRunner.java
index 22e3345..296faea 100644
--- a/src/cx/fbn/nevernote/threads/ENRelatedNotesRunner.java
+++ b/src/cx/fbn/nevernote/threads/ENRelatedNotesRunner.java
@@ -37,9 +37,12 @@ import com.trolltech.qt.core.QObject;
 
 import cx.fbn.nevernote.Global;
 import cx.fbn.nevernote.signals.ENRelatedNotesSignal;
+import cx.fbn.nevernote.utilities.ApplicationLogger;
 import cx.fbn.nevernote.utilities.Pair;
 
 public class ENRelatedNotesRunner extends QObject implements Runnable{
+	
+	private final ApplicationLogger logger;
 	private final SyncRunner syncRunner;
 	public volatile ENRelatedNotesSignal enRelatedNotesSignal;
 	public QMutex mutex;
@@ -47,7 +50,8 @@ public class ENRelatedNotesRunner extends QObject implements Runnable{
 	private volatile LinkedBlockingQueue<String> workQueue;
 	private volatile LinkedBlockingQueue<Pair<String, List<String>>> resultQueue;	// ペア<元ノートguid, 関連ノートguidリスト>を溜めておくキュー
 	
-	public ENRelatedNotesRunner(SyncRunner syncRunner) {
+	public ENRelatedNotesRunner(SyncRunner syncRunner, ApplicationLogger logger) {
+		this.logger = logger;
 		this.syncRunner = syncRunner;
 		this.enRelatedNotesSignal = new ENRelatedNotesSignal();
 		this.mutex = new QMutex();
@@ -60,21 +64,26 @@ public class ENRelatedNotesRunner extends QObject implements Runnable{
 	public void run() {
 		thread().setPriority(Thread.MIN_PRIORITY);
 		
+		logger.log(logger.MEDIUM, "ENRelatedNotesスレッド開始");
 		while (keepRunning) {
 			try {
 				String work = workQueue.take();
 				mutex.lock();
 				if (work.startsWith("GET")) {
 					String guid = work.replace("GET ", "");
+					logger.log(logger.EXTREME, "Evernote関連ノート取得開始 guid = " + guid);
 					
 					List<Note> relatedNotes = getENRelatedNotes(guid);
 					
 					Pair<String, List<String>> resultPair = new Pair<String, List<String>>();
 					resultPair.setFirst(guid);
 					if (relatedNotes == null) {				// 取得に失敗
+						logger.log(logger.EXTREME, "Evernote関連ノートの取得に失敗");
 					} else if (relatedNotes.isEmpty()) {	// このノートにEvernote関連ノートは存在しない
+						logger.log(logger.EXTREME, "Evernote関連ノートの取得に成功　関連ノートは存在しなかった");
 						resultPair.setSecond(new ArrayList<String>());
 					} else {								// Evernote関連ノートが存在する
+						logger.log(logger.EXTREME, "Evernote関連ノートの取得に成功　関連ノートは存在した");
 						List<String> relatedNoteGuids = new ArrayList<String>();
 						for (Note relatedNote : relatedNotes) {
 							relatedNoteGuids.add(relatedNote.getGuid());
@@ -84,8 +93,9 @@ public class ENRelatedNotesRunner extends QObject implements Runnable{
 					
 					resultQueue.offer(resultPair);
 					enRelatedNotesSignal.getENRelatedNotesFinished.emit();
-				}
-				if (work.startsWith("STOP")) {
+					logger.log(logger.EXTREME, "Evernote関連ノート取得完了 guid = " + guid);
+				} else if (work.startsWith("STOP")) {
+					logger.log(logger.MEDIUM, "ENRelatedNotesスレッド停止");
 					keepRunning = false;
 				}
 				mutex.unlock();
@@ -122,17 +132,13 @@ public class ENRelatedNotesRunner extends QObject implements Runnable{
 				RelatedResult result = syncRunner.localNoteStore.findRelated(syncRunner.authToken, rquery, resultSpec);
 				return result;
 			} catch (EDAMUserException e) {
-				// TODO 自動生成された catch ブロック
-				e.printStackTrace();
+				logger.log(logger.HIGH, "Evernote関連ノート取得中に例外発生：EDAMUserException");
 			} catch (EDAMSystemException e) {
-				// TODO 自動生成された catch ブロック
-				e.printStackTrace();
+				logger.log(logger.HIGH, "Evernote関連ノート取得中に例外発生：EDAMSystemException");
 			} catch (EDAMNotFoundException e) {
-				// TODO 自動生成された catch ブロック
-				e.printStackTrace();
+				logger.log(logger.HIGH, "Evernote関連ノート取得中に例外発生：EDAMnotFoundException guid = " + guid);
 			} catch (TException e) {
-				// TODO 自動生成された catch ブロック
-				e.printStackTrace();
+				logger.log(logger.HIGH, "Evernote関連ノート取得中に例外発生：TException");
 			}
 		}
 		return null;
-- 
2.11.0