Use util toHexString

[jalview.git] / src / jalview / bin / Cache.java

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 77178a1..0927272 100755 (executable)
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -95,7 +95,7 @@ public class Cache
         propertiesFile = propsFile;
         if (propsFile == null)
         {
-          propertiesFile = System.getProperty("user.home") + "/.jalview_properties";
+          propertiesFile = System.getProperty("user.home") +File.separatorChar+".jalview_properties";
         }
 
         try
@@ -288,12 +288,9 @@ public class Cache
     {
         try
         {
-            File oldFile = new File(propertiesFile);
-            oldFile.renameTo(new File(propertiesFile+"#"));
             FileOutputStream out = new FileOutputStream(propertiesFile);
             applicationProperties.store(out, "---JalviewX Properties File---");
             out.close();
-            oldFile.delete();
         }
         catch (Exception ex)
         {  System.out.println("Error saving properties: "+ex);  }
@@ -309,10 +306,10 @@ public class Cache
     public static boolean vamsasJarsPresent() {
       if (vamsasJarsArePresent==-1) {
         try {
-          if (jalview.jbgui.GDesktop.class.getClassLoader().loadClass("org.vamsas.client.VorbaId")!=null) {
-            jalview.bin.Cache.log.debug("Found Vamsas Classes (org.vamsas.client.VorbaId can be loaded)");
+          if (jalview.jbgui.GDesktop.class.getClassLoader().loadClass("uk.ac.vamsas.client.VorbaId")!=null) {
+            jalview.bin.Cache.log.debug("Found Vamsas Classes (uk.ac..vamsas.client.VorbaId can be loaded)");
             vamsasJarsArePresent=1;
-            Logger lvclient = Logger.getLogger("org.vamsas");
+            Logger lvclient = Logger.getLogger("uk.ac.vamsas");
             lvclient.setLevel(Level.toLevel(Cache.getDefault("logs.Vamsas.Level",
                 Level.INFO.toString())));