X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=a077f95bf735caa6ea1f2ca02961b37b146f3560;hb=e1aa3fdd1ca82abf5acc0cd3c2b86a5ca1083941;hp=7ad7320978b1d2f4bade40d11f9e347287bd23a3;hpb=92e4515db411fbbad37b5041745412ea09535b7f;p=jalview.git diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index 7ad7320..a077f95 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -375,7 +375,8 @@ public class Jalview System.err.println("CMD [-noquestionnaire] executed successfully!"); } - if (!aparser.contains("nonews")) + if (!aparser.contains("nonews") + || Cache.getProperty("NONEWS") == null) { desktop.checkForNews(); } @@ -691,12 +692,7 @@ public class Jalview jalview.bin.Cache.removeProperty("STARTUP_FILE"); } - protocol = DataSourceType.FILE; - - if (HttpUtils.startsWithHttpOrHttps(file)) - { - protocol = DataSourceType.URL; - } + protocol = AppletFormatAdapter.checkProtocol(file); if (file.endsWith(".jar")) {