Resolves issue with Null Pointer exception in alias list

This commit is contained in:
Denny
2017-02-20 20:19:47 -05:00
parent 17c7466c6b
commit 234e313b7a

View File

@@ -17,6 +17,12 @@
******************************************************************************/
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.Collections;
import java.util.HashMap;
@@ -24,13 +30,6 @@ import java.util.List;
import java.util.Map;
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
*/
@@ -57,40 +56,43 @@ public class AliasModel extends AbstractTableModel
*/
public List<Alias> getAliases()
{
return Collections.unmodifiableList( mAliases );
return Collections.unmodifiableList(mAliases);
}
public Alias getAliasAtIndex( int row )
public Alias getAliasAtIndex(int row)
{
if( mAliases.size() >= row )
if(mAliases.size() >= row)
{
return mAliases.get( row );
return mAliases.get(row);
}
return null;
}
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);
for( Alias alias: mAliases )
if(name != null)
{
if( alias.getList().equalsIgnoreCase( name ) )
for(Alias alias : mAliases)
{
aliasList.addAlias( alias );
if(alias.getList().equalsIgnoreCase(name))
{
aliasList.addAlias(alias);
}
}
mAliasListMap.put( name, aliasList );
mAliasListMap.put(name, aliasList);
//Register the new alias list to receive updates from this model
addListener( aliasList );
addListener(aliasList);
}
return aliasList;
}
@@ -102,15 +104,15 @@ public class AliasModel extends AbstractTableModel
{
List<String> listNames = new ArrayList<>();
for( Alias alias: mAliases )
for(Alias alias : mAliases)
{
if( alias.hasList() && !listNames.contains( alias.getList() ) )
if(alias.hasList() && !listNames.contains(alias.getList()))
{
listNames.add( alias.getList() );
listNames.add(alias.getList());
}
}
Collections.sort( listNames );
Collections.sort(listNames);
return listNames;
}
@@ -122,15 +124,15 @@ public class AliasModel extends AbstractTableModel
{
List<String> groupNames = new ArrayList<>();
for( Alias alias: mAliases )
for(Alias alias : mAliases)
{
if( alias.hasGroup() && !groupNames.contains( alias.getGroup() ) )
if(alias.hasGroup() && !groupNames.contains(alias.getGroup()))
{
groupNames.add( alias.getGroup() );
groupNames.add(alias.getGroup());
}
}
Collections.sort( groupNames );
Collections.sort(groupNames);
return groupNames;
}
@@ -139,25 +141,25 @@ public class AliasModel extends AbstractTableModel
* Returns a list of alias group names for all aliases that have a matching
* list name value
*/
public List<String> getGroupNames( String listName )
public List<String> getGroupNames(String listName)
{
List<String> groupNames = new ArrayList<>();
if( listName != null )
if(listName != null)
{
for( Alias alias: mAliases )
for(Alias alias : mAliases)
{
if( alias.hasList() &&
if(alias.hasList() &&
alias.hasGroup() &&
listName.equals( alias.getList() ) &&
!groupNames.contains( alias.getGroup() ) )
listName.equals(alias.getList()) &&
!groupNames.contains(alias.getGroup()))
{
groupNames.add( alias.getGroup() );
groupNames.add(alias.getGroup());
}
}
}
Collections.sort( groupNames );
Collections.sort(groupNames);
return groupNames;
}
@@ -165,28 +167,28 @@ public class AliasModel extends AbstractTableModel
/**
* Bulk loading of aliases
*/
public void addAliases( List<Alias> aliases )
public void addAliases(List<Alias> aliases)
{
for( Alias alias: aliases )
for(Alias alias : aliases)
{
addAlias( alias );
addAlias(alias);
}
}
/**
* Adds the alias to the model
*/
public int addAlias( Alias alias )
public int addAlias(Alias alias)
{
if( alias != null )
if(alias != null)
{
mAliases.add( alias );
mAliases.add(alias);
int index = mAliases.size() - 1;
fireTableRowsInserted( index, index );
fireTableRowsInserted(index, index);
broadcast( new AliasEvent( alias, Event.ADD ) );
broadcast(new AliasEvent(alias, Event.ADD));
return index;
}
@@ -197,22 +199,23 @@ public class AliasModel extends AbstractTableModel
/**
* Removes the channel from the model and broadcasts a channel remove event
*/
public void removeAlias( Alias alias )
public void removeAlias(Alias alias)
{
if( alias != null )
if(alias != null)
{
int index = mAliases.indexOf( alias );
int index = mAliases.indexOf(alias);
mAliases.remove( alias );
mAliases.remove(alias);
fireTableRowsDeleted( index, index );
fireTableRowsDeleted(index, index);
broadcast( new AliasEvent( alias, Event.DELETE ) );
broadcast(new AliasEvent(alias, Event.DELETE));
}
}
/**
* Renames any broadcast channels that have the previous name.
*
* @param previousName to rename
* @param newName to assign to the broadcast channel
*/
@@ -223,11 +226,11 @@ public class AliasModel extends AbstractTableModel
return;
}
for(Alias alias: mAliases)
for(Alias alias : mAliases)
{
if(alias.hasBroadcastChannel(previousName))
{
for(BroadcastChannel broadcastChannel: alias.getBroadcastChannels())
for(BroadcastChannel broadcastChannel : alias.getBroadcastChannels())
{
if(broadcastChannel.getChannelName().contentEquals(previousName))
{
@@ -251,9 +254,9 @@ public class AliasModel extends AbstractTableModel
}
@Override
public String getColumnName( int columnIndex )
public String getColumnName(int columnIndex)
{
switch( columnIndex )
switch(columnIndex)
{
case COLUMN_LIST:
return "List";
@@ -271,9 +274,9 @@ public class AliasModel extends AbstractTableModel
}
@Override
public Class<?> getColumnClass( int columnIndex )
public Class<?> getColumnClass(int columnIndex)
{
if( columnIndex == COLUMN_COLOR )
if(columnIndex == COLUMN_COLOR)
{
return Integer.class;
}
@@ -282,17 +285,17 @@ public class AliasModel extends AbstractTableModel
}
@Override
public boolean isCellEditable( int rowIndex, int columnIndex )
public boolean isCellEditable(int rowIndex, int columnIndex)
{
return false;
}
@Override
public Object getValueAt( int rowIndex, int columnIndex )
public Object getValueAt(int rowIndex, int columnIndex)
{
Alias alias = mAliases.get( rowIndex );
Alias alias = mAliases.get(rowIndex);
switch( columnIndex )
switch(columnIndex)
{
case COLUMN_LIST:
return alias.getList();
@@ -310,12 +313,12 @@ public class AliasModel extends AbstractTableModel
}
@Override
public void setValueAt( Object aValue, int rowIndex, int columnIndex )
public void setValueAt(Object aValue, int rowIndex, int columnIndex)
{
throw new IllegalArgumentException( "Not yet implemented" );
throw new IllegalArgumentException("Not yet implemented");
}
public void broadcast( AliasEvent event )
public void broadcast(AliasEvent event)
{
Alias alias = event.getAlias();
@@ -325,23 +328,23 @@ public class AliasModel extends AbstractTableModel
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);
}
}