From: yuki Date: Fri, 28 Jun 2013 11:35:26 +0000 (+0900) Subject: evernote-apiを1.20から1.25にアップデート X-Git-Tag: version0.2^2~1^2~5 X-Git-Url: http://git.osdn.net/view?p=neighbornote%2FNeighborNote.git;a=commitdiff_plain;h=3c2025d65d606ffae5536a0b0847871e7c6b36b5 evernote-apiを1.20から1.25にアップデート --- diff --git a/.classpath b/.classpath index 77ad830..1fe293f 100644 --- a/.classpath +++ b/.classpath @@ -2,7 +2,7 @@ - + @@ -25,8 +25,8 @@ - - - + + + diff --git a/build.xml b/build.xml index d9e0187..9cb182c 100644 --- a/build.xml +++ b/build.xml @@ -123,7 +123,7 @@ - + diff --git a/lib/evernote-api-1.20.jar b/lib/evernote-api-1.20.jar deleted file mode 100644 index be4409c..0000000 Binary files a/lib/evernote-api-1.20.jar and /dev/null differ diff --git a/lib/evernote-api-1.25.0.jar b/lib/evernote-api-1.25.0.jar new file mode 100644 index 0000000..c345e15 Binary files /dev/null and b/lib/evernote-api-1.25.0.jar differ diff --git a/neighbornote-osx b/neighbornote-osx index 78fcadf..56475de 100644 --- a/neighbornote-osx +++ b/neighbornote-osx @@ -91,7 +91,7 @@ NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-codec-1.5.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-compress-1.2.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-lang3-3.0.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-logging-1.1.1.jar -NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/evernote-api-1.20.jar +NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/evernote-api-1.25.0.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-1.3.158.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpclient-4.1.1.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpcore-4.1.jar diff --git a/neighbornote.bat b/neighbornote.bat index b6be03e..2f9ec91 100755 --- a/neighbornote.bat +++ b/neighbornote.bat @@ -84,7 +84,7 @@ set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\commons-codec-1.5.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\commons-compress-1.2.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\commons-lang3-3.0.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\commons-logging-1.1.1.jar -set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\evernote-api-1.20.jar +set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\evernote-api-1.25.0.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\h2-1.3.158.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\httpclient-4.1.1.jar set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\httpcore-4.1.jar diff --git a/neighbornote.sh b/neighbornote.sh index 9dc77b6..a72d7d2 100644 --- a/neighbornote.sh +++ b/neighbornote.sh @@ -86,7 +86,7 @@ NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-codec-1.5.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-compress-1.2.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-lang3-3.0.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/commons-logging-1.1.1.jar -NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/evernote-api-1.20.jar +NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/evernote-api-1.25.0.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/h2-1.3.158.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpclient-4.1.1.jar NN_CLASSPATH=$NN_CLASSPATH:$NEIGHBORNOTE/lib/httpcore-4.1.jar diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java index ae015b7..7ea2091 100644 --- a/src/cx/fbn/nevernote/NeverNote.java +++ b/src/cx/fbn/nevernote/NeverNote.java @@ -47,7 +47,6 @@ import java.util.Vector; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.apache.thrift.TException; import org.h2.tools.ChangeFileEncryption; import com.evernote.edam.error.EDAMNotFoundException; @@ -66,6 +65,7 @@ import com.evernote.edam.type.Resource; import com.evernote.edam.type.SavedSearch; import com.evernote.edam.type.Tag; import com.evernote.edam.type.User; +import com.evernote.thrift.TException; import com.trolltech.qt.QThread; import com.trolltech.qt.core.QByteArray; import com.trolltech.qt.core.QDateTime; @@ -208,6 +208,7 @@ import cx.fbn.nevernote.xml.ExportData; import cx.fbn.nevernote.xml.ImportData; import cx.fbn.nevernote.xml.ImportEnex; import cx.fbn.nevernote.xml.NoteFormatter; +//import org.apache.thrift.TException; public class NeverNote extends QMainWindow{ diff --git a/src/cx/fbn/nevernote/dialog/ShareNotebook.java b/src/cx/fbn/nevernote/dialog/ShareNotebook.java index 5bfe630..560c23e 100644 --- a/src/cx/fbn/nevernote/dialog/ShareNotebook.java +++ b/src/cx/fbn/nevernote/dialog/ShareNotebook.java @@ -28,13 +28,12 @@ package cx.fbn.nevernote.dialog; import java.util.ArrayList; import java.util.List; -import org.apache.thrift.TException; - import com.evernote.edam.error.EDAMNotFoundException; import com.evernote.edam.error.EDAMSystemException; import com.evernote.edam.error.EDAMUserException; import com.evernote.edam.type.Notebook; import com.evernote.edam.type.SharedNotebook; +import com.evernote.thrift.TException; import com.trolltech.qt.core.QModelIndex; import com.trolltech.qt.core.Qt.ItemFlag; import com.trolltech.qt.core.Qt.ItemFlags; @@ -53,6 +52,7 @@ import com.trolltech.qt.gui.QVBoxLayout; import cx.fbn.nevernote.sql.DatabaseConnection; import cx.fbn.nevernote.threads.SyncRunner; +//import org.apache.thrift.TException; public class ShareNotebook extends QDialog { private final QPushButton okButton; diff --git a/src/cx/fbn/nevernote/threads/SyncRunner.java b/src/cx/fbn/nevernote/threads/SyncRunner.java index 19fc684..4ecda4c 100644 --- a/src/cx/fbn/nevernote/threads/SyncRunner.java +++ b/src/cx/fbn/nevernote/threads/SyncRunner.java @@ -45,10 +45,6 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; import org.apache.http.protocol.HTTP; -import org.apache.thrift.TException; -import org.apache.thrift.protocol.TBinaryProtocol; -import org.apache.thrift.transport.THttpClient; -import org.apache.thrift.transport.TTransportException; import com.evernote.edam.error.EDAMNotFoundException; import com.evernote.edam.error.EDAMSystemException; @@ -68,6 +64,10 @@ import com.evernote.edam.type.Tag; import com.evernote.edam.type.User; import com.evernote.edam.userstore.AuthenticationResult; import com.evernote.edam.userstore.UserStore; +import com.evernote.thrift.TException; +import com.evernote.thrift.protocol.TBinaryProtocol; +import com.evernote.thrift.transport.THttpClient; +import com.evernote.thrift.transport.TTransportException; import com.trolltech.qt.core.QByteArray; import com.trolltech.qt.core.QFile; import com.trolltech.qt.core.QIODevice.OpenModeFlag; @@ -86,6 +86,10 @@ import cx.fbn.nevernote.signals.TagSignal; import cx.fbn.nevernote.sql.DatabaseConnection; import cx.fbn.nevernote.sql.DeletedItemRecord; import cx.fbn.nevernote.utilities.ApplicationLogger; +//import org.apache.thrift.transport.THttpClient; +//import org.apache.thrift.transport.TTransportException; +//import org.apache.thrift.protocol.TBinaryProtocol; +//import org.apache.thrift.TException; public class SyncRunner extends QObject implements Runnable { @@ -123,8 +127,6 @@ public class SyncRunner extends QObject implements Runnable { public volatile String username = ""; public volatile String password = ""; public volatile String userStoreUrl; -// private final static String consumerKey = "baumgarte"; -// private final static String consumerSecret = "eb8b5740e17cb55f"; public String noteStoreUrlBase; private THttpClient userStoreTrans; private TBinaryProtocol userStoreProt; @@ -1554,6 +1556,7 @@ public class SyncRunner extends QObject implements Runnable { } userStoreProt = new TBinaryProtocol(userStoreTrans); userStore = new UserStore.Client(userStoreProt, userStoreProt); + syncSignal.saveUserStore.emit(userStore); try { //authResult = userStore.authenticate(username, password, consumerKey, consumerSecret);