git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3814 NONEWS property
[jalview.git]
/
src
/
jalview
/
bin
/
Jalview.java
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
7ad7320
..
a077f95
100755
(executable)
--- 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!");
}
System.err.println("CMD [-noquestionnaire] executed successfully!");
}
- if (!aparser.contains("nonews"))
+ if (!aparser.contains("nonews")
+ || Cache.getProperty("NONEWS") == null)
{
desktop.checkForNews();
}
{
desktop.checkForNews();
}
@@
-691,12
+692,7
@@
public class Jalview
jalview.bin.Cache.removeProperty("STARTUP_FILE");
}
jalview.bin.Cache.removeProperty("STARTUP_FILE");
}
- protocol = DataSourceType.FILE;
-
- if (HttpUtils.startsWithHttpOrHttps(file))
- {
- protocol = DataSourceType.URL;
- }
+ protocol = AppletFormatAdapter.checkProtocol(file);
if (file.endsWith(".jar"))
{
if (file.endsWith(".jar"))
{