Work in progress - updates to alias and alias ID editors.

src/alias/id/esn/ESNEditor.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+ *     Copyright (C) 2014-2016 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
@@ -20,76 +20,86 @@ package alias.id.esn;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.swing.JButton;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
 import net.miginfocom.swing.MigLayout;
-import controller.ConfigurableNode;
+import alias.AliasID;
+import alias.ComponentEditor;
 
-public class ESNEditor extends JPanel implements ActionListener
+public class ESNEditor extends ComponentEditor<AliasID>
 {
     private static final long serialVersionUID = 1L;
-    private ESNNode mESNNode;
-    private JTextField mTextESN;
 
-	public ESNEditor( ESNNode esnNode )
+    private static final String HELP_TEXT = "An Electronic Serial Number (ESN)"
+    		+ " is a unique radio hardware identifier normally composed of"
+    		+ " hexadecimal (0-9,A-F) characters.  Use an asterisk (*) to wildcard" 
+    		+ " individual digits (e.g. ABCD123* or AB**1**4)";
+
+    private JTextField mTextField;
+
+	public ESNEditor( AliasID aliasID )
 	{
-		mESNNode = esnNode;
+		super( aliasID );
 		
 		initGUI();
+		
+		setComponent( aliasID );
 	}
 	
 	private void initGUI()
 	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) );
-
-		add( new JLabel( "Electronic Serial Number ID" ), "span,align center" );
+		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][grow]" ) );
 
 		add( new JLabel( "ESN:" ) );
-		mTextESN = new JTextField( mESNNode.getESN().getEsn() );
-		add( mTextESN, "growx,push" );
-		
-		JButton btnSave = new JButton( "Save" );
-		btnSave.addActionListener( ESNEditor.this );
-		add( btnSave, "growx,push" );
+		mTextField = new JTextField();
+		mTextField.getDocument().addDocumentListener( this );
+		add( mTextField, "growx,push" );
 
-		JButton btnReset = new JButton( "Reset" );
-		btnReset.addActionListener( ESNEditor.this );
-		add( btnReset, "growx,push" );
+		JTextArea helpText = new JTextArea( HELP_TEXT );
+		helpText.setLineWrap( true );
+		helpText.setBackground( getBackground() );
+		add( helpText, "span,grow,push" );
+	}
+	
+	public Esn getEsn()
+	{
+		if( getComponent() instanceof Esn )
+		{
+			return (Esn)getComponent();
+		}
+		
+		return null;
 	}
 
 	@Override
-    public void actionPerformed( ActionEvent e )
-    {
-		String command = e.getActionCommand();
+	public void setComponent( AliasID aliasID )
+	{
+		mComponent = aliasID;
 		
-		if( command.contentEquals( "Save" ) )
+		Esn esn = getEsn();
+		
+		if( esn != null )
 		{
-			String esn = mTextESN.getText();
-			
-			if( esn != null )
-			{
-				mESNNode.getESN().setEsn( esn );
-
-				((ConfigurableNode)mESNNode.getParent()).sort();
-
-				mESNNode.save();
-				
-				mESNNode.show();
-			}
-			else
-			{
-				JOptionPane.showMessageDialog( ESNEditor.this, "Please enter an ESN" );
-			}
-		}
-		else if( command.contentEquals( "Reset" ) )
-		{
-			mTextESN.setText( mESNNode.getESN().getEsn() );
+			mTextField.setText( esn.getEsn() );
 		}
 		
-		mESNNode.refresh();
-    }
+		setModified( false );
+		
+		repaint();
+	}
+
+	@Override
+	public void save()
+	{
+		Esn esn = getEsn();
+		
+		if( esn != null )
+		{
+			esn.setEsn( mTextField.getText() );
+		}
+		
+		setModified( false );
+	}
 }

src/alias/id/esn/ESNNode.java

@@ -41,7 +41,7 @@ public class ESNNode extends AliasIDNode
     @Override
     public JPanel getEditor()
     {
-        return new ESNEditor( this );
+    	return null;
     }
     
     public Esn getESN()

src/alias/id/fleetsync/FleetsyncIDEditor.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+ *     Copyright (C) 2014-2016 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
@@ -20,89 +20,107 @@ package alias.id.fleetsync;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.swing.JButton;
+import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
+import javax.swing.text.MaskFormatter;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import controller.channel.Channel;
 import net.miginfocom.swing.MigLayout;
-import controller.ConfigurableNode;
+import alias.AliasID;
+import alias.ComponentEditor;
 
-public class FleetsyncIDEditor extends JPanel implements ActionListener
+public class FleetsyncIDEditor extends ComponentEditor<AliasID>
 {
-    private static final long serialVersionUID = 1L;
-    private FleetsyncIDNode mFleetsyncIDNode;
-    
-    private JLabel mLabelName;
-    private JTextField mTextIdent;
+	private final static Logger mLog = LoggerFactory.getLogger( FleetsyncIDEditor.class );
 
-    private String mHelpText = "Enter a formatted fleetsync identifier.\n\n"
-    		+ "Format: PPP-IIII (P=Prefix, I=Identifier)\n\n"
-            + "Wildcard: use one or more asterisks (*) for any talkgroup "
-            + "digits.\n\n";
+	private static final long serialVersionUID = 1L;
 
-	public FleetsyncIDEditor( FleetsyncIDNode fsNode )
+    private static final String HELP_TEXT = "A Fleetsync identifier is a"
+    		+ " composite decimal [0-9] value formatted as ggg-uuuu where"
+    		+ " g=Group and u=Unit.";
+
+    private JTextField mTextField;
+
+	public FleetsyncIDEditor( AliasID aliasID )
 	{
-		mFleetsyncIDNode = fsNode;
+		super( aliasID );
+		
 		initGUI();
+		
+		setComponent( aliasID );
 	}
 	
 	private void initGUI()
 	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) );
+		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][grow]" ) );
 
-		add( new JLabel( "Fleetsync ID" ), "span,align center" );
+		add( new JLabel( "Fleetsync ID:" ) );
 
-		add( new JLabel( "Ident:" ) );
-		mTextIdent = new JTextField( mFleetsyncIDNode.getFleetsyncID().getIdent() );
+		MaskFormatter formatter = null;
 
-		add( mTextIdent, "grow, wrap" );
+		try
+		{
+			//Mask: 3 digits - 4 digits
+			formatter = new MaskFormatter( "###-####" );
+		}
+		catch( Exception e )
+		{
+			//Do nothing, the mask was invalid
+		}
 		
-		JButton btnSave = new JButton( "Save" );
-		btnSave.addActionListener( FleetsyncIDEditor.this );
-		add( btnSave, "growx,push" );
+		mTextField = new JFormattedTextField( formatter );
+		mTextField.getDocument().addDocumentListener( this );
 
-		JButton btnReset = new JButton( "Reset" );
-		btnReset.addActionListener( FleetsyncIDEditor.this );
-		add( btnReset, "growx,push" );
+		add( mTextField, "growx,push" );
 		
-		JTextArea helpText = new JTextArea( mHelpText );
+		JTextArea helpText = new JTextArea( HELP_TEXT );
 		helpText.setLineWrap( true );
 		helpText.setBackground( getBackground() );
 		add( helpText, "span,grow,push" );
 	}
+	
+	public FleetsyncID getFleetsyncID()
+	{
+		if( getComponent() instanceof FleetsyncID )
+		{
+			return (FleetsyncID)getComponent();
+		}
+		
+		return null;
+	}
 
 	@Override
-    public void actionPerformed( ActionEvent e )
-    {
-		String command = e.getActionCommand();
+	public void setComponent( AliasID aliasID )
+	{
+		mComponent = aliasID;
 		
-		if( command.contentEquals( "Save" ) )
+		FleetsyncID fleetsync = getFleetsyncID();
+		
+		if( fleetsync != null )
 		{
-			String ident = mTextIdent.getText();
-			
-			if( ident != null )
-			{
-				mFleetsyncIDNode.getFleetsyncID().setIdent( ident );
+			mTextField.setText( fleetsync.getIdent() );
+		}
+		
+		setModified( false );
+		
+		repaint();
+	}
 
-				((ConfigurableNode)mFleetsyncIDNode.getParent()).sort();
-				
-				mFleetsyncIDNode.save();
-				
-				mFleetsyncIDNode.show();
-			}
-			else
-			{
-				JOptionPane.showMessageDialog( FleetsyncIDEditor.this, "Please enter an ident" );
-			}
-		}
-		else if( command.contentEquals( "Reset" ) )
+	@Override
+	public void save()
+	{
+		FleetsyncID fleetsync = getFleetsyncID();
+		
+		if( fleetsync != null )
 		{
-			mTextIdent.setText( mFleetsyncIDNode.getFleetsyncID().getIdent() );
+			fleetsync.setIdent( mTextField.getText() );
 		}
 		
-		mFleetsyncIDNode.refresh();
-    }
+		setModified( false );
+	}
 }

src/alias/id/fleetsync/FleetsyncIDNode.java

@@ -41,7 +41,7 @@ public class FleetsyncIDNode extends AliasIDNode
     @Override
     public JPanel getEditor()
     {
-        return new FleetsyncIDEditor( this );
+        return null;
     }
     
     public FleetsyncID getFleetsyncID()

src/alias/id/fleetsync/StatusIDEditor.java

@@ -1,120 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 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
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package alias.id.fleetsync;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import net.miginfocom.swing.MigLayout;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import controller.ConfigurableNode;
-
-public class StatusIDEditor extends JPanel implements ActionListener
-{
-	private static final long serialVersionUID = 1L;
-	private final static Logger mLog = 
-			LoggerFactory.getLogger( StatusIDEditor.class );
-
-	private StatusIDNode mStatusIDNode;
-    
-    private JLabel mLabelName;
-    private JTextField mTextStatusID;
-
-	public StatusIDEditor( StatusIDNode statusIDNode )
-	{
-		mStatusIDNode = statusIDNode;
-		
-		initGUI();
-	}
-	
-	private void initGUI()
-	{
-		setLayout( new MigLayout() );
-		
-		setBorder( BorderFactory.createTitledBorder( "Status Code" ) );
-
-		mLabelName = new JLabel( "Status Code:" );
-		add( mLabelName, "align right" );
-		
-		mTextStatusID = new JTextField( 
-				String.valueOf( mStatusIDNode.getStatusID().getStatus() ) );
-		add( mTextStatusID, "grow, wrap" );
-		
-		JButton btnSave = new JButton( "Save" );
-		btnSave.addActionListener( StatusIDEditor.this );
-		add( btnSave );
-
-		JButton btnReset = new JButton( "Reset" );
-		btnReset.addActionListener( StatusIDEditor.this );
-		add( btnReset, "wrap" );
-	}
-
-	@Override
-    public void actionPerformed( ActionEvent e )
-    {
-		String command = e.getActionCommand();
-		
-		if( command.contentEquals( "Save" ) )
-		{
-			String statusIDString = mTextStatusID.getText();
-			
-			if( statusIDString != null )
-			{
-				try
-				{
-					int id = Integer.parseInt( statusIDString );
-					
-					mStatusIDNode.getStatusID().setStatus( id );
-					
-					((ConfigurableNode)mStatusIDNode.getParent()).sort();
-
-					mStatusIDNode.save();
-					
-					mStatusIDNode.show();
-				}
-				catch( Exception ex )
-				{
-					mLog.error( "StatusIDEditor - error parsing int status " +
-							"id from [" + statusIDString + "]" );
-				}
-			}
-			else
-			{
-				JOptionPane.showMessageDialog( StatusIDEditor.this, 
-						"Please enter a status ID code" );
-			}
-		}
-		else if( command.contentEquals( "Reset" ) )
-		{
-			mTextStatusID.setText( 
-					String.valueOf( mStatusIDNode.getStatusID().getStatus() ) );
-		}
-		
-		mStatusIDNode.refresh();
-    }
-}

src/alias/id/lojack/LoJackIDEditor.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *     SDR Trunk 
- *     Copyright (C) 2015 Dennis Sheirer
+ *     Copyright (C) 2014-2016 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
@@ -20,109 +20,125 @@ package alias.id.lojack;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.swing.JButton;
 import javax.swing.JComboBox;
+import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
+import javax.swing.text.MaskFormatter;
 
 import module.decode.lj1200.LJ1200Message;
 import module.decode.lj1200.LJ1200Message.Function;
 import net.miginfocom.swing.MigLayout;
-import controller.ConfigurableNode;
+import alias.AliasID;
+import alias.ComponentEditor;
 
-public class LoJackIDEditor extends JPanel implements ActionListener
+public class LoJackIDEditor extends ComponentEditor<AliasID>
 {
     private static final long serialVersionUID = 1L;
-    private LoJackIDNode mLoJackIDNode;
-
+    
+    private JTextField mTextField;
+    
     private JComboBox<LJ1200Message.Function> mFunctionCombo;
-    private JTextField mTextIdent;
 
-    private String mHelpText = "Select a LoJack message function code and enter"
-    		+ " a five character reply code/identifier in the ID field.\n\n"
-            + "Wildcard: use an asterisk (*) to wildcard any character in the "
-            + "five character reply code (e.g. AB*CD or ***12 or *****)\n\n"
-            + "Reply codes are five characters where the middle character"
-            + " identifies the entity (tower/site or transponder) as follows:\n"
-            + "X,Y\t\tTower\n"
-            + "0-9,A,C-H,J-N,P-W\tTransponder\n"
-            + "B,I,O,Z\t\tNot Used";
+    private static final String HELP_TEXT = "LoJack function code and five character ID."
+            + " The middle character in a reply ID code identifies the entity:"
+            + " Tower[X,Y] Transponder[0-9,A,C-H,J-N,P-W] Not Used[B,I,O,Z]."
+    		+ " Use an asterisk (*) to wildcard ID characters (e.g. AB*CD or ***12 or *****)";
 
-	public LoJackIDEditor( LoJackIDNode lojackNode )
+    public LoJackIDEditor( AliasID aliasID )
 	{
-		mLoJackIDNode = lojackNode;
+		super( aliasID );
+		
 		initGUI();
+		
+		setComponent( aliasID );
 	}
 	
 	private void initGUI()
 	{
 		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) );
 
-		add( new JLabel( "LoJack Function and ID" ), "span,align center" );
-
-		LoJackFunctionAndID lojack = mLoJackIDNode.getLoJackID();
-
 		add( new JLabel( "Function:" ) );
 		mFunctionCombo = new JComboBox<LJ1200Message.Function>( Function.values() );
-		mFunctionCombo.setSelectedItem( lojack.getFunction() );
-		add( mFunctionCombo, "grow, wrap" );
+		mFunctionCombo.addActionListener( new ActionListener()
+		{
+			@Override
+			public void actionPerformed( ActionEvent e )
+			{
+				setModified( true );
+			}
+		} );
+		add( mFunctionCombo, "growx, push" );
 		
 		add( new JLabel( "ID:" ) );
-		mTextIdent = new JTextField( lojack.getID() );
-
-		add( mTextIdent, "grow, wrap" );
 		
-		JButton btnSave = new JButton( "Save" );
-		btnSave.addActionListener( LoJackIDEditor.this );
-		add( btnSave, "growx,push" );
+		MaskFormatter formatter = null;
 
-		JButton btnReset = new JButton( "Reset" );
-		btnReset.addActionListener( LoJackIDEditor.this );
-		add( btnReset, "growx,push" );
+		try
+		{
+			//Mask: any character or number, 5 places
+			formatter = new MaskFormatter( "AAAAA" );
+		}
+		catch( Exception e )
+		{
+			//Do nothing, the mask was invalid
+		}
 		
-		JTextArea helpText = new JTextArea( mHelpText );
+		mTextField = new JFormattedTextField( formatter );
+		mTextField.getDocument().addDocumentListener( this );
+		add( mTextField, "growx,push" );
+		
+		JTextArea helpText = new JTextArea( HELP_TEXT );
 		helpText.setLineWrap( true );
 		helpText.setBackground( getBackground() );
 		add( helpText, "span,grow,push" );
 	}
+	
+	public LoJackFunctionAndID getLoJackID()
+	{
+		if( getComponent() instanceof LoJackFunctionAndID )
+		{
+			return (LoJackFunctionAndID)getComponent();
+		}
+		
+		return null;
+	}
 
 	@Override
-    public void actionPerformed( ActionEvent e )
-    {
-		String command = e.getActionCommand();
+	public void setComponent( AliasID aliasID )
+	{
+		mComponent = aliasID;
 		
-		final LoJackFunctionAndID lojack = mLoJackIDNode.getLoJackID();
-
-		if( command.contentEquals( "Save" ) )
-		{
-			String id = mTextIdent.getText();
-			
-			if( id != null )
-			{
-				
-				lojack.setID( id );
-				lojack.setFunction( (Function)mFunctionCombo.getSelectedItem() );
-
-				((ConfigurableNode)mLoJackIDNode.getParent()).sort();
-				
-				mLoJackIDNode.save();
-				
-				mLoJackIDNode.show();
-			}
-			else
-			{
-				JOptionPane.showMessageDialog( LoJackIDEditor.this, "Please enter an ident" );
-			}
-		}
-		else if( command.contentEquals( "Reset" ) )
+		LoJackFunctionAndID lojack = getLoJackID();
+		
+		if( lojack != null )
 		{
 			mFunctionCombo.setSelectedItem( lojack.getFunction() );
-			mTextIdent.setText( lojack.getID() );
+			mTextField.setText( lojack.getID() );
+		}
+		else
+		{
+			mFunctionCombo.setSelectedItem( null );
+			mTextField.setText( null );
 		}
 		
-		mLoJackIDNode.refresh();
-    }
+		setModified( false );
+		
+		repaint();
+	}
+
+	@Override
+	public void save()
+	{
+		LoJackFunctionAndID lojack = getLoJackID();
+		
+		if( lojack != null )
+		{
+			lojack.setID( mTextField.getText() );
+			lojack.setFunction( (Function)mFunctionCombo.getSelectedItem() );
+		}
+		
+		setModified( false );
+	}
 }

src/alias/id/lojack/LoJackIDNode.java

@@ -41,7 +41,7 @@ public class LoJackIDNode extends AliasIDNode
     @Override
     public JPanel getEditor()
     {
-        return new LoJackIDEditor( this );
+        return null;
     }
     
     public LoJackFunctionAndID getLoJackID()

src/alias/id/mdc/MDC1200IDEditor.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+ *     Copyright (C) 2014-2016 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
@@ -17,79 +17,100 @@
  ******************************************************************************/
 package alias.id.mdc;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
+import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
+import javax.swing.text.MaskFormatter;
 
 import net.miginfocom.swing.MigLayout;
-import controller.ConfigurableNode;
+import alias.AliasID;
+import alias.ComponentEditor;
 
-public class MDC1200IDEditor extends JPanel implements ActionListener
+public class MDC1200IDEditor extends ComponentEditor<AliasID>
 {
     private static final long serialVersionUID = 1L;
-    private MDC1200IDNode mMDC1200IDNode;
-    
-    private JTextField mTextIdent;
 
-	public MDC1200IDEditor( MDC1200IDNode fsNode )
+    private static final String HELP_TEXT = "An MDC-1200 identifier is a"
+    		+ " four digit [0-9] value.  Use an asterisk (*) to wildcard" 
+    		+ " individual digits (e.g. 123* or **34)";
+
+    private JTextField mTextField;
+
+	public MDC1200IDEditor( AliasID aliasID )
 	{
-		mMDC1200IDNode = fsNode;
+		super( aliasID );
+		
 		initGUI();
+		
+		setComponent( aliasID );
 	}
 	
 	private void initGUI()
 	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) );
+		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][grow]" ) );
 
-		add( new JLabel( "MDC-1200 " ), "span,align center" );
+		add( new JLabel( "MDC-1200 ID:" ) );
 
-		add( new JLabel( "Unit ID:" ) );
-		mTextIdent = new JTextField( mMDC1200IDNode.getMDC1200ID().getIdent() );
-		add( mTextIdent, "growx,push" );
+		MaskFormatter formatter = null;
+
+		try
+		{
+			//Mask: 4 digits
+			formatter = new MaskFormatter( "####" );
+		}
+		catch( Exception e )
+		{
+			//Do nothing, the mask was invalid
+		}
 		
-		JButton btnSave = new JButton( "Save" );
-		btnSave.addActionListener( MDC1200IDEditor.this );
-		add( btnSave, "growx,push" );
-
-		JButton btnReset = new JButton( "Reset" );
-		btnReset.addActionListener( MDC1200IDEditor.this );
-		add( btnReset, "growx,push" );
+		mTextField = new JFormattedTextField( formatter );
+		mTextField.getDocument().addDocumentListener( this );
+		add( mTextField, "growx,push" );
+		
+		JTextArea helpText = new JTextArea( HELP_TEXT );
+		helpText.setLineWrap( true );
+		helpText.setBackground( getBackground() );
+		add( helpText, "span,grow,push" );
+	}
+	
+	public MDC1200ID getMDC1200ID()
+	{
+		if( getComponent() instanceof MDC1200ID )
+		{
+			return (MDC1200ID)getComponent();
+		}
+		
+		return null;
 	}
 
 	@Override
-    public void actionPerformed( ActionEvent e )
-    {
-		String command = e.getActionCommand();
+	public void setComponent( AliasID aliasID )
+	{
+		mComponent = aliasID;
 		
-		if( command.contentEquals( "Save" ) )
+		MDC1200ID mdc = getMDC1200ID();
+		
+		if( mdc != null )
 		{
-			String ident = mTextIdent.getText();
-			
-			if( ident != null )
-			{
-				mMDC1200IDNode.getMDC1200ID().setIdent( ident );
+			mTextField.setText( mdc.getIdent() );
+		}
+		
+		setModified( false );
+		
+		repaint();
+	}
 
-				((ConfigurableNode)mMDC1200IDNode.getParent()).sort();
-				
-				mMDC1200IDNode.save();
-				
-				mMDC1200IDNode.show();
-			}
-			else
-			{
-				JOptionPane.showMessageDialog( MDC1200IDEditor.this, "Please enter a unit ID" );
-			}
-		}
-		else if( command.contentEquals( "Reset" ) )
+	@Override
+	public void save()
+	{
+		MDC1200ID mdc = getMDC1200ID();
+		
+		if( mdc != null )
 		{
-			mTextIdent.setText( mMDC1200IDNode.getMDC1200ID().getIdent() );
+			mdc.setIdent( mTextField.getText() );
 		}
 		
-		mMDC1200IDNode.refresh();
-    }
+		setModified( false );
+	}
 }

src/alias/id/mdc/MDC1200IDNode.java

@@ -41,7 +41,7 @@ public class MDC1200IDNode extends AliasIDNode
     @Override
     public JPanel getEditor()
     {
-        return new MDC1200IDEditor( this );
+        return null;
     }
     
     public MDC1200ID getMDC1200ID()

src/alias/id/mobileID/MINEditor.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+ *     Copyright (C) 2014-2016 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
@@ -20,79 +20,99 @@ package alias.id.mobileID;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.swing.JButton;
+import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
+import javax.swing.text.MaskFormatter;
 
 import net.miginfocom.swing.MigLayout;
-import controller.ConfigurableNode;
+import alias.AliasID;
+import alias.ComponentEditor;
 
-public class MINEditor extends JPanel implements ActionListener
+public class MINEditor extends ComponentEditor<AliasID>
 {
     private static final long serialVersionUID = 1L;
-    private MINNode mMINNode;
-    
-    private JLabel mLabelName;
-    private JTextField mTextMIN;
 
-	public MINEditor( MINNode minNode )
+    private static final String HELP_TEXT = "A Passport Mobile Identifier (MIN) is a"
+    		+ " six character hexadecimal value";
+
+    private JTextField mTextField;
+
+	public MINEditor( AliasID aliasID )
 	{
-		mMINNode = minNode;
+		super( aliasID );
 		
 		initGUI();
+		
+		setComponent( aliasID );
 	}
 	
 	private void initGUI()
 	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) );
-
-		add( new JLabel( "Mobile ID Number (MIN)" ), "span,align center" );
+		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][grow]" ) );
 
 		add( new JLabel( "MIN:" ) );
-		
-		mTextMIN = new JTextField( mMINNode.getMIN().getMin() );
-		add( mTextMIN, "growx,push" );
-		
-		JButton btnSave = new JButton( "Save" );
-		btnSave.addActionListener( MINEditor.this );
-		add( btnSave, "growx,push" );
 
-		JButton btnReset = new JButton( "Reset" );
-		btnReset.addActionListener( MINEditor.this );
-		add( btnReset, "growx,push" );
+		MaskFormatter formatter = null;
+
+		try
+		{
+			//Mask: 6 hex characters
+			formatter = new MaskFormatter( "HHHHHH" );
+		}
+		catch( Exception e )
+		{
+			//Do nothing, the mask was invalid
+		}
+		
+		mTextField = new JFormattedTextField( formatter );
+		mTextField.getDocument().addDocumentListener( this );
+		add( mTextField, "growx,push" );
+		
+		JTextArea helpText = new JTextArea( HELP_TEXT );
+		helpText.setLineWrap( true );
+		helpText.setBackground( getBackground() );
+		add( helpText, "span,grow,push" );
+	}
+	
+	public Min getMin()
+	{
+		if( getComponent() instanceof Min )
+		{
+			return (Min)getComponent();
+		}
+		
+		return null;
 	}
 
 	@Override
-    public void actionPerformed( ActionEvent e )
-    {
-		String command = e.getActionCommand();
+	public void setComponent( AliasID aliasID )
+	{
+		mComponent = aliasID;
 		
-		if( command.contentEquals( "Save" ) )
+		Min min = getMin();
+		
+		if( min != null )
 		{
-			String esn = mTextMIN.getText();
-			
-			if( esn != null )
-			{
-				mMINNode.getMIN().setMin( esn );
-
-				((ConfigurableNode)mMINNode.getParent()).sort();
-
-				mMINNode.save();
-				
-				mMINNode.show();
-			}
-			else
-			{
-				JOptionPane.showMessageDialog( MINEditor.this, "Please enter an ESN" );
-			}
-		}
-		else if( command.contentEquals( "Reset" ) )
-		{
-			mTextMIN.setText( mMINNode.getMIN().getMin() );
+			mTextField.setText( min.getMin() );
 		}
 		
-		mMINNode.refresh();
-    }
+		setModified( false );
+		
+		repaint();
+	}
+
+	@Override
+	public void save()
+	{
+		Min min = getMin();
+		
+		if( min != null )
+		{
+			min.setMin( mTextField.getText() );
+		}
+		
+		setModified( false );
+	}
 }

src/alias/id/mobileID/MINNode.java

@@ -41,7 +41,7 @@ public class MINNode extends AliasIDNode
     @Override
     public JPanel getEditor()
     {
-        return new MINEditor( this );
+        return null;
     }
     
     public Min getMIN()

src/alias/id/mpt1327/MPT1327IDEditor.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+ *     Copyright (C) 2014-2016 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
@@ -17,80 +17,101 @@
  ******************************************************************************/
 package alias.id.mpt1327;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
+import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
+import javax.swing.text.MaskFormatter;
 
 import net.miginfocom.swing.MigLayout;
-import controller.ConfigurableNode;
+import alias.AliasID;
+import alias.ComponentEditor;
 
-public class MPT1327IDEditor extends JPanel implements ActionListener
+public class MPT1327IDEditor extends ComponentEditor<AliasID>
 {
-    private static final long serialVersionUID = 1L;
-    private MPT1327IDNode mMPT1327IDNode;
-    
-    private JTextField mTextIdent;
+	private static final long serialVersionUID = 1L;
 
-	public MPT1327IDEditor( MPT1327IDNode fsNode )
+    private static final String HELP_TEXT = "An MPT-1327 identifier is a"
+    		+ " composite decimal [0-9] value formatted as ppp-iiii where"
+    		+ " p=Prefix and i=Ident.";
+
+    private JTextField mTextField;
+
+	public MPT1327IDEditor( AliasID aliasID )
 	{
-		mMPT1327IDNode = fsNode;
+		super( aliasID );
+		
 		initGUI();
+		
+		setComponent( aliasID );
 	}
 	
 	private void initGUI()
 	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) );
+		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][grow]" ) );
 
-		add( new JLabel( "MPT-1327 Radio or Group ID" ), "span,align center" );
+		add( new JLabel( "MPT-1327 ID:" ) );
 
-		add( new JLabel( "ID:" ) );
+		MaskFormatter formatter = null;
+
+		try
+		{
+			//Mask: 3 digits - 4 digits
+			formatter = new MaskFormatter( "###-####" );
+		}
+		catch( Exception e )
+		{
+			//Do nothing, the mask was invalid
+		}
 		
-		mTextIdent = new JTextField( mMPT1327IDNode.getMPT1327ID().getIdent() );
-		add( mTextIdent, "growx,push" );
-		
-		JButton btnSave = new JButton( "Save" );
-		btnSave.addActionListener( MPT1327IDEditor.this );
-		add( btnSave, "growx,push" );
+		mTextField = new JFormattedTextField( formatter );
+		mTextField.getDocument().addDocumentListener( this );
 
-		JButton btnReset = new JButton( "Reset" );
-		btnReset.addActionListener( MPT1327IDEditor.this );
-		add( btnReset, "growx,push" );
+		add( mTextField, "growx,push" );
+		
+		JTextArea helpText = new JTextArea( HELP_TEXT );
+		helpText.setLineWrap( true );
+		helpText.setBackground( getBackground() );
+		add( helpText, "span,grow,push" );
+	}
+	
+	public MPT1327ID getMPT1327ID()
+	{
+		if( getComponent() instanceof MPT1327ID )
+		{
+			return (MPT1327ID)getComponent();
+		}
+		
+		return null;
 	}
 
 	@Override
-    public void actionPerformed( ActionEvent e )
-    {
-		String command = e.getActionCommand();
+	public void setComponent( AliasID aliasID )
+	{
+		mComponent = aliasID;
 		
-		if( command.contentEquals( "Save" ) )
+		MPT1327ID mpt = getMPT1327ID();
+		
+		if( mpt != null )
 		{
-			String ident = mTextIdent.getText();
-			
-			if( ident != null )
-			{
-				mMPT1327IDNode.getMPT1327ID().setIdent( ident );
+			mTextField.setText( mpt.getIdent() );
+		}
+		
+		setModified( false );
+		
+		repaint();
+	}
 
-				((ConfigurableNode)mMPT1327IDNode.getParent()).sort();
-				
-				mMPT1327IDNode.save();
-				
-				mMPT1327IDNode.show();
-			}
-			else
-			{
-				JOptionPane.showMessageDialog( MPT1327IDEditor.this, "Please enter a MPT1327 unit ID" );
-			}
-		}
-		else if( command.contentEquals( "Reset" ) )
+	@Override
+	public void save()
+	{
+		MPT1327ID mpt = getMPT1327ID();
+		
+		if( mpt != null )
 		{
-			mTextIdent.setText( mMPT1327IDNode.getMPT1327ID().getIdent() );
+			mpt.setIdent( mTextField.getText() );
 		}
 		
-		mMPT1327IDNode.refresh();
-    }
+		setModified( false );
+	}
 }

src/alias/id/mpt1327/MPT1327IDNode.java

@@ -41,7 +41,7 @@ public class MPT1327IDNode extends AliasIDNode
     @Override
     public JPanel getEditor()
     {
-        return new MPT1327IDEditor( this );
+        return null;
     }
     
     public MPT1327ID getMPT1327ID()

src/alias/id/nonrecordable/NonRecordable.java

@@ -0,0 +1,25 @@
+package alias.id.nonrecordable;
+
+import alias.AliasID;
+import alias.AliasIDType;
+
+public class NonRecordable extends AliasID
+{
+	@Override
+	public AliasIDType getType()
+	{
+		return AliasIDType.NonRecordable;
+	}
+
+	@Override
+	public boolean matches( AliasID id )
+	{
+		return false;
+	}
+	
+	@Override
+	public String toString()
+	{
+		return "Non-Recordable";
+	}
+}

src/alias/id/nonrecordable/NonRecordableEditor.java

@@ -0,0 +1,62 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014-2016 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
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package alias.id.nonrecordable;
+
+import javax.swing.JTextArea;
+
+import net.miginfocom.swing.MigLayout;
+import alias.AliasID;
+import alias.ComponentEditor;
+
+public class NonRecordableEditor extends ComponentEditor<AliasID>
+{
+    private static final long serialVersionUID = 1L;
+
+    private static final String HELP_TEXT = "This identifies an alias as "
+    		+ "non-recordable.  The alias can still be monitored but it will "
+    		+ "not be recorded when recording is enabled for the decoding channel.";
+
+	public NonRecordableEditor( AliasID aliasID )
+	{
+		super( aliasID );
+		
+		initGUI();
+		
+		setComponent( aliasID );
+	}
+	
+	private void initGUI()
+	{
+		setLayout( new MigLayout( "fill,wrap 1", "[]", "[][grow]" ) );
+
+		JTextArea helpText = new JTextArea( HELP_TEXT );
+		helpText.setLineWrap( true );
+		helpText.setBackground( getBackground() );
+		add( helpText, "span,grow,push" );
+	}
+	
+	@Override
+	public void setComponent( AliasID aliasID )
+	{
+	}
+
+	@Override
+	public void save()
+	{
+	}
+}

src/alias/id/nonrecordable/NonRecordableNode.java

@@ -0,0 +1,89 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014 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
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package alias.id.nonrecordable;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+
+import playlist.PlaylistManager;
+import alias.AliasID;
+import alias.AliasIDNode;
+import alias.AliasNode;
+
+public class NonRecordableNode extends AliasIDNode
+{
+    private static final long serialVersionUID = 1L;
+    
+    public NonRecordableNode( PlaylistManager playlistManager, NonRecordable id )
+	{
+    	super( playlistManager, id );
+	}
+    
+    @Override
+    public JPanel getEditor()
+    {
+        return null;
+    }
+    
+    @Override
+	public String getIconPath()
+	{
+		return "images/no_record.png";
+	}
+
+	public String toString()
+    {
+    	return "Non-Recordable";
+    }
+    
+	public JPopupMenu getContextMenu()
+	{
+		JPopupMenu retVal = new JPopupMenu();
+		
+		JMenuItem addSystemItem = new JMenuItem( "Delete" );
+		addSystemItem.addActionListener( new ActionListener() 
+		{
+			@Override
+            public void actionPerformed( ActionEvent e )
+            {
+				int n = JOptionPane.showConfirmDialog( getModel().getTree(),
+				    "Are you sure you want to permanently delete this node?" );				
+				
+				if( n == JOptionPane.YES_OPTION )
+				{
+					AliasNode parent = (AliasNode)getParent();
+					
+					parent.getAlias().removeAliasID( (AliasID)getUserObject() );
+
+					save();
+
+					getModel().removeNodeFromParent( NonRecordableNode.this );
+				}
+            }
+		} );
+		
+		retVal.add( addSystemItem );
+		
+		return retVal;
+	}
+}

src/alias/id/priority/Priority.java

@@ -0,0 +1,77 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014 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
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package alias.id.priority;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+import alias.AliasID;
+import alias.AliasIDType;
+
+/**
+ * Specifies an (audio) priority level for this alias.
+ */
+public class Priority extends AliasID
+{
+	public static final int DO_NOT_MONITOR = -1;
+	public static final int SELECTED_PRIORITY = 0;
+	public static final int MIN_PRIORITY = 1;
+	public static final int MAX_PRIORITY = 100;
+	public static final int DEFAULT_PRIORITY = 100;
+	
+	private int mPriority = DEFAULT_PRIORITY;
+	
+	public Priority()
+	{
+	}
+
+	/**
+	 * Indicates the associated alias should not be monitored or tracked.
+	 */
+	public boolean isDoNotMonitor()
+	{
+		return mPriority == DO_NOT_MONITOR;
+	}
+
+	@XmlAttribute
+	public int getPriority()
+	{
+		return mPriority;
+	}
+
+	public void setPriority( int priority )
+	{
+		mPriority = priority;
+	}
+	
+	public String toString()
+	{
+		return "Priority: " + ( isDoNotMonitor() ? "Do Not Monitor" : mPriority );
+	}
+
+	@Override
+    public boolean matches( AliasID id )
+    {
+	    return false;
+    }
+
+	@Override
+    public AliasIDType getType()
+    {
+	    return AliasIDType.Priority;
+    }
+}

src/alias/id/priority/PriorityEditor.java

@@ -0,0 +1,137 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014-2016 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
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package alias.id.priority;
+
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JSlider;
+import javax.swing.JTextArea;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import net.miginfocom.swing.MigLayout;
+import alias.AliasID;
+import alias.ComponentEditor;
+
+public class PriorityEditor extends ComponentEditor<AliasID>
+{
+    private static final long serialVersionUID = 1L;
+
+	public static final String DO_NOT_MONITOR = "Do Not Monitor";
+
+	private static final String HELP_TEXT = "Priority determines which calls"
+    		+ " have priority for playback over your computer speakers, or designates"
+    		+ " an alias for non-monitoring if you don't want to hear calls"
+    		+ " from an alias.  Lower values indicate higher priority levels.";
+
+    private JCheckBox mDoNotMonitorCheckBox = new JCheckBox( DO_NOT_MONITOR );
+    private JSlider mPrioritySlider;
+    private JLabel mPrioritySliderLabel;
+
+	public PriorityEditor( AliasID aliasID )
+	{
+		super( aliasID );
+		
+		initGUI();
+		
+		setComponent( aliasID );
+	}
+	
+	private void initGUI()
+	{
+		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][grow]" ) );
+
+		add( mDoNotMonitorCheckBox, "span,align center" );
+
+		mPrioritySlider = new JSlider( JSlider.HORIZONTAL,
+										Priority.MIN_PRIORITY,
+										Priority.MAX_PRIORITY,
+										Priority.MIN_PRIORITY );
+		
+		mPrioritySlider.setMajorTickSpacing( 20 );
+		mPrioritySlider.setMinorTickSpacing( 5 );
+		mPrioritySlider.setPaintTicks( true );
+		mPrioritySlider.setLabelTable( mPrioritySlider.createStandardLabels( 20, 20 ) );
+		mPrioritySlider.setPaintLabels( true );
+		mPrioritySlider.addChangeListener( new ChangeListener()
+		{
+			@Override
+			public void stateChanged( ChangeEvent e )
+			{
+				mPrioritySliderLabel.setText( "Priority: " + mPrioritySlider.getValue() );
+			}
+		} );
+		
+		mPrioritySliderLabel = new JLabel( "Priority: " + mPrioritySlider.getValue() + " " );
+		add( mPrioritySliderLabel );
+		add( mPrioritySlider, "wrap,grow" );
+		
+		JTextArea helpText = new JTextArea( HELP_TEXT );
+		helpText.setLineWrap( true );
+		helpText.setBackground( getBackground() );
+		add( helpText, "span,grow,push" );
+	}
+	
+	public Priority getPriority()
+	{
+		if( getComponent() instanceof Priority )
+		{
+			return (Priority)getComponent();
+		}
+		
+		return null;
+	}
+
+	@Override
+	public void setComponent( AliasID aliasID )
+	{
+		mComponent = aliasID;
+
+		Priority priority = getPriority();
+		
+		if( priority != null )
+		{
+			mPrioritySlider.setValue( priority.getPriority() );
+			mDoNotMonitorCheckBox.setSelected( priority.isDoNotMonitor() );
+		}
+		
+		setModified( false );
+		
+		repaint();
+	}
+
+	@Override
+	public void save()
+	{
+		Priority priority = getPriority();
+		
+		if( priority != null )
+		{
+			if( mDoNotMonitorCheckBox.isSelected() )
+			{
+				priority.setPriority( Priority.DO_NOT_MONITOR );
+			}
+			else
+			{
+				priority.setPriority( mPrioritySlider.getValue() );
+			}
+		}
+		
+		setModified( false );
+	}
+}

src/alias/id/priority/PriorityNode.java

@@ -0,0 +1,87 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 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
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package alias.id.priority;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+
+import playlist.PlaylistManager;
+import alias.AliasIDNode;
+import alias.AliasNode;
+
+public class PriorityNode extends AliasIDNode
+{
+    private static final long serialVersionUID = 1L;
+
+    public PriorityNode( PlaylistManager playlistManager, Priority priority )
+	{
+        super( playlistManager, priority );
+ 	}
+    
+    @Override
+    public JPanel getEditor()
+    {
+        return null;
+    }
+    
+    public Priority getPriority()
+    {
+    	return (Priority)getUserObject();
+    }
+    
+    public String toString()
+    {
+    	return getPriority().toString();
+    }
+
+	public JPopupMenu getContextMenu()
+	{
+		JPopupMenu retVal = new JPopupMenu();
+		
+		JMenuItem addSystemItem = new JMenuItem( "Delete" );
+		addSystemItem.addActionListener( new ActionListener() 
+		{
+			@Override
+            public void actionPerformed( ActionEvent e )
+            {
+				int n = JOptionPane.showConfirmDialog( getModel().getTree(),
+				    "Are you sure you want to permanently delete this node?" );				
+				
+				if( n == JOptionPane.YES_OPTION )
+				{
+					AliasNode parent = (AliasNode)getParent();
+					
+					parent.getAlias().removeAliasID( getPriority() );
+
+					save();
+
+					getModel().removeNodeFromParent( PriorityNode.this );
+				}
+            }
+		} );
+		
+		retVal.add( addSystemItem );
+		
+		return retVal;
+	}
+}

src/alias/id/siteID/SiteIDEditor.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+ *     Copyright (C) 2014-2016 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
@@ -17,95 +17,86 @@
  ******************************************************************************/
 package alias.id.siteID;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
 import net.miginfocom.swing.MigLayout;
+import alias.AliasID;
+import alias.ComponentEditor;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SiteIDEditor extends JPanel implements ActionListener
+public class SiteIDEditor extends ComponentEditor<AliasID>
 {
     private static final long serialVersionUID = 1L;
-	private final static Logger mLog = 
-							LoggerFactory.getLogger( SiteIDEditor.class );
-    private SiteIDNode mSiteIDNode;
-    private JTextField mTextSiteID;
 
-	public SiteIDEditor( SiteIDNode siteIDNode )
+    private static final String HELP_TEXT = "Site number for P25 systems uses"
+			+ " the format RR-SS, where RR = RF Subsystem and SS = Site Number. "
+    		+ " (e.g. RFSS 1 Site 3: 01-03).  For other protocols, simply use"
+    		+ " a decimal value for the site ID";
+
+    private JTextField mTextField;
+
+	public SiteIDEditor( AliasID aliasID )
 	{
-		mSiteIDNode = siteIDNode;
+		super( aliasID );
 		
 		initGUI();
+		
+		setComponent( aliasID );
 	}
 	
 	private void initGUI()
 	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][][grow]" ) );
+		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][grow]" ) );
 
-		add( new JLabel( "Site ID" ), "span,align center" );
+		add( new JLabel( "Site ID:" ) );
+		mTextField = new JTextField();
+		mTextField.getDocument().addDocumentListener( this );
+		add( mTextField, "growx,push" );
 
-		add( new JLabel( "Site:" ) );
+		JTextArea helpText = new JTextArea( HELP_TEXT );
+		helpText.setLineWrap( true );
+		helpText.setBackground( getBackground() );
+		add( helpText, "span,grow,push" );
+	}
+	
+	public SiteID getSiteID()
+	{
+		if( getComponent() instanceof SiteID )
+		{
+			return (SiteID)getComponent();
+		}
 		
-		mTextSiteID = new JTextField( 
-				String.valueOf( mSiteIDNode.getSiteID().getSite() ) );
-		add( mTextSiteID, "growx,push" );
-
-		JTextArea description = new JTextArea( "Enter a site number.  "
-				+ "For P25 systems, use the format RR-SS, where RR = RF "
-				+ "Subsystem and SS = Site Number.  For example, RFSS 1 and "
-				+ "Site 3 would be: 01-03");
-		
-		description.setLineWrap( true );
-		description.setBackground( getBackground() );
-		
-		add( description, "growx,span" );
-		
-		JButton btnSave = new JButton( "Save" );
-		btnSave.addActionListener( SiteIDEditor.this );
-		add( btnSave, "growx,push" );
-
-		JButton btnReset = new JButton( "Reset" );
-		btnReset.addActionListener( SiteIDEditor.this );
-		add( btnReset, "growx,push" );
+		return null;
 	}
 
 	@Override
-    public void actionPerformed( ActionEvent e )
-    {
-		String command = e.getActionCommand();
+	public void setComponent( AliasID aliasID )
+	{
+		mComponent = aliasID;
 		
-		if( command.contentEquals( "Save" ) )
+		SiteID siteID = getSiteID();
+		
+		if( siteID != null )
 		{
-			String siteIDString = mTextSiteID.getText();
-			
-			if( siteIDString != null )
-			{
-				mSiteIDNode.getSiteID().setSite( siteIDString );
+			mTextField.setText( siteID.getSite() );
+		}
+		
+		setModified( false );
+		
+		repaint();
+	}
 
-				mSiteIDNode.save();
-				
-				mSiteIDNode.show();
-			}
-			else
-			{
-				JOptionPane.showMessageDialog( SiteIDEditor.this, 
-						"Please enter a site ID" );
-			}
-		}
-		else if( command.contentEquals( "Reset" ) )
+	@Override
+	public void save()
+	{
+		SiteID siteID = getSiteID();
+		
+		if( siteID != null )
 		{
-			mTextSiteID.setText( mSiteIDNode.getSiteID().getSite() );
+			siteID.setSite( mTextField.getText() );
 		}
 		
-		mSiteIDNode.refresh();
-    }
+		setModified( false );
+	}
 }

src/alias/id/siteID/SiteIDNode.java

@@ -41,7 +41,7 @@ public class SiteIDNode extends AliasIDNode
     @Override
     public JPanel getEditor()
     {
-        return new SiteIDEditor( this );
+        return null;
     }
     
     public SiteID getSiteID()

src/alias/id/status/StatusID.java

@@ -15,7 +15,7 @@
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
-package alias.id.fleetsync;
+package alias.id.status;
 
 import javax.xml.bind.annotation.XmlAttribute;
 

src/alias/id/status/StatusIDEditor.java

@@ -0,0 +1,128 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014-2016 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
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package alias.id.status;
+
+import javax.swing.JFormattedTextField;
+import javax.swing.JLabel;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.text.MaskFormatter;
+
+import net.miginfocom.swing.MigLayout;
+import alias.AliasID;
+import alias.ComponentEditor;
+
+public class StatusIDEditor extends ComponentEditor<AliasID>
+{
+    private static final long serialVersionUID = 1L;
+
+    private static final String HELP_TEXT = "Status numbers are used in some"
+			+ " protocols like Fleetsync.  The status number is assigned a meaning"
+    		+ " in the radio.  You can assign a 3 digit status code (use leading zeros) to an"
+    		+ " alias where the alias contains the status meaning.";
+
+    private JTextField mTextField;
+
+	public StatusIDEditor( AliasID aliasID )
+	{
+		super( aliasID );
+		
+		initGUI();
+		
+		setComponent( aliasID );
+	}
+	
+	private void initGUI()
+	{
+		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][grow]" ) );
+
+		add( new JLabel( "Status:" ) );
+
+		MaskFormatter formatter = null;
+
+		try
+		{
+			//Mask: 3 digits
+			formatter = new MaskFormatter( "###" );
+		}
+		catch( Exception e )
+		{
+			//Do nothing, the mask was invalid
+		}
+		
+		mTextField = new JFormattedTextField( formatter );
+		mTextField.getDocument().addDocumentListener( this );
+		add( mTextField, "growx,push" );
+
+		JTextArea helpText = new JTextArea( HELP_TEXT );
+		helpText.setLineWrap( true );
+		helpText.setBackground( getBackground() );
+		add( helpText, "span,grow,push" );
+	}
+	
+	public StatusID getStatusID()
+	{
+		if( getComponent() instanceof StatusID )
+		{
+			return (StatusID)getComponent();
+		}
+		
+		return null;
+	}
+
+	@Override
+	public void setComponent( AliasID aliasID )
+	{
+		mComponent = aliasID;
+		
+		StatusID statusID = getStatusID();
+		
+		if( statusID != null )
+		{
+			mTextField.setText( String.valueOf( statusID.getStatus() ) );
+		}
+		
+		setModified( false );
+		
+		repaint();
+	}
+
+	@Override
+	public void save()
+	{
+		StatusID statusID = getStatusID();
+		
+		if( statusID != null )
+		{
+			int status = 0;
+			
+			try
+			{
+				status = Integer.valueOf( mTextField.getText() );
+			}
+			catch( Exception e )
+			{
+				//Do nothing, we couldn't parse the value
+			}
+			
+			statusID.setStatus( status );
+		}
+		
+		setModified( false );
+	}
+}

src/alias/id/status/StatusIDNode.java

@@ -15,7 +15,7 @@
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
-package alias.id.fleetsync;
+package alias.id.status;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -41,7 +41,7 @@ public class StatusIDNode extends AliasIDNode
     @Override
     public JPanel getEditor()
     {
-        return new StatusIDEditor( this );
+        return null;
     }
     
     public StatusID getStatusID()

src/alias/id/talkgroup/TalkgroupIDEditor.java

@@ -17,99 +17,87 @@
  ******************************************************************************/
 package alias.id.talkgroup;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
 import net.miginfocom.swing.MigLayout;
-import controller.ConfigurableNode;
+import alias.AliasID;
+import alias.ComponentEditor;
 
-public class TalkgroupIDEditor extends JPanel implements ActionListener
+public class TalkgroupIDEditor extends ComponentEditor<AliasID>
 {
     private static final long serialVersionUID = 1L;
-    private TalkgroupIDNode mTalkgroupIDNode;
-    
-    private JTextField mTextTalkgroupID;
-    
-    private String mHelpText = "Enter a formatted talkgroup identifier.\n\n"
-    		+ "P25 Talkgroup Format: hexadecimal value, 4 characters for "
-    		+ "talkgroup or 6 characters for a mobile radio\n\n"
-    		+ "LTR Talkgroup Format: A-HH-TTT (A=Area, H=Home Repeater, "
-    		+ "T=Talkgroup)\n\n"
-    		+ "Passport Talkgroup Format: xxxxx (up to 5-digit number)\n\n"
-            + "Wildcard: use one or more asterisks (*) for any talkgroup digits.";
 
-	public TalkgroupIDEditor( TalkgroupIDNode talkgroupIDNode )
+    private static final String HELP_TEXT = "Enter a formatted talkgroup identifier.\n"
+    		+ "P25: 4 or 6 hex characters (e.g. AB12 or ABC123)\n"
+    		+ "LTR: A-HH-TTT (A=Area H=Home T=Talkgroup)\n"
+    		+ "Passport: xxxxx (up to 5-digit number)\n\n"
+            + "Wildcard: use an asterisk (*) in place of each talkgroup digit";
+
+    private JTextField mTextField;
+
+	public TalkgroupIDEditor( AliasID aliasID )
 	{
-		mTalkgroupIDNode = talkgroupIDNode;
+		super( aliasID );
 		
 		initGUI();
+		
+		setComponent( aliasID );
 	}
 	
 	private void initGUI()
 	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][][grow]" ) );
-		
-		add( new JLabel( "Talkgroup ID" ), "span,align center" );
-		
-		add( new JLabel( "TGID:" ) );
-        mTextTalkgroupID = new JTextField();
+		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][grow]" ) );
 
-		mTextTalkgroupID.setText( mTalkgroupIDNode.getTalkgroupID().getTalkgroup() );
+		add( new JLabel( "Talkgroup:" ) );
+		mTextField = new JTextField();
+		mTextField.getDocument().addDocumentListener( this );
+		add( mTextField, "growx,push" );
 
-		add( mTextTalkgroupID, "growx,push" );
-
-		JButton btnSave = new JButton( "Save" );
-		btnSave.addActionListener( TalkgroupIDEditor.this );
-		add( btnSave, "growx,push" );
-
-		JButton btnReset = new JButton( "Reset" );
-		btnReset.addActionListener( TalkgroupIDEditor.this );
-		add( btnReset, "growx,push" );
-		
-		JTextArea helpText = new JTextArea( mHelpText );
-		helpText.setBackground( getBackground() );
+		JTextArea helpText = new JTextArea( HELP_TEXT );
 		helpText.setLineWrap( true );
+		helpText.setBackground( getBackground() );
 		add( helpText, "span,grow,push" );
 	}
+	
+	public TalkgroupID getTalkgroupID()
+	{
+		if( getComponent() instanceof TalkgroupID )
+		{
+			return (TalkgroupID)getComponent();
+		}
+		
+		return null;
+	}
 
 	@Override
-    public void actionPerformed( ActionEvent e )
-    {
-		String command = e.getActionCommand();
+	public void setComponent( AliasID aliasID )
+	{
+		mComponent = aliasID;
 		
-		if( command.contentEquals( "Save" ) )
+		TalkgroupID talkgroup = getTalkgroupID();
+		
+		if( talkgroup != null )
 		{
-			String tgid = mTextTalkgroupID.getText();
-			
-			if( tgid != null )
-			{
-				mTalkgroupIDNode.getTalkgroupID().setTalkgroup( tgid );
-				
-				((ConfigurableNode)mTalkgroupIDNode.getParent()).sort();
+			mTextField.setText( talkgroup.getTalkgroup() );
+		}
+		
+		setModified( false );
+		
+		repaint();
+	}
 
-				mTalkgroupIDNode.save();
-				
-				mTalkgroupIDNode.show();
-			}
-			else
-			{
-				JOptionPane.showMessageDialog( TalkgroupIDEditor.this, 
-						"Please enter a talkgroup ID" );
-			}
-		}
-		else if( command.contentEquals( "Reset" ) )
+	@Override
+	public void save()
+	{
+		TalkgroupID talkgroup = getTalkgroupID();
+		
+		if( talkgroup != null )
 		{
-			mTextTalkgroupID.setText( 
-					mTalkgroupIDNode.getTalkgroupID().getTalkgroup() );
+			talkgroup.setTalkgroup( mTextField.getText() );
 		}
 		
-		mTalkgroupIDNode.refresh();
-    }
+		setModified( false );
+	}
 }

src/alias/id/talkgroup/TalkgroupIDNode.java

@@ -41,7 +41,7 @@ public class TalkgroupIDNode extends AliasIDNode
     @Override
     public JPanel getEditor()
     {
-        return new TalkgroupIDEditor( this );
+        return null;
     }
     
     public TalkgroupID getTalkgroupID()

src/alias/id/uniqueID/UniqueIDEditor.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+ *     Copyright (C) 2014-2016 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
@@ -17,101 +17,95 @@
  ******************************************************************************/
 package alias.id.uniqueID;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
 import net.miginfocom.swing.MigLayout;
+import alias.AliasID;
+import alias.ComponentEditor;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import controller.ConfigurableNode;
-
-public class UniqueIDEditor extends JPanel implements ActionListener
+public class UniqueIDEditor extends ComponentEditor<AliasID>
 {
     private static final long serialVersionUID = 1L;
-	private final static Logger mLog = 
-			LoggerFactory.getLogger( UniqueIDEditor.class );
-    private UniqueIDNode mUniqueIDNode;
-    
-    private JLabel mLabelUniqueID;
-    private JTextField mTextUniqueID;
 
-	public UniqueIDEditor( UniqueIDNode uniqueIDNode )
+    private static final String HELP_TEXT = "LTR-Net Unique ID (UID) is a system"
+		+ " identifier assigned to each radio in the range 1 - 2097152";
+
+    private JTextField mTextField;
+
+	public UniqueIDEditor( AliasID aliasID )
 	{
-		mUniqueIDNode = uniqueIDNode;
+		super( aliasID );
 		
 		initGUI();
+		
+		setComponent( aliasID );
 	}
 	
 	private void initGUI()
 	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) );
-
-		add( new JLabel( "LTR-Net Radio Unique ID" ), "span,align center" );
+		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][grow]" ) );
 
 		add( new JLabel( "Unique ID:" ) );
-		
-		mTextUniqueID = new JTextField( 
-				String.valueOf( mUniqueIDNode.getUniqueID().getUid() ) );
-		add( mTextUniqueID, "growx,push" );
-		
-		JButton btnSave = new JButton( "Save" );
-		btnSave.addActionListener( UniqueIDEditor.this );
-		add( btnSave, "growx,push" );
+		mTextField = new JTextField();
+		mTextField.getDocument().addDocumentListener( this );
+		add( mTextField, "growx,push" );
 
-		JButton btnReset = new JButton( "Reset" );
-		btnReset.addActionListener( UniqueIDEditor.this );
-		add( btnReset, "growx,push" );
+		JTextArea helpText = new JTextArea( HELP_TEXT );
+		helpText.setLineWrap( true );
+		helpText.setBackground( getBackground() );
+		add( helpText, "span,grow,push" );
+	}
+	
+	public UniqueID getUniqueID()
+	{
+		if( getComponent() instanceof UniqueID )
+		{
+			return (UniqueID)getComponent();
+		}
+		
+		return null;
 	}
 
 	@Override
-    public void actionPerformed( ActionEvent e )
-    {
-		String command = e.getActionCommand();
+	public void setComponent( AliasID aliasID )
+	{
+		mComponent = aliasID;
 		
-		if( command.contentEquals( "Save" ) )
+		UniqueID uid = getUniqueID();
+		
+		if( uid != null )
 		{
-			String uid = mTextUniqueID.getText();
+			mTextField.setText( String.valueOf( uid.getUid() ) );
+		}
+		
+		setModified( false );
+		
+		repaint();
+	}
+
+	@Override
+	public void save()
+	{
+		UniqueID uid = getUniqueID();
+		
+		if( uid != null )
+		{
+			int id = 0;
 			
-			if( uid != null )
+			try
 			{
-				try
-				{
-					int uidInt = Integer.parseInt( uid );
-					
-					mUniqueIDNode.getUniqueID().setUid( uidInt );
-
-					((ConfigurableNode)mUniqueIDNode.getParent()).sort();
-
-					mUniqueIDNode.save();
-					
-					mUniqueIDNode.show();
-				}
-				catch( Exception ex )
-				{
-					mLog.error( "UniqueIDEditor - exception trying to parse " +
-						"int from uid [" + uid + "]", ex );
-				}
+				id = Integer.parseInt( mTextField.getText() );
 			}
-			else
+			catch( Exception e )
 			{
-				JOptionPane.showMessageDialog( UniqueIDEditor.this, 
-						"Please enter a site number and unique ID" );
+				//Do nothing, we couldn't parse the value
 			}
-		}
-		else if( command.contentEquals( "Reset" ) )
-		{
-			mTextUniqueID.setText( 
-					String.valueOf( mUniqueIDNode.getUniqueID().getUid() ) );
+			
+			uid.setUid( id );
 		}
 		
-		mUniqueIDNode.refresh();
-    }
+		setModified( false );
+	}
 }

src/alias/id/uniqueID/UniqueIDNode.java

@@ -41,7 +41,7 @@ public class UniqueIDNode extends AliasIDNode
     @Override
     public JPanel getEditor()
     {
-        return new UniqueIDEditor( this );
+        return null;
     }
     
     public UniqueID getUniqueID()