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

Updates SettingsManager to use jackson xml serialization. Final

Browse Source 
testing on all changes to xml serialization.
This commit is contained in:
Denny
2017-12-21 19:59:11 -05:00
parent 1d2d9e8630
commit 26b97f09b7
21 changed files with 469 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/io/github/dsheirer/controller/channel/Channel.java
View File

@@ -314,7 +314,10 @@ public class Channel extends Configuration implements Listener<FrequencyChangeEv
*/
public void setDecodeConfiguration(DecodeConfiguration config)
{
mDecodeConfiguration = config;
if(config != null)
{
mDecodeConfiguration = config;
}
}
/**
@@ -332,7 +335,10 @@ public class Channel extends Configuration implements Listener<FrequencyChangeEv
*/
public void setAuxDecodeConfiguration(AuxDecodeConfiguration config)
{
mAuxDecodeConfiguration = config;
if(config != null)
{
mAuxDecodeConfiguration = config;
}
}
/**
@@ -350,7 +356,10 @@ public class Channel extends Configuration implements Listener<FrequencyChangeEv
*/
public void setSourceConfiguration(SourceConfiguration config)
{
mSourceConfiguration = config;
if(config != null)
{
mSourceConfiguration = config;
}
//Clear the tune channel object so that it can be recreated if the
//source configuration changes
@@ -371,7 +380,10 @@ public class Channel extends Configuration implements Listener<FrequencyChangeEv
*/
public void setEventLogConfiguration(EventLogConfiguration config)
{
mEventLogConfiguration = config;
if(config != null)
{
mEventLogConfiguration = config;
}
}
/**
@@ -388,7 +400,10 @@ public class Channel extends Configuration implements Listener<FrequencyChangeEv
*/
public void setRecordConfiguration(RecordConfiguration config)
{
mRecordConfiguration = config;
if(config != null)
{
mRecordConfiguration = config;
}
}
/**

4
src/main/java/io/github/dsheirer/controller/channel/ChannelProcessingManager.java
View File

@@ -297,13 +297,13 @@ public class ChannelProcessingManager implements ChannelEventListener
if(!recorders.isEmpty())
{
/* Add baseband recorder */
/* Add baseband recorder */
if((recorders.contains(RecorderType.BASEBAND) && channel.getChannelType() == Channel.ChannelType.STANDARD))
{
processingChain.addModule(mRecorderManager.getBasebandRecorder(channel.toString()));
}
/* Add traffic channel baseband recorder */
/* Add traffic channel baseband recorder */
if(recorders.contains(RecorderType.TRAFFIC_BASEBAND) && channel.getChannelType() == Channel.ChannelType.TRAFFIC)
{
processingChain.addModule(mRecorderManager.getBasebandRecorder(channel.toString()));