diff --git a/src/main/java/io/github/dsheirer/bits/BinaryMessage.java b/src/main/java/io/github/dsheirer/bits/BinaryMessage.java index af2b1b94..13aae11d 100644 --- a/src/main/java/io/github/dsheirer/bits/BinaryMessage.java +++ b/src/main/java/io/github/dsheirer/bits/BinaryMessage.java @@ -35,7 +35,7 @@ public class BinaryMessage extends BitSet * Logical (ie constructed) size of this bitset, despite the actual size of * the super bitset that this class is based on */ - private int mSize = 0; + private int mSize; /** * Pointer to the next fill index location, when adding bits to this bitset @@ -43,21 +43,21 @@ public class BinaryMessage extends BitSet */ private int mPointer = 0; - /** - * Bitset that buffers bits added one at a time, up to the size of the this - * bitset. - * - * Note: the super class bitset behind this class may have a size larger - * that the size parameter specified. - * @param size - */ - /** * Used for temporary storage of CRC check results when we're passing this * message to an EDAC function. */ private CRC mCRC; + /** + * Constructs a bitset that buffers bits added one at a time, up to the size + * of the this bitset. + *

+ * Note: the super class bitset behind this class may have a size larger + * that the size parameter specified. + * + * @param size of constructed bitset + */ public BinaryMessage(int size) { super(size); @@ -214,9 +214,7 @@ public class BinaryMessage extends BitSet } /** - * Returns a (new) copy of this bitsetbuffer - * - * @return + * @return a (new) copy of this binary message */ public BinaryMessage copy() { diff --git a/src/main/java/io/github/dsheirer/filter/FilterEditorPanel.java b/src/main/java/io/github/dsheirer/filter/FilterEditorPanel.java index 0ea5cc49..d3842102 100644 --- a/src/main/java/io/github/dsheirer/filter/FilterEditorPanel.java +++ b/src/main/java/io/github/dsheirer/filter/FilterEditorPanel.java @@ -75,7 +75,7 @@ public class FilterEditorPanel extends JPanel List> filters = filterSet.getFilters(); /* sort the filters in alphabetical order by name */ - filters.sort((Comparator>) (first, second) -> first.getName().compareTo(second.getName())); + filters.sort(Comparator.comparing(IFilter::getName)); for(IFilter filter : filters) { @@ -98,7 +98,7 @@ public class FilterEditorPanel extends JPanel { List> elements = filter.getFilterElements(); - elements.sort(Comparator.comparing(FilterElement::toString)); + elements.sort(Comparator.comparing(FilterElement::getName)); for(FilterElement element : elements) { diff --git a/src/main/java/io/github/dsheirer/module/decode/event/MessageActivityModel.java b/src/main/java/io/github/dsheirer/module/decode/event/MessageActivityModel.java index b597baca..9f89b827 100644 --- a/src/main/java/io/github/dsheirer/module/decode/event/MessageActivityModel.java +++ b/src/main/java/io/github/dsheirer/module/decode/event/MessageActivityModel.java @@ -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; } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/dsheirer/module/decode/event/MessageActivityPanel.java b/src/main/java/io/github/dsheirer/module/decode/event/MessageActivityPanel.java index b292ccb3..4e07d9fe 100644 --- a/src/main/java/io/github/dsheirer/module/decode/event/MessageActivityPanel.java +++ b/src/main/java/io/github/dsheirer/module/decode/event/MessageActivityPanel.java @@ -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 - * - ******************************************************************************/ - -package io.github.dsheirer.module.decode.mpt1327; - -/** - * MPT-1327 Ident Value Types - */ -public enum MPT1327IdentType -{ - -} diff --git a/src/main/java/io/github/dsheirer/record/wave/WaveWriter.java b/src/main/java/io/github/dsheirer/record/wave/WaveWriter.java index edf0955e..573f992a 100644 --- a/src/main/java/io/github/dsheirer/record/wave/WaveWriter.java +++ b/src/main/java/io/github/dsheirer/record/wave/WaveWriter.java @@ -105,7 +105,7 @@ public class WaveWriter implements AutoCloseable */ public WaveWriter(AudioFormat format, Path file) throws IOException { - this(format, file, Integer.MAX_VALUE * 2); + this(format, file, 0); } /** diff --git a/src/main/java/io/github/dsheirer/sample/buffer/IByteBufferProvider.java b/src/main/java/io/github/dsheirer/sample/buffer/IByteBufferProvider.java index 7e28d609..1c34dacf 100644 --- a/src/main/java/io/github/dsheirer/sample/buffer/IByteBufferProvider.java +++ b/src/main/java/io/github/dsheirer/sample/buffer/IByteBufferProvider.java @@ -25,17 +25,17 @@ import java.nio.ByteBuffer; public interface IByteBufferProvider { /** - * Adds the listener to receive complex buffer samples + * Adds the listener to receive byte buffer samples */ void setBufferListener(Listener listener); /** - * Removes the listener from receiving complex buffer samples + * Removes the listener from receiving byte buffer samples */ void removeBufferListener(Listener listener); /** - * Indicates if there are any complex buffer listeners registered + * Indicates if there are any byte buffer listeners registered */ boolean hasBufferListeners(); } diff --git a/src/test/java/io/github/dsheirer/service/radioreference/RadioReferenceTest.java b/src/test/java/io/github/dsheirer/service/radioreference/RadioReferenceTest.java index fae4f1d4..ef4adc5d 100644 --- a/src/test/java/io/github/dsheirer/service/radioreference/RadioReferenceTest.java +++ b/src/test/java/io/github/dsheirer/service/radioreference/RadioReferenceTest.java @@ -8,7 +8,6 @@ import java.util.Calendar; import java.util.Date; import static io.github.dsheirer.service.radioreference.RadioReference.CheckExpDate; -import static org.junit.Assert.*; public class RadioReferenceTest { @@ -51,4 +50,4 @@ public class RadioReferenceTest Assertions.assertEquals(RadioReference.LoginStatus.VALID_PREMIUM, CheckExpDate("Not a date")); } -} \ No newline at end of file +}