Work in progress.

-Started work on new channel editor channel viewer/controller
-Removed a number of unused buffer package classes
-Moved automatic frequency control to be a module and removed special
handling
-Added IUnfilteredRealBufferListener & Provider interfaces
-Completely removed the ResourceManager class

src/alias/AliasDirectoryNode.java

@@ -23,15 +23,27 @@ import java.awt.event.ActionListener;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
+import settings.SettingsManager;
 import controller.ConfigurableNode;
 
 public class AliasDirectoryNode extends ConfigurableNode
 {
     private static final long serialVersionUID = 1L;
+
+    private PlaylistManager mPlaylistManager;
     
-    public AliasDirectoryNode( AliasDirectory directory )
+    private SettingsManager mSettingsManager;
+    
+    public AliasDirectoryNode( PlaylistManager playlistManager,
+    						   SettingsManager settingsManager, 
+    						   AliasDirectory directory )
 	{
-        super( directory );
+        super( playlistManager, directory );
+
+        mPlaylistManager = playlistManager;
+        
+        mSettingsManager = settingsManager;
 	}
     
     public AliasDirectory getAliasDirectory()
@@ -43,7 +55,7 @@ public class AliasDirectoryNode extends ConfigurableNode
     {
     	for( AliasList list: getAliasDirectory().getAliasList() )
     	{
-    		AliasListNode node = new AliasListNode( list );
+    		AliasListNode node = new AliasListNode( mPlaylistManager, mSettingsManager, list );
     		
     		getModel().addNode( node, AliasDirectoryNode.this, getChildCount() );
     		
@@ -72,7 +84,7 @@ public class AliasDirectoryNode extends ConfigurableNode
 				
 				getAliasDirectory().addAliasList( list );
 				
-				AliasListNode node = new AliasListNode( list );
+				AliasListNode node = new AliasListNode( mPlaylistManager, mSettingsManager, list );
 				
 				getModel().addNode( node, 
 									AliasDirectoryNode.this, 

src/alias/AliasEditor.java

@@ -19,6 +19,7 @@ package alias;
 
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -32,19 +33,19 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.tree.TreePath;
 
+import map.IconManager;
 import map.MapIcon;
 import map.MapIconListCellRenderer;
 import net.miginfocom.swing.MigLayout;
 import settings.SettingsManager;
 import controller.ConfigurableNode;
-import controller.ResourceManager;
 
 public class AliasEditor extends JPanel implements ActionListener
 {
     private static final long serialVersionUID = 1L;
     
     private AliasNode mAliasNode;
-    private ResourceManager mResourceManager;
+    private SettingsManager mSettingsManager;
     
     private JLabel mLabelName;
     private JTextField mTextAlias;
@@ -54,10 +55,11 @@ public class AliasEditor extends JPanel implements ActionListener
     private JComboBox<MapIcon> mComboMapIcon;
     private JButton mBtnIconManager;
     
-    public AliasEditor( AliasNode aliasNode, ResourceManager resourceManager )
+    public AliasEditor( AliasNode aliasNode, 
+    					SettingsManager settingsManager )
 	{
 		mAliasNode = aliasNode;
-		mResourceManager = resourceManager;
+		mSettingsManager = settingsManager;
 		
 		initGUI();
 	}
@@ -98,8 +100,7 @@ public class AliasEditor extends JPanel implements ActionListener
 		
 		add( new JLabel( "Icon:" ) );
 
-		mComboMapIcon = new JComboBox<MapIcon>( 
-				mResourceManager.getSettingsManager().getMapIcons() );
+		mComboMapIcon = new JComboBox<MapIcon>( mSettingsManager.getMapIcons() );
 
 		MapIconListCellRenderer renderer = new MapIconListCellRenderer();
 		renderer.setPreferredSize( new Dimension( 200, 30 ) );
@@ -112,8 +113,7 @@ public class AliasEditor extends JPanel implements ActionListener
 			iconName = SettingsManager.DEFAULT_ICON;
 		}
 		
-		MapIcon savedIcon = mResourceManager.getSettingsManager()
-				.getMapIcon( iconName );
+		MapIcon savedIcon = mSettingsManager.getMapIcon( iconName );
 
 		if( savedIcon != null )
 		{
@@ -131,7 +131,17 @@ public class AliasEditor extends JPanel implements ActionListener
 			@Override
             public void actionPerformed( ActionEvent arg0 )
             {
-				mResourceManager.getController().showIconManager();
+				final IconManager iconManager = 
+						new IconManager( mSettingsManager, AliasEditor.this );
+				
+				EventQueue.invokeLater( new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						iconManager.setVisible( true );
+					}
+				} );
             }
 		} );
 		add( mBtnIconManager, "span 2,wrap" );
@@ -194,7 +204,7 @@ public class AliasEditor extends JPanel implements ActionListener
 			mButtonColor.setBackground( mAliasNode.getAlias().getMapColor() );
 			mButtonColor.setForeground( mAliasNode.getAlias().getMapColor() );
 
-			MapIcon savedIcon = mResourceManager.getSettingsManager()
+			MapIcon savedIcon = mSettingsManager
 					.getMapIcon( mAliasNode.getAlias().getIconName() );
 			
 			mComboMapIcon.setSelectedItem( savedIcon );

src/alias/AliasIDNode.java

@@ -17,19 +17,20 @@
  ******************************************************************************/
 package alias;
 
+import playlist.PlaylistManager;
 import controller.ConfigurableNode;
 
 public class AliasIDNode extends ConfigurableNode
 {
     private static final long serialVersionUID = 1L;
 
-    public AliasIDNode( AliasID id )
+    public AliasIDNode( PlaylistManager playlistManager, AliasID id )
 	{
-    	super( id );
+    	super( playlistManager, id );
 	}
     
     public void save()
     {
-        getModel().getResourceManager().getPlaylistManager().save();
+    	getPlaylistManager().save();
     }
 }

src/alias/AliasListNode.java

@@ -26,15 +26,25 @@ import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
 
+import playlist.PlaylistManager;
+import settings.SettingsManager;
 import controller.ConfigurableNode;
 
 public class AliasListNode extends ConfigurableNode
 {
     private static final long serialVersionUID = 1L;
+
+    private PlaylistManager mPlaylistManager;
+    private SettingsManager mSettingsManager;
     
-    public AliasListNode( AliasList list )
+    public AliasListNode( PlaylistManager playlistManager, 
+    					  SettingsManager settingsManager, 
+    					  AliasList list )
 	{
-    	super( list );
+    	super( playlistManager, list );
+
+    	mPlaylistManager = playlistManager;
+    	mSettingsManager = settingsManager;
 	}
     
     @Override
@@ -52,7 +62,7 @@ public class AliasListNode extends ConfigurableNode
     {
     	for( Group group: getList().getGroup() )
     	{
-    		GroupNode node = new GroupNode( group );
+    		GroupNode node = new GroupNode( mPlaylistManager, mSettingsManager, group );
 
     		getModel().addNode( node, AliasListNode.this, getChildCount() );
     		
@@ -81,7 +91,7 @@ public class AliasListNode extends ConfigurableNode
 				
 				getList().addGroup( group );
 				
-				GroupNode node = new GroupNode( group );
+				GroupNode node = new GroupNode( mPlaylistManager, mSettingsManager, group );
 				
 				getModel().addNode( node, 
 									AliasListNode.this, 

src/alias/AliasNode.java

@@ -27,6 +27,8 @@ import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
 import map.MapIcon;
+import playlist.PlaylistManager;
+import settings.SettingsManager;
 import alias.action.AliasAction;
 import alias.action.beep.BeepAction;
 import alias.action.beep.BeepActionNode;
@@ -64,15 +66,22 @@ public class AliasNode extends ConfigurableNode
 {
     private static final long serialVersionUID = 1L;
     
-    public AliasNode( Alias alias )
+    private SettingsManager mSettingsManager;
+    private PlaylistManager mPlaylistManager;
+    
+    public AliasNode( PlaylistManager playlistManager, 
+    				  SettingsManager settingsManager, 
+    				  Alias alias )
 	{
-    	super( alias );
+    	super( playlistManager, alias );
+    	
+    	mSettingsManager = settingsManager;
 	}
     
     @Override
     public JPanel getEditor()
     {
-        return new AliasEditor( this, getModel().getResourceManager() );
+        return new AliasEditor( this, mSettingsManager );
     }
     
     public Alias getAlias()
@@ -84,8 +93,7 @@ public class AliasNode extends ConfigurableNode
     {
     	String icon = getAlias().getIconName();
 
-    	MapIcon mapIcon = getModel().getResourceManager()
-    			.getSettingsManager().getMapIcon( icon );
+    	MapIcon mapIcon = mSettingsManager.getMapIcon( icon );
 
     	if( mapIcon != null )
     	{
@@ -104,51 +112,51 @@ public class AliasNode extends ConfigurableNode
     		switch( aliasID.getType() )
     		{
     			case ESN:
-            		getModel().addNode( new ESNNode( (Esn)aliasID ), 
+            		getModel().addNode( new ESNNode( mPlaylistManager, (Esn)aliasID ), 
             				AliasNode.this, getChildCount() );
     				break;
 				case Fleetsync:
-	        		getModel().addNode( new FleetsyncIDNode( (FleetsyncID)aliasID ), 
+	        		getModel().addNode( new FleetsyncIDNode( mPlaylistManager, (FleetsyncID)aliasID ), 
 	        				AliasNode.this, getChildCount() );
 					break;
 				case LoJack:
-	        		getModel().addNode( new LoJackIDNode( (LoJackFunctionAndID)aliasID ), 
+	        		getModel().addNode( new LoJackIDNode( mPlaylistManager, (LoJackFunctionAndID)aliasID ), 
 	        				AliasNode.this, getChildCount() );
 					break;
 				case LTRNetUID:
-	        		getModel().addNode( new UniqueIDNode( (UniqueID)aliasID ), 
+	        		getModel().addNode( new UniqueIDNode( mPlaylistManager, (UniqueID)aliasID ), 
 	        				AliasNode.this, getChildCount() );
 					break;
 				case MDC1200:
-	        		getModel().addNode( new MDC1200IDNode( (MDC1200ID)aliasID ), 
+	        		getModel().addNode( new MDC1200IDNode( mPlaylistManager, (MDC1200ID)aliasID ), 
 	        				AliasNode.this, getChildCount() );
 					break;
 				case MIN:
-	        		getModel().addNode( new MINNode( (Min)aliasID ), 
+	        		getModel().addNode( new MINNode( mPlaylistManager, (Min)aliasID ), 
 	        				AliasNode.this, getChildCount() );
 					break;
 				case MPT1327:
-	        		getModel().addNode( new MPT1327IDNode( (MPT1327ID)aliasID ), 
+	        		getModel().addNode( new MPT1327IDNode( mPlaylistManager, (MPT1327ID)aliasID ), 
 	        				AliasNode.this, getChildCount() );
 					break;
 				case NonRecordable:
-	        		getModel().addNode( new NonRecordableNode( (NonRecordable)aliasID ), 
+	        		getModel().addNode( new NonRecordableNode( mPlaylistManager, (NonRecordable)aliasID ), 
 	        				AliasNode.this, getChildCount() );
 					break;
 				case Priority:
-	        		getModel().addNode( new PriorityNode( (Priority)aliasID ), 
+	        		getModel().addNode( new PriorityNode( mPlaylistManager, (Priority)aliasID ), 
 	        				AliasNode.this, getChildCount() );
 	        		break;
 				case Site:
-	        		getModel().addNode( new SiteIDNode( (SiteID)aliasID ), 
+	        		getModel().addNode( new SiteIDNode( mPlaylistManager, (SiteID)aliasID ), 
 	        				AliasNode.this, getChildCount() );
 					break;
 				case Status:
-	        		getModel().addNode( new StatusIDNode( (StatusID)aliasID ), 
+	        		getModel().addNode( new StatusIDNode( mPlaylistManager, (StatusID)aliasID ), 
 	        				AliasNode.this, getChildCount() );
 					break;
 				case Talkgroup:
-	        		getModel().addNode( new TalkgroupIDNode( (TalkgroupID)aliasID ), 
+	        		getModel().addNode( new TalkgroupIDNode( mPlaylistManager, (TalkgroupID)aliasID ), 
 	        				AliasNode.this, getChildCount() );
 					break;
 				default:
@@ -161,17 +169,17 @@ public class AliasNode extends ConfigurableNode
     	{
     		if( action instanceof BeepAction )
     		{
-        		getModel().addNode( new BeepActionNode( (BeepAction)action ), 
+        		getModel().addNode( new BeepActionNode( mPlaylistManager, (BeepAction)action ), 
         				AliasNode.this, getChildCount() );
     		}
     		else if( action instanceof ClipAction )
     		{
-        		getModel().addNode( new ClipActionNode( (ClipAction)action ), 
+        		getModel().addNode( new ClipActionNode( mPlaylistManager, (ClipAction)action ), 
         				AliasNode.this, getChildCount() );
     		}
     		else if( action instanceof ScriptAction )
     		{
-        		getModel().addNode( new ScriptActionNode( (ScriptAction)action ), 
+        		getModel().addNode( new ScriptActionNode( mPlaylistManager, (ScriptAction)action ), 
         				AliasNode.this, getChildCount() );
     		}
     	}
@@ -200,7 +208,7 @@ public class AliasNode extends ConfigurableNode
 				
 				getAlias().addAliasID( esn );
 				
-				ESNNode node = new ESNNode( esn );
+				ESNNode node = new ESNNode( mPlaylistManager, esn );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -221,7 +229,7 @@ public class AliasNode extends ConfigurableNode
 				
 				getAlias().addAliasID( fs );
 				
-				FleetsyncIDNode node = new FleetsyncIDNode( fs );
+				FleetsyncIDNode node = new FleetsyncIDNode( mPlaylistManager, fs );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -242,7 +250,7 @@ public class AliasNode extends ConfigurableNode
 				
 				getAlias().addAliasID( lj );
 				
-				LoJackIDNode node = new LoJackIDNode( lj );
+				LoJackIDNode node = new LoJackIDNode( mPlaylistManager, lj );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -263,7 +271,7 @@ public class AliasNode extends ConfigurableNode
 				
 				getAlias().addAliasID( mdc );
 				
-				MDC1200IDNode node = new MDC1200IDNode( mdc );
+				MDC1200IDNode node = new MDC1200IDNode( mPlaylistManager, mdc );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -284,7 +292,7 @@ public class AliasNode extends ConfigurableNode
 				
 				getAlias().addAliasID( min );
 				
-				MINNode node = new MINNode( min );
+				MINNode node = new MINNode( mPlaylistManager, min );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -305,7 +313,7 @@ public class AliasNode extends ConfigurableNode
 				
 				getAlias().addAliasID( mpt );
 				
-				MPT1327IDNode node = new MPT1327IDNode( mpt );
+				MPT1327IDNode node = new MPT1327IDNode( mPlaylistManager, mpt );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -326,7 +334,7 @@ public class AliasNode extends ConfigurableNode
 				
 				getAlias().addAliasID( siteID );
 				
-				SiteIDNode node = new SiteIDNode( siteID );
+				SiteIDNode node = new SiteIDNode( mPlaylistManager, siteID );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -347,7 +355,7 @@ public class AliasNode extends ConfigurableNode
 				
 				getAlias().addAliasID( statusID );
 				
-				StatusIDNode node = new StatusIDNode( statusID );
+				StatusIDNode node = new StatusIDNode( mPlaylistManager, statusID );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -369,7 +377,7 @@ public class AliasNode extends ConfigurableNode
 				
 				getAlias().addAliasID( tg );
 				
-				TalkgroupIDNode node = new TalkgroupIDNode( tg );
+				TalkgroupIDNode node = new TalkgroupIDNode( mPlaylistManager, tg );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -390,7 +398,7 @@ public class AliasNode extends ConfigurableNode
 				
 				getAlias().addAliasID( uid );
 				
-				UniqueIDNode node = new UniqueIDNode( uid );
+				UniqueIDNode node = new UniqueIDNode( mPlaylistManager, uid );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -416,7 +424,7 @@ public class AliasNode extends ConfigurableNode
 
 				getAlias().addAliasAction( clipAction );
 				
-				ClipActionNode node = new ClipActionNode( clipAction );
+				ClipActionNode node = new ClipActionNode( mPlaylistManager, clipAction );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -439,7 +447,7 @@ public class AliasNode extends ConfigurableNode
 
 				getAlias().addAliasAction( beepAction );
 				
-				BeepActionNode node = new BeepActionNode( beepAction );
+				BeepActionNode node = new BeepActionNode( mPlaylistManager, beepAction );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -462,7 +470,7 @@ public class AliasNode extends ConfigurableNode
 
 				getAlias().addAliasAction( scriptAction );
 				
-				ScriptActionNode node = new ScriptActionNode( scriptAction );
+				ScriptActionNode node = new ScriptActionNode( mPlaylistManager, scriptAction );
 				
 				getModel().addNode( node, 
 									AliasNode.this, 
@@ -491,7 +499,7 @@ public class AliasNode extends ConfigurableNode
 					
 					getAlias().addAliasID( non );
 
-					NonRecordableNode node = new NonRecordableNode( non );
+					NonRecordableNode node = new NonRecordableNode( mPlaylistManager, non );
 					
 					getModel().addNode( node, 
 										AliasNode.this, 
@@ -518,7 +526,7 @@ public class AliasNode extends ConfigurableNode
 					
 					getAlias().addAliasID( priority );
 
-					PriorityNode node = new PriorityNode( priority );
+					PriorityNode node = new PriorityNode( mPlaylistManager, priority );
 					
 					getModel().addNode( node, 
 										AliasNode.this, 

src/alias/GroupNode.java

@@ -26,15 +26,24 @@ import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
 
+import playlist.PlaylistManager;
+import settings.SettingsManager;
 import controller.ConfigurableNode;
 
 public class GroupNode extends ConfigurableNode 
 {
     private static final long serialVersionUID = 1L;
+
+    private PlaylistManager mPlaylistManager;
+    private SettingsManager mSettingsManager;
     
-    public GroupNode( Group group )
+    public GroupNode( PlaylistManager playlistManager, 
+    				  SettingsManager settingsManager, 
+    				  Group group )
 	{
-    	super( group );
+    	super( playlistManager, group );
+    	
+    	mSettingsManager = settingsManager;
 	}
     
     @Override
@@ -52,7 +61,7 @@ public class GroupNode extends ConfigurableNode
     {
     	for( Alias alias: getGroup().getAlias() )
     	{
-    		AliasNode node = new AliasNode( alias );
+    		AliasNode node = new AliasNode( mPlaylistManager, mSettingsManager, alias );
     		
     		getModel().addNode( node, GroupNode.this, getChildCount() );
     		
@@ -81,7 +90,7 @@ public class GroupNode extends ConfigurableNode
 				
 				getGroup().addAlias( alias );
 				
-				AliasNode node = new AliasNode( alias );
+				AliasNode node = new AliasNode( mPlaylistManager, mSettingsManager, alias );
 				
 				getModel().addNode( node, 
 									GroupNode.this, 

src/alias/action/AliasActionNode.java

@@ -17,20 +17,25 @@
  ******************************************************************************/
 package alias.action;
 
+import playlist.PlaylistManager;
 import controller.ConfigurableNode;
 
 public class AliasActionNode extends ConfigurableNode
 {
     private static final long serialVersionUID = 1L;
+    
+    private PlaylistManager mPlaylistManager;
 
-    public AliasActionNode( AliasAction action )
+    public AliasActionNode( PlaylistManager playlistManager, AliasAction action )
 	{
-    	super( action );
+    	super( playlistManager, action );
+    	
+    	mPlaylistManager = playlistManager;
 	}
     
     public void save()
     {
-        getModel().getResourceManager().getPlaylistManager().save();
+    	mPlaylistManager.save();
     }
     
     public String getIconPath()

src/alias/action/beep/BeepActionNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasNode;
 import alias.action.AliasActionNode;
 
@@ -32,9 +33,9 @@ public class BeepActionNode extends AliasActionNode
 {
     private static final long serialVersionUID = 1L;
     
-    public BeepActionNode( BeepAction beepAction )
+    public BeepActionNode( PlaylistManager playlistManager, BeepAction beepAction )
 	{
-    	super( beepAction );
+    	super( playlistManager, beepAction );
 	}
     
     @Override

src/alias/action/clip/ClipActionNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasNode;
 import alias.action.AliasActionNode;
 
@@ -32,9 +33,9 @@ public class ClipActionNode extends AliasActionNode
 {
     private static final long serialVersionUID = 1L;
     
-    public ClipActionNode( ClipAction clipAction )
+    public ClipActionNode( PlaylistManager playlistManager, ClipAction clipAction )
 	{
-    	super( clipAction );
+    	super( playlistManager, clipAction );
 	}
     
     @Override

src/alias/action/script/ScriptActionNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasNode;
 import alias.action.AliasActionNode;
 
@@ -32,9 +33,9 @@ public class ScriptActionNode extends AliasActionNode
 {
     private static final long serialVersionUID = 1L;
     
-    public ScriptActionNode( ScriptAction scriptAction )
+    public ScriptActionNode( PlaylistManager playlistManager, ScriptAction scriptAction )
 	{
-    	super( scriptAction );
+    	super( playlistManager, scriptAction );
 	}
     
     @Override

src/alias/id/esn/ESNNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasIDNode;
 import alias.AliasNode;
 
@@ -32,9 +33,9 @@ public class ESNNode extends AliasIDNode
 {
     private static final long serialVersionUID = 1L;
 
-    public ESNNode( Esn esn )
+    public ESNNode( PlaylistManager playlistManager, Esn esn )
 	{
-        super( esn );
+        super( playlistManager, esn );
  	}
     
     @Override

src/alias/id/fleetsync/FleetsyncIDNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasIDNode;
 import alias.AliasNode;
 
@@ -32,9 +33,9 @@ public class FleetsyncIDNode extends AliasIDNode
 {
     private static final long serialVersionUID = 1L;
     
-    public FleetsyncIDNode( FleetsyncID id )
+    public FleetsyncIDNode( PlaylistManager playlistManager, FleetsyncID id )
 	{
-        super( id );
+        super( playlistManager, id );
 	}
     
     @Override

src/alias/id/fleetsync/StatusIDNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasIDNode;
 import alias.AliasNode;
 
@@ -32,9 +33,9 @@ public class StatusIDNode extends AliasIDNode
 {
     private static final long serialVersionUID = 1L;
     
-    public StatusIDNode( StatusID id )
+    public StatusIDNode( PlaylistManager playlistManager, StatusID id )
 	{
-    	super( id );
+    	super( playlistManager, id );
 	}
     
     @Override

src/alias/id/lojack/LoJackIDNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasIDNode;
 import alias.AliasNode;
 
@@ -32,9 +33,9 @@ public class LoJackIDNode extends AliasIDNode
 {
     private static final long serialVersionUID = 1L;
     
-    public LoJackIDNode( LoJackFunctionAndID id )
+    public LoJackIDNode( PlaylistManager playlistManager, LoJackFunctionAndID id )
 	{
-        super( id );
+        super( playlistManager,id );
 	}
     
     @Override

src/alias/id/mdc/MDC1200IDNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasIDNode;
 import alias.AliasNode;
 
@@ -32,9 +33,9 @@ public class MDC1200IDNode extends AliasIDNode
 {
     private static final long serialVersionUID = 1L;
     
-    public MDC1200IDNode( MDC1200ID id )
+    public MDC1200IDNode( PlaylistManager playlistManager, MDC1200ID id )
 	{
-        super( id );
+        super( playlistManager, id );
 	}
     
     @Override

src/alias/id/mobileID/MINNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasIDNode;
 import alias.AliasNode;
 
@@ -32,9 +33,9 @@ public class MINNode extends AliasIDNode
 {
     private static final long serialVersionUID = 1L;
 
-    public MINNode( Min min )
+    public MINNode( PlaylistManager playlistManager, Min min )
 	{
-        super( min );
+        super( playlistManager, min );
  	}
     
     @Override

src/alias/id/mpt1327/MPT1327IDNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasIDNode;
 import alias.AliasNode;
 
@@ -32,9 +33,9 @@ public class MPT1327IDNode extends AliasIDNode
 {
     private static final long serialVersionUID = 1L;
     
-    public MPT1327IDNode( MPT1327ID id )
+    public MPT1327IDNode( PlaylistManager playlistManager, MPT1327ID id )
 	{
-        super( id );
+        super( playlistManager, id );
 	}
     
     @Override

src/alias/id/siteID/SiteIDNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasIDNode;
 import alias.AliasNode;
 
@@ -32,9 +33,9 @@ public class SiteIDNode extends AliasIDNode
 {
     private static final long serialVersionUID = 1L;
     
-    public SiteIDNode( SiteID id )
+    public SiteIDNode( PlaylistManager playlistManager, SiteID id )
 	{
-    	super( id );
+    	super( playlistManager, id );
 	}
     
     @Override

src/alias/id/talkgroup/TalkgroupIDNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasIDNode;
 import alias.AliasNode;
 
@@ -32,9 +33,9 @@ public class TalkgroupIDNode extends AliasIDNode
 {
     private static final long serialVersionUID = 1L;
     
-    public TalkgroupIDNode( TalkgroupID id )
+    public TalkgroupIDNode( PlaylistManager playlistManager, TalkgroupID id )
 	{
-    	super( id );
+    	super( playlistManager,id );
 	}
     
     @Override

src/alias/id/uniqueID/UniqueIDNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasIDNode;
 import alias.AliasNode;
 
@@ -32,9 +33,9 @@ public class UniqueIDNode extends AliasIDNode
 {
     private static final long serialVersionUID = 1L;
     
-    public UniqueIDNode( UniqueID id )
+    public UniqueIDNode( PlaylistManager playlistManager, UniqueID id )
 	{
-    	super( id );
+    	super( playlistManager, id );
 	}
     
     @Override

src/alias/priority/PriorityNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasIDNode;
 import alias.AliasNode;
 
@@ -32,9 +33,9 @@ public class PriorityNode extends AliasIDNode
 {
     private static final long serialVersionUID = 1L;
 
-    public PriorityNode( Priority priority )
+    public PriorityNode( PlaylistManager playlistManager, Priority priority )
 	{
-        super( priority );
+        super( playlistManager, priority );
  	}
     
     @Override

src/alias/record/NonRecordableNode.java

@@ -25,6 +25,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
+import playlist.PlaylistManager;
 import alias.AliasID;
 import alias.AliasIDNode;
 import alias.AliasNode;
@@ -33,9 +34,9 @@ public class NonRecordableNode extends AliasIDNode
 {
     private static final long serialVersionUID = 1L;
     
-    public NonRecordableNode( NonRecordable id )
+    public NonRecordableNode( PlaylistManager playlistManager, NonRecordable id )
 	{
-    	super( id );
+    	super( playlistManager, id );
 	}
     
     @Override