X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FCache.java;h=366911784f0d1ccbc06844511b5904cf317c0d63;hp=3a170ec64d7265ab39f2b0933852eabe4a292266;hb=8dadf27423ca69874dc6a3c9d416974ba5ae767f;hpb=4a40ce35ca8357cf7b4a492c7a17d82121ccf680
diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 3a170ec..3669117 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -167,6 +167,8 @@ import jalview.ws.sifts.SiftsSettings;
*
FOLLOW_SELECTIONS (true) Controls whether a new alignment view should
* respond to selections made in other alignments containing the same sequences.
*
+ * SHOW_JWS2_SERVICES (true) when set to false, jalview will not
+ * auto-discover JABAWS services
* JWS2HOSTURLS comma-separated list of URLs to try for JABAWS services
* SHOW_WSDISCOVERY_ERRORS (true) Controls if the web service URL discovery
* warning dialog box is displayed.
@@ -174,8 +176,8 @@ import jalview.ws.sifts.SiftsSettings;
* when shading by annotation
* ANNOTATIONCOLOUR_MAX (red) Shade used for maximum value of annotation
* when shading by annotation
- * www.jalview.org (http://www.jalview.org) a property enabling all HTTP
- * requests to be redirected to a mirror of http://www.jalview.org
+ * www.jalview.org (https://www.jalview.org) a property enabling all HTTP
+ * requests to be redirected to a mirror of https://www.jalview.org
* FIGURE_AUTOIDWIDTH (false) Expand the left hand column of an exported
* alignment figure to accommodate even the longest sequence ID or annotation
* label.
@@ -195,6 +197,7 @@ import jalview.ws.sifts.SiftsSettings;
* ID_ORG_HOSTURL location of jalview service providing identifiers.org urls
*
*
+ * NONEWS - when set disables Jalview News from automatically appearing
*
* Deprecated settings:
*
@@ -432,7 +435,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
@@ -1214,13 +1217,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";