X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FLaunchUtils.java;fp=src%2Fjalview%2Fbin%2FLaunchUtils.java;h=3302dbad9962adb5924df016565c931a91eed645;hb=9b8e039f02800dba0f3a3de2bc57e7a8b4f95f1c;hp=89d6069def6a16ebe9ff09025313fc365e65bb20;hpb=7ddd007f23e34c640b720cad6112d1925e67dec8;p=jalview.git 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 --- 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)); + } }