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
Merge branch 'bug/JAL-3082selectRegex' into Jalview-BH/JAL-3026
[jalview.git]
/
src
/
jalview
/
bin
/
Cache.java
diff --git
a/src/jalview/bin/Cache.java
b/src/jalview/bin/Cache.java
index
83bc810
..
b6315f3
100755
(executable)
--- a/
src/jalview/bin/Cache.java
+++ b/
src/jalview/bin/Cache.java
@@
-286,7
+286,8
@@
public class Cache
/** Default file is ~/.jalview_properties */
static String propertiesFile;
/** Default file is ~/.jalview_properties */
static String propertiesFile;
- private static boolean propsAreReadOnly = false;
+ private static boolean propsAreReadOnly = /** @j2sNative true || */
+ false;
public static void initLogger()
{
public static void initLogger()
{
@@
-397,7
+398,8
@@
public class Cache
// LOAD THE AUTHORS FROM THE authors.props file
try
{
// LOAD THE AUTHORS FROM THE authors.props file
try
{
- String authorDetails = "jar:"
+ String authorDetails = /** @j2sNative "xxx" || */
+ "jar:"
.concat(Cache.class.getProtectionDomain().getCodeSource()
.getLocation().toString().concat("!/authors.props"));
.concat(Cache.class.getProtectionDomain().getCodeSource()
.getLocation().toString().concat("!/authors.props"));
@@
-419,7
+421,8
@@
public class Cache
// VERSION MAY HAVE CHANGED SINCE LAST USING JALVIEW
try
{
// VERSION MAY HAVE CHANGED SINCE LAST USING JALVIEW
try
{
- String buildDetails = "jar:".concat(Cache.class.getProtectionDomain()
+ String buildDetails = /** @j2sNative "xxx" || */
+ "jar:".concat(Cache.class.getProtectionDomain()
.getCodeSource().getLocation().toString()
.concat("!/.build_properties"));
.getCodeSource().getLocation().toString()
.concat("!/.build_properties"));
@@
-601,18
+604,13
@@
public class Cache
}
/**
}
/**
- * These methods are used when checking if the saved preference is different
- * to the default setting
+ * Answers the value of the given property, or the supplied default value if
+ * the property is not set
*/
public static String getDefault(String property, String def)
{
*/
public static String getDefault(String property, String def)
{
- String string = getProperty(property);
- if (string != null)
- {
- return string;
- }
-
- return def;
+ String value = getProperty(property);
+ return value == null ? def : value;
}
/**
}
/**