Merge branch 'checkUpdate' into develop

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / Global.java

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index e9e757d..4d3fb6e 100644 (file)
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -1,6 +1,7 @@
 /*
- * This file is part of NixNote 
+ * This file is part of NixNote/NeighborNote 
  * Copyright 2009 Randy Baumgarte
+ * Copyright 2013 Yuki Takahashi
  * 
  * This file may be licensed under the terms of of the
  * GNU General Public License Version 2 (the ``GPL'').
@@ -64,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 = "";     
@@ -1762,13 +1763,13 @@ public class Global {
     }
     public static String getUpdatesAvailableUrl() {
                settings.beginGroup("Upgrade");
-               String text = (String)settings.value("avialableUrl", "http://nevernote.sourceforge.net/versions.txt");
+               String text = (String)settings.value("avialableUrl", "http://puma.cis.ibaraki.ac.jp/products/neighbornote/develop/versions.txt");
                settings.endGroup();    
                return text;
     }
     public static String getUpdateAnnounceUrl() {
                settings.beginGroup("Upgrade");
-               String text = (String)settings.value("announceUrl", "http://nevernote.sourceforge.net/upgrade.html");
+               String text = (String)settings.value("announceUrl", "http://puma.cis.ibaraki.ac.jp/products/neighbornote/develop/upgrade.html");
                settings.endGroup();    
                return text;
     }