GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Revert "Merges master onto development branch"

Browse Source 
This reverts commit 2420bc901c63ad9d41e7c99ac95a426f826182ff.
This commit is contained in:
denny
2016-02-13 14:14:54 -05:00
parent 3f674c0b8f
commit 1d7f255784
60 changed files with 2106 additions and 2750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/properties/SystemProperties.java
View File

@@ -82,13 +82,18 @@ public class SystemProperties
{
out = new FileOutputStream( propsPath.toString() );
String comments = "SDRTrunk - SDR Trunking Decoder Application Settings";
String comments =
"SDRTrunk - SDR Trunking Decoder Application Settings";
mProperties.store( out, comments );
mLog.info( "SystemProperties - saved current properties [" +
propsPath.toString() + "]" );
}
catch( Exception e )
{
mLog.error( "exception while saving application properties", e );
mLog.error( "SystemProperties - exception while saving " +
"application properties", e );
}
finally
{
@@ -141,7 +146,8 @@ public class SystemProperties
}
catch ( IOException e )
{
mLog.error( "exception while creating app folder [" + folder + "]", e );
mLog.error( "SystemProperties - exception while creating " +
"app folder [" + folder + "]", e );
}
}
@@ -152,11 +158,11 @@ public class SystemProperties
{
if( mPropertiesPath == null )
{
mLog.info( "no properties file loaded - using defaults" );
mLog.info( "SystemProperties - no properties file loaded - using defaults" );
}
else
{
mLog.info( "application properties loaded [" + mPropertiesPath.toString() + "]" );
mLog.info( "SystemProperties - application properties loaded [" + mPropertiesPath.toString() + "]" );
}
}
@@ -178,7 +184,7 @@ public class SystemProperties
}
catch ( FileNotFoundException e )
{
mLog.error( "exception while opening inputstream on " +
mLog.error( "SDRTrunk - exception while opening inputstream on " +
"application properties file", e );
}
@@ -190,7 +196,7 @@ public class SystemProperties
}
catch ( IOException e )
{
mLog.error( "exception while loading properties " +
mLog.error( "SDRTrunk - exception while loading properties " +
"inputstream into SystemProperties", e );
}
finally
@@ -206,7 +212,8 @@ public class SystemProperties
}
}
mLog.info( "loaded [" + propertiesPath.toString() + "]" );
mLog.info( "SystemProperties - loaded [" +
propertiesPath.toString() + "]" );
}
/**