From: Jim Procter <jprocter@dundee.ac.uk>
Date: Fri, 6 Jun 2014 10:50:22 +0000 (+0100)
Subject: JAL-1519 - tidy build properties management code
X-Git-Tag: Release_2_8_2b1^2~68
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c5a282b16946ddd9c6a82d828d0848802f610eac;p=jalview.git

JAL-1519 - tidy build properties management code
---

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