Merge branch 'master' into develop

diff --git a/README.md b/README.md
index f790b26..8ed29ab 100644 (file)
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ neighbornote.batを実行して下さい。
 
 要件
 ------------
-OpenSSLが必要です。Windowsを使っているのであれば、[Shining Light Productions - Win32 OpenSSL](http://slproweb.com/products/Win32OpenSSL.html)から"Win32 OpenSSL v0.9.8y Light"をダウンロードしてインストールする必要があるかもしれません。
+OpenSSLが必要です。Windowsを使っているのであれば、[Shining Light Productions - Win32 OpenSSL](http://slproweb.com/products/Win32OpenSSL.html)から"(Win32/Win64) OpenSSL v0.9.8y Light"をダウンロードしてインストールする必要があるかもしれません。
 
 Download
 ------------
@@ -29,4 +29,4 @@ Please run the neighbornote.bat.
 
 Requirements
 ------------
-OpenSSL is needed. If you are using Windows, you may need to download and install "Win32 OpenSSL v0.9.8y Light" from [Shining Light Productions - Win32 OpenSSL](http://slproweb.com/products/Win32OpenSSL.html).
+OpenSSL is needed. If you are using Windows, you may need to download and install "(Win32/Win64) OpenSSL v0.9.8y Light" from [Shining Light Productions - Win32 OpenSSL](http://slproweb.com/products/Win32OpenSSL.html).

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index 6d00824..2d5ef0d 100644 (file)
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -65,8 +65,8 @@ import cx.fbn.nevernote.utilities.Pair;
 public class Global {
        // Set current version and the known versions.
        // ICHANGED 自分用に変更
-       public static String version = "0.1";
-       public static String[] validVersions = {"0.1"};
+       public static String version = "0.1.1";
+       public static String[] validVersions = {"0.1.1", "0.1"};
        
     public static String username = ""; 
     //public static String password = "";     

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index d25490c..8f93206 100644 (file)
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -7631,7 +7631,7 @@ public class NeverNote extends QMainWindow{
                                String tableGuid = (String) ix.values().toArray()[0];
                                if (tableGuid.equals(rensoNotePressedItemGuid)) {
                                        noteTableView.selectRow(i);
-                                       return;
+                                       break;
                                }
                        }
                }

diff --git a/src/cx/fbn/nevernote/sql/DatabaseConnection.java b/src/cx/fbn/nevernote/sql/DatabaseConnection.java
index ef314b5..72caf26 100644 (file)
--- a/src/cx/fbn/nevernote/sql/DatabaseConnection.java
+++ b/src/cx/fbn/nevernote/sql/DatabaseConnection.java
@@ -209,62 +209,6 @@ public class DatabaseConnection {
        }
        
        public void upgradeDb(String version) {
-               if (version.equals("0.85")) {
-                       executeSql("alter table note add column titleColor integer");
-                       executeSql("alter table note add column thumbnail blob");
-                       executeSql("alter table note add column thumbnailneeded boolean");
-                       executeSql("Update note set thumbnailneeded = true;");
-                       executeSql("create index NOTE_NOTEBOOK_INDEX on note (notebookguid, guid);");
-                       executeSql("create index NOTETAGS_TAG_INDEX on notetags (tagguid, noteguid);");
-                       version = "0.86";
-                       Global.setDatabaseVersion(version);
-               } 
-               if (version.equals("0.86")) {
-       
-                       executeSql("alter table notebook add column publishingUri VarChar");
-                       executeSql("alter table notebook add column publishingOrder Integer");
-                       executeSql("alter table notebook add column publishingAscending Boolean");
-                       executeSql("alter table notebook add column publishingPublicDescription varchar");
-                       executeSql("alter table notebook add column stack varchar");
-                       executeSql("alter table notebook add column icon blob");
-                       executeSql("alter table notebook add column readOnly boolean");
-                       executeSql("alter table notebook add column linked boolean");
-                       
-                       executeSql("alter table tag add column realname varchar");
-                       executeSql("alter table tag add column linked boolean");
-                       executeSql("alter table tag add column icon blob");
-                       executeSql("alter table tag add column notebookguid varchar");
-                       executeSql("alter table SavedSearch add column icon blob");
-
-                       executeSql("create index NOTE_THUMBNAIL_INDEX on note (thumbnailneeded, guid);");
-                       executeSql("create index NOTE_EXPUNGED_INDEX on note (isExpunged, guid);");
-                       executeSql("create index NOTE_DUEDATE_INDEX on note (attributeSubjectDate, guid);");
-                       executeSql("create index TAG_NOTEBOOK_INDEX on tag (notebookGuid);");
-                       
-                       executeSql("update note set thumbnailneeded=true, thumbnail=null;");
-                       executeSql("update notebook set publishingUri='', " +
-                                       "publishingAscending=false, stack='', readonly=false, publishingOrder=1, " +
-                                       "publishingPublicDescription='', linked=false");
-                       executeSql("update tag set linked=false, realname='', notebookguid=''");
-                       
-                       sharedNotebookTable.createTable();
-                       linkedNotebookTable.createTable();
-                       systemIconTable.createTable();
-                       inkImagesTable.createTable();
-                       
-                       version = "0.95";
-                       executeSql("Insert into Sync (key, value) values ('FullNotebookSync', 'true')");
-                       executeSql("Insert into Sync (key, value) values ('FullLinkedNotebookSync', 'true')");
-                       executeSql("Insert into Sync (key, value) values ('FullSharedNotebookSync', 'true')");
-                       executeSql("Insert into Sync (key, value) values ('FullInkNoteImageSync', 'true')");
-                       Global.setDatabaseVersion(version);
-               } 
-               if (version.equals("0.95")) {
-                       if (dbTableExists("words"))
-                               executeSql("Drop table words;");
-                       if (dbTableExists("NoteResources"))
-                               executeSql("Drop table NoteResources;");
-               }
                if (!dbTableColumnExists("NOTE", "ORIGINAL_GUID")) {
                        executeSql("alter table note add column ORIGINAL_GUID VarChar");
                        executeSql("create index NOTE_ORIGINAL_GUID_INDEX on note (original_guid, guid);");