mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-19 08:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated C/F setting. Started to implement UTF-8

Browse Source
This commit is contained in:
Admin
2016-03-16 17:13:03 -05:00
parent 73f0f766f7
commit ad820a68c9
6 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/bwssystems/HABridge/BridgeSettings.java
View File

@@ -40,12 +40,14 @@ public class BridgeSettings extends BackupHandler {
String addressString = null;
String theVeraAddress = null;
String theHarmonyAddress = null;
String configFileProperty = System.getProperty("config.file");
if(configFileProperty == null) {
Path filePath = Paths.get(Configuration.CONFIG_FILE);
if(Files.exists(filePath) && Files.isReadable(filePath))
configFileProperty = Configuration.CONFIG_FILE;
}
if(configFileProperty != null)
{
log.info("reading from config file: " + configFileProperty);
@@ -56,6 +58,7 @@ public class BridgeSettings extends BackupHandler {
{
log.info("reading from system properties");
theBridgeSettings.setNumberoflogmessages(Configuration.NUMBER_OF_LOG_MESSAGES);
theBridgeSettings.setFarenheit(true);
theBridgeSettings.setConfigfile(Configuration.CONFIG_FILE);
theBridgeSettings.setServerPort(System.getProperty("server.port", Configuration.DEFAULT_WEB_PORT));
theBridgeSettings.setUpnpConfigAddress(System.getProperty("upnp.config.address"));
@@ -182,6 +185,8 @@ public class BridgeSettings extends BackupHandler {
theBridgeSettings.setVeraconfigured(aBridgeSettings.isValidVera());
theBridgeSettings.setHarmonyconfigured(aBridgeSettings.isValidHarmony());
theBridgeSettings.setNestConfigured(aBridgeSettings.isValidNest());
theBridgeSettings.setNumberoflogmessages(aBridgeSettings.getNumberoflogmessages());
theBridgeSettings.setFarenheit(aBridgeSettings.isFarenheit());
}
public void save(BridgeSettingsDescriptor newBridgeSettings) {