From 423155e8a69b287c5b4d7e60ac0f929efc71fb0e Mon Sep 17 00:00:00 2001 From: Dagan Sandler Date: Sun, 21 Jul 2013 21:56:50 +0300 Subject: [PATCH] Prefer properties from 'lipreading.properties' file that can be put in the working directory --- .../main/java/edu/lipreading/gui/Constants.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lipreading-gui/src/main/java/edu/lipreading/gui/Constants.java b/lipreading-gui/src/main/java/edu/lipreading/gui/Constants.java index 8bd2d2e..4df9457 100644 --- a/lipreading-gui/src/main/java/edu/lipreading/gui/Constants.java +++ b/lipreading-gui/src/main/java/edu/lipreading/gui/Constants.java @@ -1,11 +1,11 @@ package edu.lipreading.gui; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.util.Properties; public class Constants { public static final Properties LIP_READING_PROPS = new Properties(); + static { InputStream is = ClassLoader.getSystemResourceAsStream("lr-gui.properties"); try { @@ -14,7 +14,16 @@ public class Constants { } catch (IOException e) { throw new RuntimeException(e); } - + + try { + is = new FileInputStream(new File("lipreading.properties")); + LIP_READING_PROPS.load(is); + is.close(); + } catch (FileNotFoundException e) { + System.out.println("Can't find local properties file at: " + new File(".").getAbsolutePath()); + } catch (IOException e) { + System.out.println("Error while reading properties file. Will use default properties"); + } } public static final String LIP_IMAGE_FILE_PATH = LIP_READING_PROPS.getProperty("LIP_IMAGE_FILE_PATH");