Merges #34 Major redesign of Tuner, Channel and Alias management.

Changes to model, view and controller components and updates all gui
editors.  Removes the configuration panel and tree and replaces with 3
new panels.  Updates playlist.xml to a new playlist_v2.xml format.

src/map/IconManager.java

@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
 
 import settings.Setting;
 import settings.SettingChangeListener;
-import controller.ResourceManager;
+import settings.SettingsManager;
 
 public class IconManager extends JFrame 
 							  implements ActionListener, SettingChangeListener
@@ -62,8 +62,6 @@ public class IconManager extends JFrame
 	private final static Logger mLog = 
 			LoggerFactory.getLogger( IconManager.class );
     
-    private ResourceManager mResourceManager;
-    
     private static final String sMSG_NEW = "Type a name for the new icon, "
 		+ "select the file, and click Save,\nor Cancel to reset";
     private static final String sMSG_EDIT = "Change the name for the selected \n"
@@ -81,9 +79,11 @@ public class IconManager extends JFrame
     private JFileChooser mFileChooser;
     private Mode mMode = Mode.NORMAL;
     
-	public IconManager( ResourceManager resourceManager, Component displayOver )
+    private SettingsManager mSettingsManager;
+    
+	public IconManager( SettingsManager settingsManager, Component displayOver )
 	{
-		mResourceManager = resourceManager;
+		mSettingsManager = settingsManager;
 
 		init( displayOver );
 	}
@@ -128,7 +128,7 @@ public class IconManager extends JFrame
 		/**
 		 * MapIcon list
 		 */
-		MapIcon[] icons = mResourceManager.getSettingsManager().getMapIcons();
+		MapIcon[] icons = mSettingsManager.getMapIcons();
 		Arrays.sort( icons );
 		
     	mIconList = new JList<MapIcon>( icons );
@@ -176,8 +176,7 @@ public class IconManager extends JFrame
 							@Override
                             public void actionPerformed( ActionEvent e )
                             {
-								mResourceManager.getSettingsManager()
-									.setDefaultIcon( icon );
+								mSettingsManager.setDefaultIcon( icon );
 								
 								refreshList();
                             }
@@ -193,8 +192,7 @@ public class IconManager extends JFrame
 								@Override
 	                            public void actionPerformed( ActionEvent arg0 )
 	                            {
-									mResourceManager.getSettingsManager()
-												.deleteMapIcon( icon );
+									mSettingsManager.deleteMapIcon( icon );
 	                            }
 							} );
 							
@@ -350,7 +348,7 @@ public class IconManager extends JFrame
 	
 	private void refreshList()
 	{
-		MapIcon[] icons = mResourceManager.getSettingsManager().getMapIcons();
+		MapIcon[] icons = mSettingsManager.getMapIcons();
 		
 		Arrays.sort( icons );
 
@@ -371,8 +369,7 @@ public class IconManager extends JFrame
 				{
 					if( path != null && !path.isEmpty() )
 					{
-						mResourceManager.getSettingsManager()
-							.addMapIcon( new MapIcon( name, path, true ) );
+						mSettingsManager.addMapIcon( new MapIcon( name, path, true ) );
 					}
 					else
 					{
@@ -400,8 +397,7 @@ public class IconManager extends JFrame
 					{
 						selected.setName( name );
 						selected.setPath( path );
-						mResourceManager.getSettingsManager()
-								.updatMapIcon( selected, name, path );
+						mSettingsManager.updatMapIcon( selected, name, path );
 					}
 					else
 					{

src/map/MapPanel.java

@@ -21,7 +21,6 @@ import java.awt.EventQueue;
 
 import javax.swing.JPanel;
 
-import message.Message;
 import net.miginfocom.swing.MigLayout;
 
 import org.jdesktop.swingx.JXMapViewer;
@@ -32,10 +31,8 @@ import org.jdesktop.swingx.mapviewer.DefaultTileFactory;
 import org.jdesktop.swingx.mapviewer.GeoPosition;
 import org.jdesktop.swingx.mapviewer.TileFactoryInfo;
 
-import sample.Listener;
 import settings.MapViewSetting;
 import settings.SettingsManager;
-import controller.channel.ChannelManager;
 
 public class MapPanel extends JPanel implements PlottableUpdateListener
 {
@@ -46,17 +43,12 @@ public class MapPanel extends JPanel implements PlottableUpdateListener
     private JXMapViewer mMapViewer = new JXMapViewer();
     private PlottableEntityPainter mMapPainter;
     
-    public MapPanel( MapService mapService, 
-    				 SettingsManager settingsManager,
-    				 ChannelManager channelManager )
+    public MapPanel( MapService mapService, SettingsManager settingsManager )
     {
     	mSettingsManager = settingsManager;
     	mMapService = mapService;
     	mMapPainter = new PlottableEntityPainter( mSettingsManager );    	
     	
-    	/* Add Map Service as message listener to receive all messages */
-    	channelManager.addListener( (Listener<Message>)mMapService );
-    	
     	init();
     }
     

src/map/MapService.java

@@ -30,7 +30,6 @@ import sample.Listener;
 import settings.SettingsManager;
 import alias.Alias;
 import controller.NamingThreadFactory;
-import controller.ResourceManager;
 
 public class MapService implements Listener<Message>
 {
@@ -49,11 +48,11 @@ public class MapService implements Listener<Message>
 	private HashMap<String,PlottableEntity> mEntities = 
 						new HashMap<String,PlottableEntity>();
 
-	private ResourceManager mResourceManager;
+	private SettingsManager mSettingsManager;
 	
-	public MapService( ResourceManager resourceManager )
+	public MapService( SettingsManager resourceManager )
 	{
-		mResourceManager = resourceManager;
+		mSettingsManager = resourceManager;
 		
 //		scheduler.scheduleAtFixedRate( new CullThread(), 5, 5, TimeUnit.MINUTES );		
 	}
@@ -111,8 +110,7 @@ public class MapService implements Listener<Message>
 						iconName = SettingsManager.DEFAULT_ICON;
 					}
 
-					icon = mResourceManager.getSettingsManager()
-							.getMapIcon( iconName );
+					icon = mSettingsManager.getMapIcon( iconName );
 				}
 				
 				if( color == null )