git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
04e9ac2
)
JAL-1519 - tidy build properties management code
author
Jim Procter
<jprocter@dundee.ac.uk>
Fri, 6 Jun 2014 10:50:22 +0000
(11:50 +0100)
committer
Jim Procter
<jprocter@dundee.ac.uk>
Fri, 6 Jun 2014 10:50:22 +0000
(11:50 +0100)
src/jalview/bin/Cache.java
patch
|
blob
|
history
diff --git
a/src/jalview/bin/Cache.java
b/src/jalview/bin/Cache.java
index
fff9daf
..
1214371
100755
(executable)
--- a/
src/jalview/bin/Cache.java
+++ b/
src/jalview/bin/Cache.java
@@
-284,8
+284,10
@@
public class Cache
fis = new FileInputStream(propertiesFile);
}
applicationProperties.load(fis);
fis = new FileInputStream(propertiesFile);
}
applicationProperties.load(fis);
- applicationProperties.remove("LATEST_VERSION");
- applicationProperties.remove("VERSION");
+
+ // remove any old build properties
+
+ deleteBuildProperties();
fis.close();
} catch (Exception ex)
{
fis.close();
} catch (Exception ex)
{
@@
-437,6
+439,15
@@
public class Cache
false);
}
false);
}
+ private static void deleteBuildProperties()
+ {
+ applicationProperties.remove("LATEST_VERSION");
+ applicationProperties.remove("VERSION");
+ applicationProperties.remove("AUTHORS");
+ applicationProperties.remove("AUTHORFNAMES");
+ applicationProperties.remove("YEAR");
+ }
+
/**
* Gets Jalview application property of given key. Returns null if key not
* found
/**
* Gets Jalview application property of given key. Returns null if key not
* found