evernote-apiを1.20から1.25にアップデート

diff --git a/.classpath b/.classpath
index 77ad830..1fe293f 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="lib" path="lib/evernote-api-1.20.jar"/>
+       <classpathentry kind="lib" path="lib/evernote-api-1.25.0.jar"/>
        <classpathentry kind="lib" path="lib/h2-1.3.158.jar"/>
        <classpathentry kind="lib" path="lib/libthrift.jar"/>
        <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
@@ -25,8 +25,8 @@
        <classpathentry kind="lib" path="lib/httpcore-4.1.jar"/>
        <classpathentry kind="lib" path="lib/httpmime-4.1.1.jar"/>
        <classpathentry kind="lib" path="lib/pdfbox-app-1.6.0.jar"/>
-       <classpathentry kind="lib" path="/usr/local/Trolltech/qtjambi-linux32-lgpl-4.5.2_01/qtjambi-4.5.2_01.jar"/>
-       <classpathentry kind="lib" path="/usr/local/Trolltech/qtjambi-linux32-lgpl-4.5.2_01/qtjambi-linux32-gcc-4.5.2_01.jar"/>
-       <classpathentry kind="lib" path="/home/zigzag/workspace/NeighborNote/lib/scribe-1.3.0.jar"/>
+       <classpathentry kind="lib" path="C:/pleiades/scribe-1.3.0.jar"/>
+       <classpathentry kind="lib" path="C:/pleiades/qtjambi-win32-lgpl-4.5.2_01/qtjambi-4.5.2_01.jar"/>
+       <classpathentry kind="lib" path="C:/pleiades/qtjambi-win32-lgpl-4.5.2_01/qtjambi-win32-msvc2005-4.5.2_01.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/build.xml b/build.xml
index d9e0187..9cb182c 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -123,7 +123,7 @@
       <pathelement location="${lib.dir}/commons-compress-1.2.jar"/>
       <pathelement location="${lib.dir}/commons-lang3-3.0.jar"/>
       <pathelement location="${lib.dir}/commons-logging-1.1.1.jar"/>
-      <pathelement location="${lib.dir}/evernote-api-1.20.jar"/>
+      <pathelement location="${lib.dir}/evernote-api-1.25.0.jar"/>
       <pathelement location="${lib.dir}/libthrift.jar"/>
       <pathelement location="${lib.dir}/log4j-1.2.14.jar"/>
       <pathelement location="${lib.dir}/h2-1.3.158.jar"/>

diff --git a/lib/evernote-api-1.20.jar b/lib/evernote-api-1.20.jar
deleted file mode 100644 (file)
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 (file)
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 (file)
--- 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 (executable)
--- 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\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\commons-lang3-3.0.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\commons-logging-1.1.1.jar\r
-set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\evernote-api-1.20.jar\r
+set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\evernote-api-1.25.0.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\h2-1.3.158.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\httpclient-4.1.1.jar\r
 set NN_CLASSPATH=%NN_CLASSPATH%;%NEIGHBORNOTE%lib\httpcore-4.1.jar\r

diff --git a/neighbornote.sh b/neighbornote.sh
index 9dc77b6..a72d7d2 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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;\r
 import java.util.List;\r
 \r
-import org.apache.thrift.TException;\r
-\r
 import com.evernote.edam.error.EDAMNotFoundException;\r
 import com.evernote.edam.error.EDAMSystemException;\r
 import com.evernote.edam.error.EDAMUserException;\r
 import com.evernote.edam.type.Notebook;\r
 import com.evernote.edam.type.SharedNotebook;\r
+import com.evernote.thrift.TException;\r
 import com.trolltech.qt.core.QModelIndex;\r
 import com.trolltech.qt.core.Qt.ItemFlag;\r
 import com.trolltech.qt.core.Qt.ItemFlags;\r
@@ -53,6 +52,7 @@ import com.trolltech.qt.gui.QVBoxLayout;
 \r
 import cx.fbn.nevernote.sql.DatabaseConnection;\r
 import cx.fbn.nevernote.threads.SyncRunner;\r
+//import org.apache.thrift.TException;\r
 \r
 public class ShareNotebook extends QDialog {\r
        private final QPushButton                               okButton;\r

diff --git a/src/cx/fbn/nevernote/threads/SyncRunner.java b/src/cx/fbn/nevernote/threads/SyncRunner.java
index 19fc684..4ecda4c 100644 (file)
--- 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);