GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 09:37:36 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Resolves issue with Null Pointer exception in alias list

Browse Source
This commit is contained in:
Denny
2017-02-20 20:19:47 -05:00
parent 17c7466c6b
commit 234e313b7a
1 changed files with 265 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/alias/AliasModel.java
View File

@@ -17,6 +17,12 @@
******************************************************************************/ ******************************************************************************/
package alias; package alias;
import alias.AliasEvent.Event;
import alias.id.broadcast.BroadcastChannel;
import sample.Broadcaster;
import sample.Listener;
import javax.swing.table.AbstractTableModel;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@@ -24,13 +30,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import javax.swing.table.AbstractTableModel;
import alias.id.broadcast.BroadcastChannel;
import sample.Broadcaster;
import sample.Listener;
import alias.AliasEvent.Event;
/** /**
* Alias Model * Alias Model
*/ */
@@ -72,13 +71,15 @@ public class AliasModel extends AbstractTableModel
public AliasList getAliasList(String name) public AliasList getAliasList(String name)
{ {
if( mAliasListMap.containsKey( name ) ) if(name != null && mAliasListMap.containsKey(name))
{ {
return mAliasListMap.get(name); return mAliasListMap.get(name);
} }
AliasList aliasList = new AliasList(name); AliasList aliasList = new AliasList(name);
if(name != null)
{
for(Alias alias : mAliases) for(Alias alias : mAliases)
{ {
if(alias.getList().equalsIgnoreCase(name)) if(alias.getList().equalsIgnoreCase(name))
@@ -91,6 +92,7 @@ public class AliasModel extends AbstractTableModel
//Register the new alias list to receive updates from this model //Register the new alias list to receive updates from this model
addListener(aliasList); addListener(aliasList);
}
return aliasList; return aliasList;
} }
@@ -213,6 +215,7 @@ public class AliasModel extends AbstractTableModel
/** /**
* Renames any broadcast channels that have the previous name. * Renames any broadcast channels that have the previous name.
*
* @param previousName to rename * @param previousName to rename
* @param newName to assign to the broadcast channel * @param newName to assign to the broadcast channel
*/ */