X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FCache.java;h=2904fc3047a5ccda6af15a2cacbb131ade35790b;hb=e1aa3fdd1ca82abf5acc0cd3c2b86a5ca1083941;hp=162ed3c7008e1fa92b7e783d964e269d54b805be;hpb=35c1fb0488dd0b19b880c3835613f3272e6c0fc3;p=jalview.git

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 162ed3c..2904fc3 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -174,8 +174,8 @@ import jalview.ws.sifts.SiftsSettings;
  * when shading by annotation</li>
  * <li>ANNOTATIONCOLOUR_MAX (red) Shade used for maximum value of annotation
  * when shading by annotation</li>
- * <li>www.jalview.org (http://www.jalview.org) a property enabling all HTTP
- * requests to be redirected to a mirror of http://www.jalview.org</li>
+ * <li>www.jalview.org (https://www.jalview.org) a property enabling all HTTP
+ * requests to be redirected to a mirror of https://www.jalview.org</li>
  * <li>FIGURE_AUTOIDWIDTH (false) Expand the left hand column of an exported
  * alignment figure to accommodate even the longest sequence ID or annotation
  * label.</li>
@@ -195,6 +195,7 @@ import jalview.ws.sifts.SiftsSettings;
  * <li>ID_ORG_HOSTURL location of jalview service providing identifiers.org urls
  * </li>
  * 
+ * <li>NONEWS - when set disables Jalview News from automatically appearing</li>
  * </ul>
  * Deprecated settings:
  * <ul>
@@ -432,7 +433,7 @@ public class Cache
                     DEFAULT_CACHE_THRESHOLD_IN_DAYS));
 
     IdOrgSettings.setUrl(getDefault("ID_ORG_HOSTURL",
-            "http://www.jalview.org/services/identifiers"));
+            "https://www.jalview.org/services/identifiers"));
     IdOrgSettings.setDownloadLocation(ID_ORG_FILE);
 
     StructureImportSettings.setDefaultStructureFileFormat(jalview.bin.Cache
@@ -483,7 +484,6 @@ public class Cache
             Properties remoteBuildProperties = new Properties();
             remoteBuildProperties.load(in);
             remoteVersion = remoteBuildProperties.getProperty("VERSION");
-            remoteBuildProperties.load(in);
           } catch (Exception ex)
           {
             System.out
@@ -496,7 +496,6 @@ public class Cache
                   orgtimeout);
 
           setProperty("LATEST_VERSION", remoteVersion);
-          System.out.println("LATEST_VERSION=" + remoteVersion);
         }
       }
 
@@ -1216,13 +1215,13 @@ public class Cache
     getdownDistDir = distDir;
   }
 
-  private static String getGetdownAppbase()
+  public static String getGetdownAppbase()
   {
     setGetdownAppbase();
     return getdownAppbase;
   }
 
-  private static String getAppbaseBuildProperties()
+  public static String getAppbaseBuildProperties()
   {
     String appbase = getGetdownAppbase();
     return appbase + "/" + getdownDistDir + "/build_properties";