octoleo/plantuml-server
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml-server.git synced 2024-12-22 08:48:54 +00:00
Code Issues Releases Wiki Activity

[FIX] The Properties is always null

Browse Source
This commit is contained in:
Maxime Sinclair 2014-01-09 16:53:35 +01:00
parent 567a92f158
commit 20de5a0d5d
1 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/main/java/net/sourceforge/plantuml/servlet/utility/Configuration.java
View File

@ -30,55 +30,54 @@ import java.util.Properties;
public class Configuration {
private static Configuration instance;
private Properties config;
private static Configuration instance;
private Properties config;
/**
* Singleton constructor
*/
private Configuration() {
Properties config = new Properties();
// Default values
config.setProperty("SHOW_SOCIAL_BUTTONS", "off");
config.setProperty("USE_GOOGLE_TRACKER", "off");
// End of default values
try {
InputStream is = Thread.currentThread().getContextClassLoader().
getResourceAsStream("config.properties");
if (is != null) {
config.load(is);
is.close();
}
} catch (IOException e) {
// Just log a warning
e.printStackTrace();
}
}
/**
* Singleton constructor
*/
private Configuration() {
config = new Properties();
/**
* Get the configuration
*
* @return the complete configuration
*/
public static Properties get() {
if (instance == null) {
instance = new Configuration();
}
return instance.config;
}
/**
* Get a boolean configuration value
*
* @return true if the value is "on"
*/
public static boolean get(String key) {
if (instance.config.getProperty(key) == null) {
return false;
}
return instance.config.getProperty(key).startsWith("on");
}
// Default values
config.setProperty("SHOW_SOCIAL_BUTTONS", "off");
config.setProperty("USE_GOOGLE_TRACKER", "off");
// End of default values
try {
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("config.properties");
if (is != null) {
config.load(is);
is.close();
}
} catch (IOException e) {
// Just log a warning
e.printStackTrace();
}
}
/**
* Get the configuration
*
* @return the complete configuration
*/
public static Properties get() {
if (instance == null) {
instance = new Configuration();
}
return instance.config;
}
/**
* Get a boolean configuration value
*
* @return true if the value is "on"
*/
public static boolean get(String key) {
if (instance.config.getProperty(key) == null) {
return false;
}
return instance.config.getProperty(key).startsWith("on");
}
}