From c5a282b16946ddd9c6a82d828d0848802f610eac Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 6 Jun 2014 11:50:22 +0100 Subject: [PATCH 1/1] JAL-1519 - tidy build properties management code --- src/jalview/bin/Cache.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index fff9daf..1214371 100755 --- 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); - applicationProperties.remove("LATEST_VERSION"); - applicationProperties.remove("VERSION"); + + // remove any old build properties + + deleteBuildProperties(); fis.close(); } catch (Exception ex) { @@ -437,6 +439,15 @@ public class Cache 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 -- 1.7.10.2