GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-15 01:57:39 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Resolves #517 NPE thrown by TalkgroupRangeEditor (#530)

Browse Source
This commit is contained in:
Denny Sheirer
2019-02-02 14:24:23 +00:00
committed by GitHub
parent 8cbdbd527e
commit ea472f873f
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupEditor.java
View File

@@ -193,6 +193,11 @@ public class TalkgroupEditor extends DocumentListenerEditor<AliasID>
{ {
Protocol protocol = mComboProtocol.getItemAt(mComboProtocol.getSelectedIndex()); Protocol protocol = mComboProtocol.getItemAt(mComboProtocol.getSelectedIndex());
if(protocol == null)
{
protocol = Protocol.UNKNOWN;
}
int value = -1; int value = -1;
try try

17
src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormat.java
View File

@@ -83,6 +83,14 @@ public enum TalkgroupFormat
return mMaximumValue; return mMaximumValue;
} }
/**
* Indicates if the value is valid for the protocol
*/
public boolean isValid(int value)
{
return getMinimumValidValue() <= value && value <= getMaximumValidValue();
}
/** /**
* Short description of the valid value range * Short description of the valid value range
*/ */
@@ -99,9 +107,14 @@ public enum TalkgroupFormat
return mValidRangeHelpText; return mValidRangeHelpText;
} }
public static TalkgroupFormat get(Protocol prococol) public static TalkgroupFormat get(Protocol protocol)
{ {
switch(prococol) if(protocol == null)
{
return UNKNOWN;
}
switch(protocol)
{ {
case APCO25: case APCO25:
return APCO25; return APCO25;

8
src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupRangeEditor.java
View File

@@ -174,6 +174,8 @@ public class TalkgroupRangeEditor extends DocumentListenerEditor<AliasID>
TalkgroupRange talkgroupRange = getTalkgroupRange(); TalkgroupRange talkgroupRange = getTalkgroupRange();
updateEditor(talkgroupRange.getProtocol());
if(talkgroupRange != null) if(talkgroupRange != null)
{ {
mComboProtocol.getModel().setSelectedItem(talkgroupRange.getProtocol()); mComboProtocol.getModel().setSelectedItem(talkgroupRange.getProtocol());
@@ -202,6 +204,12 @@ public class TalkgroupRangeEditor extends DocumentListenerEditor<AliasID>
if(talkgroupRange != null) if(talkgroupRange != null)
{ {
Protocol protocol = mComboProtocol.getItemAt(mComboProtocol.getSelectedIndex()); Protocol protocol = mComboProtocol.getItemAt(mComboProtocol.getSelectedIndex());
if(protocol == null)
{
protocol = Protocol.UNKNOWN;
}
talkgroupRange.setProtocol(protocol); talkgroupRange.setProtocol(protocol);
int minValue = -1; int minValue = -1;