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

Merge pull request #1177

Browse Source 
* Fixes message filtering that was not being initialized.  Fixes minor spotted code issues
This commit is contained in:
Andrzej Pańkowski
2022-04-30 10:25:33 +02:00
committed by GitHub
parent 166383e1ed
commit 1152b13220
8 changed files with 27 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/io/github/dsheirer/module/decode/event/MessageActivityModel.java
View File

@@ -62,6 +62,11 @@ public class MessageActivityModel extends AbstractTableModel implements Listener
mMessageFilterSet = filterSet;
}
public void clearFilters()
{
mMessageFilterSet = new FilterSet<>(new AllPassFilter<>());
}
/**
* Clears all messages from history
*/
@@ -203,4 +208,4 @@ public class MessageActivityModel extends AbstractTableModel implements Listener
return null;
}
}
}

3
src/main/java/io/github/dsheirer/module/decode/event/MessageActivityPanel.java
View File

@@ -26,6 +26,7 @@ import io.github.dsheirer.filter.FilterSet;
import io.github.dsheirer.message.IMessage;
import io.github.dsheirer.message.MessageHistory;
import io.github.dsheirer.module.ProcessingChain;
import io.github.dsheirer.module.decode.DecoderFactory;
import io.github.dsheirer.preference.UserPreferences;
import io.github.dsheirer.preference.swing.JTableColumnWidthMonitor;
import io.github.dsheirer.sample.Listener;
@@ -91,6 +92,7 @@ public class MessageActivityPanel extends JPanel implements Listener<ProcessingC
if(processingChain != null)
{
mCurrentMessageHistory = processingChain.getMessageHistory();
mMessageModel.setFilters(DecoderFactory.getMessageFilters(processingChain.getModules()));
mMessageModel.clearAndSet(mCurrentMessageHistory.getItems());
mCurrentMessageHistory.addListener(mMessageModel);
mManagementPanel.enableButtons();
@@ -98,6 +100,7 @@ public class MessageActivityPanel extends JPanel implements Listener<ProcessingC
else
{
mCurrentMessageHistory = null;
mMessageModel.clearFilters();
mMessageModel.clear();
mManagementPanel.disableButtons();
}