GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-13 09:07:27 -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

527
src/alias/AliasModel.java
View File

@@ -1,22 +1,28 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * SDR Trunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2016 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
******************************************************************************/ ******************************************************************************/
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,195 +30,192 @@ 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
*/ */
public class AliasModel extends AbstractTableModel public class AliasModel extends AbstractTableModel
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static final int COLUMN_LIST = 0; public static final int COLUMN_LIST = 0;
public static final int COLUMN_GROUP = 1; public static final int COLUMN_GROUP = 1;
public static final int COLUMN_NAME = 2; public static final int COLUMN_NAME = 2;
public static final int COLUMN_ICON = 3; public static final int COLUMN_ICON = 3;
public static final int COLUMN_COLOR = 4; public static final int COLUMN_COLOR = 4;
private List<Alias> mAliases = new CopyOnWriteArrayList<>(); private List<Alias> mAliases = new CopyOnWriteArrayList<>();
private Broadcaster<AliasEvent> mAliasEventBroadcaster = new Broadcaster<>(); private Broadcaster<AliasEvent> mAliasEventBroadcaster = new Broadcaster<>();
private Map<String,AliasList> mAliasListMap = new HashMap<>(); private Map<String,AliasList> mAliasListMap = new HashMap<>();
public AliasModel() public AliasModel()
{ {
} }
/** /**
* Unmodifiable list of all aliases currently in the model * Unmodifiable list of all aliases currently in the model
*/ */
public List<Alias> getAliases() public List<Alias> getAliases()
{ {
return Collections.unmodifiableList( mAliases ); return Collections.unmodifiableList(mAliases);
} }
public Alias getAliasAtIndex( int row )
{
if( mAliases.size() >= row )
{
return mAliases.get( row );
}
return null;
}
public AliasList getAliasList( String name )
{
if( mAliasListMap.containsKey( name ) )
{
return mAliasListMap.get( name );
}
AliasList aliasList = new AliasList( name );
for( Alias alias: mAliases )
{
if( alias.getList().equalsIgnoreCase( name ) )
{
aliasList.addAlias( alias );
}
}
mAliasListMap.put( name, aliasList ); public Alias getAliasAtIndex(int row)
{
if(mAliases.size() >= row)
{
return mAliases.get(row);
}
//Register the new alias list to receive updates from this model return null;
addListener( aliasList ); }
return aliasList;
}
/**
* Returns a list of unique alias list names from across the alias set
*/
public List<String> getListNames()
{
List<String> listNames = new ArrayList<>();
for( Alias alias: mAliases )
{
if( alias.hasList() && !listNames.contains( alias.getList() ) )
{
listNames.add( alias.getList() );
}
}
Collections.sort( listNames );
return listNames;
}
/**
* Returns a list of alias group names for all aliases
*/
public List<String> getGroupNames()
{
List<String> groupNames = new ArrayList<>();
for( Alias alias: mAliases ) public AliasList getAliasList(String name)
{ {
if( alias.hasGroup() && !groupNames.contains( alias.getGroup() ) ) if(name != null && mAliasListMap.containsKey(name))
{ {
groupNames.add( alias.getGroup() ); return mAliasListMap.get(name);
} }
}
Collections.sort( groupNames ); AliasList aliasList = new AliasList(name);
return groupNames;
}
/** if(name != null)
* Returns a list of alias group names for all aliases that have a matching {
* list name value for(Alias alias : mAliases)
*/ {
public List<String> getGroupNames( String listName ) if(alias.getList().equalsIgnoreCase(name))
{ {
List<String> groupNames = new ArrayList<>(); aliasList.addAlias(alias);
}
}
if( listName != null ) mAliasListMap.put(name, aliasList);
{
for( Alias alias: mAliases )
{
if( alias.hasList() &&
alias.hasGroup() &&
listName.equals( alias.getList() ) &&
!groupNames.contains( alias.getGroup() ) )
{
groupNames.add( alias.getGroup() );
}
}
}
Collections.sort( groupNames ); //Register the new alias list to receive updates from this model
addListener(aliasList);
return groupNames; }
}
/** return aliasList;
* Bulk loading of aliases }
*/
public void addAliases( List<Alias> aliases )
{
for( Alias alias: aliases )
{
addAlias( alias );
}
}
/** /**
* Adds the alias to the model * Returns a list of unique alias list names from across the alias set
*/ */
public int addAlias( Alias alias ) public List<String> getListNames()
{ {
if( alias != null ) List<String> listNames = new ArrayList<>();
{
mAliases.add( alias );
int index = mAliases.size() - 1; for(Alias alias : mAliases)
{
if(alias.hasList() && !listNames.contains(alias.getList()))
{
listNames.add(alias.getList());
}
}
fireTableRowsInserted( index, index ); Collections.sort(listNames);
broadcast( new AliasEvent( alias, Event.ADD ) );
return index; return listNames;
} }
return -1; /**
} * Returns a list of alias group names for all aliases
*/
/** public List<String> getGroupNames()
* Removes the channel from the model and broadcasts a channel remove event {
*/ List<String> groupNames = new ArrayList<>();
public void removeAlias( Alias alias )
{ for(Alias alias : mAliases)
if( alias != null ) {
{ if(alias.hasGroup() && !groupNames.contains(alias.getGroup()))
int index = mAliases.indexOf( alias ); {
groupNames.add(alias.getGroup());
mAliases.remove( alias ); }
}
fireTableRowsDeleted( index, index );
Collections.sort(groupNames);
broadcast( new AliasEvent( alias, Event.DELETE ) );
} return groupNames;
} }
/**
* Returns a list of alias group names for all aliases that have a matching
* list name value
*/
public List<String> getGroupNames(String listName)
{
List<String> groupNames = new ArrayList<>();
if(listName != null)
{
for(Alias alias : mAliases)
{
if(alias.hasList() &&
alias.hasGroup() &&
listName.equals(alias.getList()) &&
!groupNames.contains(alias.getGroup()))
{
groupNames.add(alias.getGroup());
}
}
}
Collections.sort(groupNames);
return groupNames;
}
/**
* Bulk loading of aliases
*/
public void addAliases(List<Alias> aliases)
{
for(Alias alias : aliases)
{
addAlias(alias);
}
}
/**
* Adds the alias to the model
*/
public int addAlias(Alias alias)
{
if(alias != null)
{
mAliases.add(alias);
int index = mAliases.size() - 1;
fireTableRowsInserted(index, index);
broadcast(new AliasEvent(alias, Event.ADD));
return index;
}
return -1;
}
/**
* Removes the channel from the model and broadcasts a channel remove event
*/
public void removeAlias(Alias alias)
{
if(alias != null)
{
int index = mAliases.indexOf(alias);
mAliases.remove(alias);
fireTableRowsDeleted(index, index);
broadcast(new AliasEvent(alias, Event.DELETE));
}
}
/** /**
* 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
*/ */
@@ -223,11 +226,11 @@ public class AliasModel extends AbstractTableModel
return; return;
} }
for(Alias alias: mAliases) for(Alias alias : mAliases)
{ {
if(alias.hasBroadcastChannel(previousName)) if(alias.hasBroadcastChannel(previousName))
{ {
for(BroadcastChannel broadcastChannel: alias.getBroadcastChannels()) for(BroadcastChannel broadcastChannel : alias.getBroadcastChannels())
{ {
if(broadcastChannel.getChannelName().contentEquals(previousName)) if(broadcastChannel.getChannelName().contentEquals(previousName))
{ {
@@ -238,85 +241,85 @@ public class AliasModel extends AbstractTableModel
} }
} }
@Override @Override
public int getRowCount() public int getRowCount()
{ {
return mAliases.size(); return mAliases.size();
} }
@Override @Override
public int getColumnCount() public int getColumnCount()
{ {
return 5; return 5;
} }
@Override @Override
public String getColumnName( int columnIndex ) public String getColumnName(int columnIndex)
{ {
switch( columnIndex ) switch(columnIndex)
{ {
case COLUMN_LIST: case COLUMN_LIST:
return "List"; return "List";
case COLUMN_GROUP: case COLUMN_GROUP:
return "Group"; return "Group";
case COLUMN_NAME: case COLUMN_NAME:
return "Name"; return "Name";
case COLUMN_ICON: case COLUMN_ICON:
return "Icon"; return "Icon";
case COLUMN_COLOR: case COLUMN_COLOR:
return "Color"; return "Color";
} }
return null;
}
@Override return null;
public Class<?> getColumnClass( int columnIndex ) }
{
if( columnIndex == COLUMN_COLOR )
{
return Integer.class;
}
return String.class;
}
@Override @Override
public boolean isCellEditable( int rowIndex, int columnIndex ) public Class<?> getColumnClass(int columnIndex)
{ {
return false; if(columnIndex == COLUMN_COLOR)
} {
return Integer.class;
}
@Override return String.class;
public Object getValueAt( int rowIndex, int columnIndex ) }
{
Alias alias = mAliases.get( rowIndex );
switch( columnIndex )
{
case COLUMN_LIST:
return alias.getList();
case COLUMN_GROUP:
return alias.getGroup();
case COLUMN_NAME:
return alias.getName();
case COLUMN_ICON:
return alias.getIconName();
case COLUMN_COLOR:
return alias.getColor();
}
return null;
}
@Override @Override
public void setValueAt( Object aValue, int rowIndex, int columnIndex ) public boolean isCellEditable(int rowIndex, int columnIndex)
{ {
throw new IllegalArgumentException( "Not yet implemented" ); return false;
} }
public void broadcast( AliasEvent event ) @Override
{ public Object getValueAt(int rowIndex, int columnIndex)
{
Alias alias = mAliases.get(rowIndex);
switch(columnIndex)
{
case COLUMN_LIST:
return alias.getList();
case COLUMN_GROUP:
return alias.getGroup();
case COLUMN_NAME:
return alias.getName();
case COLUMN_ICON:
return alias.getIconName();
case COLUMN_COLOR:
return alias.getColor();
}
return null;
}
@Override
public void setValueAt(Object aValue, int rowIndex, int columnIndex)
{
throw new IllegalArgumentException("Not yet implemented");
}
public void broadcast(AliasEvent event)
{
Alias alias = event.getAlias(); Alias alias = event.getAlias();
//Validate the alias following a user action that changed the alias or any alias IDs //Validate the alias following a user action that changed the alias or any alias IDs
@@ -325,23 +328,23 @@ public class AliasModel extends AbstractTableModel
alias.validate(); alias.validate();
} }
if( event.getEvent() == Event.CHANGE ) if(event.getEvent() == Event.CHANGE)
{ {
int index = mAliases.indexOf( event.getAlias() ); int index = mAliases.indexOf(event.getAlias());
fireTableRowsUpdated( index, index ); fireTableRowsUpdated(index, index);
} }
mAliasEventBroadcaster.broadcast( event ); mAliasEventBroadcaster.broadcast(event);
} }
public void addListener( Listener<AliasEvent> listener ) public void addListener(Listener<AliasEvent> listener)
{ {
mAliasEventBroadcaster.addListener( listener ); mAliasEventBroadcaster.addListener(listener);
} }
public void removeListener( Listener<AliasEvent> listener ) public void removeListener(Listener<AliasEvent> listener)
{ {
mAliasEventBroadcaster.removeListener( listener ); mAliasEventBroadcaster.removeListener(listener);
} }
} }