Resolved issue with channel label display in spectrum overlay panel

when a new tuner is added.

Cleanup of debugging messages.
This commit is contained in:
denny
2015-11-22 14:25:37 -05:00
parent 547da54340
commit f04a6727b0
18 changed files with 64 additions and 171 deletions

View File

@@ -740,7 +740,6 @@ public class Channel extends Configuration
public void setup() throws SourceException
{
setupProcessingChain();
setupSource();
}

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* Copyright (C) 2014,2015 Dennis Sheirer
*
* 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
@@ -18,6 +18,7 @@
package controller.channel;
import java.util.ArrayList;
import java.util.List;
import message.Message;
@@ -32,12 +33,9 @@ public class ChannelManager implements ChannelEventListener
{
private final static Logger mLog = LoggerFactory.getLogger( ChannelManager.class );
private ArrayList<Channel> mChannels = new ArrayList<Channel>();
private ArrayList<ChannelEventListener> mChannelListeners =
new ArrayList<ChannelEventListener>();
private ArrayList<Listener<Message>> mMessageListeners =
new ArrayList<Listener<Message>>();
private List<Channel> mChannels = new ArrayList<>();
private List<ChannelEventListener> mChannelListeners = new ArrayList<>();
private List<Listener<Message>> mMessageListeners = new ArrayList<>();
private AliasActionManager mAliasActionManager;
@@ -62,13 +60,13 @@ public class ChannelManager implements ChannelEventListener
{
switch( event.getEvent() )
{
case CHANNEL_ENABLED:
case CHANNEL_ADDED:
if( !mChannels.contains( event.getChannel() ) )
{
mChannels.add( event.getChannel() );
}
break;
case CHANNEL_DISABLED:
case CHANNEL_DELETED:
mChannels.remove( event.getChannel() );
break;
}
@@ -88,6 +86,11 @@ public class ChannelManager implements ChannelEventListener
channel.addListener( listener );
}
}
public List<Channel> getChannels()
{
return mChannels;
}
/**
* Removes a channel listener from being automatically added to all channels
@@ -107,7 +110,7 @@ public class ChannelManager implements ChannelEventListener
* Returns the list of channel change listeners that will be automatically
* added to all channels to receive channel change events
*/
public ArrayList<ChannelEventListener> getChannelListeners()
public List<ChannelEventListener> getChannelListeners()
{
return mChannelListeners;
}
@@ -116,7 +119,7 @@ public class ChannelManager implements ChannelEventListener
* Returns the list of channel change listeners that will be automatically
* added to all channels to receive channel change events
*/
public ArrayList<Listener<Message>> getMessageListeners()
public List<Listener<Message>> getMessageListeners()
{
return mMessageListeners;
}