Skip to content

Commit 7ad8dfb

Browse files
author
Lloyd Watkin
committed
Formatting using eclipse default formatter
1 parent 2b5093a commit 7ad8dfb

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

src/main/java/org/buddycloud/channelserver/Configuration.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,16 @@ public class Configuration extends Properties {
4545
private Configuration() {
4646
try {
4747
conf = new Properties();
48-
InputStream confFile = this.getClass().getClassLoader().getResourceAsStream(CONFIGURATION_FILE);
49-
if(confFile != null) {
48+
InputStream confFile = this.getClass().getClassLoader()
49+
.getResourceAsStream(CONFIGURATION_FILE);
50+
if (confFile != null) {
5051
load(confFile);
5152
LOGGER.info("Loaded " + CONFIGURATION_FILE + " from classpath.");
5253
} else {
5354
File f = new File(CONFIGURATION_FILE);
5455
load(new FileInputStream(f));
55-
LOGGER.info("Loaded " + CONFIGURATION_FILE + " from working directory.");
56+
LOGGER.info("Loaded " + CONFIGURATION_FILE
57+
+ " from working directory.");
5658
}
5759
} catch (Exception e) {
5860
LOGGER.error("Could not load " + CONFIGURATION_FILE + "!");
@@ -128,20 +130,21 @@ public String getServerTopicsDomain() {
128130
return getProperty(CONFIGURATION_SERVER_TOPICS_DOMAIN);
129131
}
130132

131-
public boolean getBooleanProperty(
132-
final String key, final boolean defaultValue) {
133+
public boolean getBooleanProperty(final String key,
134+
final boolean defaultValue) {
133135
String value = getProperty(key);
134-
135-
if(value != null) {
136-
if(value.equalsIgnoreCase("true")) {
136+
137+
if (value != null) {
138+
if (value.equalsIgnoreCase("true")) {
137139
return true;
138140
}
139-
if(value.equalsIgnoreCase("false")) {
141+
if (value.equalsIgnoreCase("false")) {
140142
return false;
141143
}
142-
LOGGER.warn("Invalid boolean property value for " + key + ": " + value);
144+
LOGGER.warn("Invalid boolean property value for " + key + ": "
145+
+ value);
143146
}
144-
147+
145148
return defaultValue;
146149
}
147150
}

0 commit comments

Comments
 (0)