JAL-3633 refactored/simplified LaunchUtils code

[jalview.git] / src / jalview / util / LaunchUtils.java

diff --git a/src/jalview/bin/LaunchUtils.java b/src/jalview/util/LaunchUtils.java
similarity index 62%
rename from src/jalview/bin/LaunchUtils.java
rename to src/jalview/util/LaunchUtils.java
index 89d6069..3302dba 100644 (file)
--- a/src/jalview/bin/LaunchUtils.java
+++ b/src/jalview/util/LaunchUtils.java
@@ -1,4 +1,4 @@
-package jalview.bin;
+package jalview.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -6,11 +6,14 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Properties;
 
-import jalview.util.ChannelProperties;
-
 public class LaunchUtils
 {
 
+  public static void loadChannelProps(File dir)
+  {
+    ChannelProperties.loadProps(dir);
+  }
+
   private static Properties userPreferences = null;
 
   public static String getUserPreference(String key)
@@ -19,8 +22,16 @@ public class LaunchUtils
     {
       String channelPrefsFilename = ChannelProperties
               .getProperty("preferences.filename");
-      String propertiesFile = System.getProperty("user.home")
-              + File.separatorChar + channelPrefsFilename;
+      if (channelPrefsFilename == null)
+      {
+        return null;
+      }
+      File propertiesFile = new File(System.getProperty("user.home"),
+              channelPrefsFilename);
+      if (!propertiesFile.exists())
+      {
+        return null;
+      }
       try
       {
         userPreferences = new Properties();
@@ -38,4 +49,8 @@ public class LaunchUtils
     return userPreferences.getProperty(key);
   }
 
+  public static boolean getBooleanUserPreference(String key)
+  {
+    return Boolean.parseBoolean(getUserPreference(key));
+  }
 }