Work in progress - added ability to add new alias identifiers and to

auto save alias/identifier changes.
This commit is contained in:
denny
2016-02-29 20:14:52 -05:00
parent d1ea8656c4
commit 6d1e7a78cf
7 changed files with 179 additions and 25 deletions

View File

@@ -55,7 +55,7 @@ public class AliasController extends JPanel
mAliasModel = aliasModel; mAliasModel = aliasModel;
mEditor = new AliasEditor( mAliasModel, settingsManager ); mEditor = new AliasEditor( mAliasModel, settingsManager );
mAliasModel.addAliasEventListener( mEditor ); mAliasModel.addListener( mEditor );
mIconCellRenderer = new IconCellRenderer( settingsManager ); mIconCellRenderer = new IconCellRenderer( settingsManager );

View File

@@ -52,9 +52,9 @@ public class AliasEditor extends JPanel implements ActionListener, Listener<Alia
{ {
mAliasModel = aliasModel; mAliasModel = aliasModel;
mAliasNameEditor = new AliasNameEditor( mAliasModel, settingsManager ); mAliasNameEditor = new AliasNameEditor( mAliasModel, settingsManager );
mAliasIdentifierEditor = new AliasIdentifierEditor(); mAliasIdentifierEditor = new AliasIdentifierEditor( aliasModel );
mAliasModel.addAliasEventListener( this ); mAliasModel.addListener( this );
initGUI(); initGUI();
} }

View File

@@ -22,6 +22,7 @@ import alias.id.priority.Priority;
import alias.id.priority.PriorityEditor; import alias.id.priority.PriorityEditor;
import alias.id.siteID.SiteIDEditor; import alias.id.siteID.SiteIDEditor;
import alias.id.siteID.SiteID; import alias.id.siteID.SiteID;
import alias.id.status.StatusID;
import alias.id.status.StatusIDEditor; import alias.id.status.StatusIDEditor;
import alias.id.talkgroup.TalkgroupID; import alias.id.talkgroup.TalkgroupID;
import alias.id.talkgroup.TalkgroupIDEditor; import alias.id.talkgroup.TalkgroupIDEditor;
@@ -205,4 +206,37 @@ public class AliasFactory
return new EmptyAliasActionEditor(); return new EmptyAliasActionEditor();
} }
public static AliasID getAliasID( AliasIDType type )
{
switch( type )
{
case ESN:
return new Esn();
case Fleetsync:
return new FleetsyncID();
case LTRNetUID:
return new UniqueID();
case LoJack:
return new LoJackFunctionAndID();
case MDC1200:
return new MDC1200ID();
case MIN:
return new Min();
case MPT1327:
return new MPT1327ID();
case NonRecordable:
return new NonRecordable();
case Priority:
return new Priority();
case Site:
return new SiteID();
case Status:
return new StatusID();
case Talkgroup:
return new TalkgroupID();
default:
throw new IllegalArgumentException( "Unrecognized Alias ID type: " + type );
}
}
} }

View File

@@ -19,16 +19,28 @@ package alias;
public enum AliasIDType public enum AliasIDType
{ {
ESN, ESN( "ESN" ),
Fleetsync, Fleetsync( "Fleetsync" ),
LoJack, LoJack( "LoJack" ),
LTRNetUID, LTRNetUID( "LTR-Net UID" ),
MDC1200, MDC1200( "MDC-1200" ),
MIN, MIN( "Passport MIN" ),
MPT1327, MPT1327( "MPT-1327" ),
NonRecordable, NonRecordable( "Non-Recordable" ),
Priority, Priority( "Audio Priority" ),
Site, Site( "Site" ),
Status, Status( "Status" ),
Talkgroup; Talkgroup( "Talkgroup" );
private String mLabel;
private AliasIDType( String label )
{
mLabel = label;
}
public String toString()
{
return mLabel;
}
} }

View File

@@ -1,5 +1,10 @@
package alias; package alias;
import java.awt.EventQueue;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
@@ -7,8 +12,10 @@ import java.util.List;
import javax.swing.DefaultListModel; import javax.swing.DefaultListModel;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JList; import javax.swing.JList;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.ListModel; import javax.swing.ListModel;
import javax.swing.ListSelectionModel; import javax.swing.ListSelectionModel;
@@ -20,6 +27,9 @@ import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sample.Listener;
import alias.AliasEvent.Event;
public class AliasIdentifierEditor extends AliasConfigurationEditor public class AliasIdentifierEditor extends AliasConfigurationEditor
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -31,9 +41,11 @@ public class AliasIdentifierEditor extends AliasConfigurationEditor
private EditorContainer mEditorContainer = new EditorContainer(); private EditorContainer mEditorContainer = new EditorContainer();
private Alias mAlias; private Alias mAlias;
private AliasModel mAliasModel;
public AliasIdentifierEditor() public AliasIdentifierEditor( AliasModel model )
{ {
mAliasModel = model;
init(); init();
} }
@@ -71,7 +83,35 @@ public class AliasIdentifierEditor extends AliasConfigurationEditor
add( mEditorContainer, "span,grow" ); add( mEditorContainer, "span,grow" );
add( new JButton( "New" ) ); final JButton newButton = new JButton( "New ..." );
newButton.addMouseListener( new MouseAdapter()
{
@Override
public void mouseClicked( MouseEvent e )
{
JPopupMenu menu = new JPopupMenu();
menu.add( new AddAliasIdentifierItem( AliasIDType.ESN ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.Fleetsync ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.LoJack ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.LTRNetUID ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.MDC1200 ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.MPT1327 ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.MIN ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.Site ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.Status ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.Talkgroup ) );
menu.addSeparator();
menu.add( new AddAliasIdentifierItem( AliasIDType.Priority ) );
menu.addSeparator();
menu.add( new AddAliasIdentifierItem( AliasIDType.NonRecordable ) );
menu.show( e.getComponent(), e.getX(), e.getY() );
}
} );
add( newButton );
add( new JButton( "Copy" ) ); add( new JButton( "Copy" ) );
add( new JButton( "Delete" ), "wrap" ); add( new JButton( "Delete" ), "wrap" );
} }
@@ -114,8 +154,7 @@ public class AliasIdentifierEditor extends AliasConfigurationEditor
@Override @Override
public void save() public void save()
{ {
// TODO Auto-generated method stub mAliasModel.broadcast( new AliasEvent( mAlias, Event.CHANGE ) );
} }
public class EditorContainer extends JPanel public class EditorContainer extends JPanel
@@ -159,4 +198,43 @@ public class AliasIdentifierEditor extends AliasConfigurationEditor
revalidate(); revalidate();
} }
} }
public class AddAliasIdentifierItem extends JMenuItem
{
private static final long serialVersionUID = 1L;
private AliasIDType mAliasIDType;
public AddAliasIdentifierItem( AliasIDType type )
{
super( type.toString() );
mAliasIDType = type;
addActionListener( new ActionListener()
{
@Override
public void actionPerformed( ActionEvent e )
{
final AliasID id = AliasFactory.getAliasID( mAliasIDType );
if( id != null && mAlias != null )
{
mAlias.addAliasID( id );
EventQueue.invokeLater( new Runnable()
{
@Override
public void run()
{
setAlias( mAlias );
mAliasIDList.setSelectedValue( id, true );
}
} );
}
}
} );
}
}
} }

View File

@@ -258,12 +258,12 @@ public class AliasModel extends AbstractTableModel
} }
} }
public void addAliasEventListener( Listener<AliasEvent> listener ) public void addListener( Listener<AliasEvent> listener )
{ {
mAliasEventBroadcaster.addListener( listener ); mAliasEventBroadcaster.addListener( listener );
} }
public void removeAliasEventListener( Listener<AliasEvent> listener ) public void removeListener( Listener<AliasEvent> listener )
{ {
mAliasEventBroadcaster.removeListener( listener ); mAliasEventBroadcaster.removeListener( listener );
} }

View File

@@ -37,8 +37,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import properties.SystemProperties; import properties.SystemProperties;
import sample.Listener;
import alias.Alias; import alias.Alias;
import alias.AliasDirectory; import alias.AliasDirectory;
import alias.AliasEvent;
import alias.AliasList; import alias.AliasList;
import alias.AliasModel; import alias.AliasModel;
import alias.Group; import alias.Group;
@@ -51,7 +53,7 @@ import controller.channel.ChannelModel;
import controller.site.Site; import controller.site.Site;
import controller.system.SystemList; import controller.system.SystemList;
public class PlaylistManager implements ChannelEventListener public class PlaylistManager implements ChannelEventListener, Listener<AliasEvent>
{ {
private final static Logger mLog = private final static Logger mLog =
LoggerFactory.getLogger( PlaylistManager.class ); LoggerFactory.getLogger( PlaylistManager.class );
@@ -83,8 +85,9 @@ public class PlaylistManager implements ChannelEventListener
mAliasModel = aliasModel; mAliasModel = aliasModel;
mChannelModel = channelModel; mChannelModel = channelModel;
//Register for channel events so that we can save the playlist when //Register for alias and channel events so that we can save the
//any channels change //playlist with changes
mAliasModel.addListener( this );
mChannelModel.addListener( this ); mChannelModel.addListener( this );
} }
@@ -128,6 +131,33 @@ public class PlaylistManager implements ChannelEventListener
load( playlistFolder.resolve( playlistFile ) ); load( playlistFolder.resolve( playlistFile ) );
} }
/**
* Alias event listener method. Monitors alias events for events that
* indicate that the playlist has changed and queues automatic playlist
* saving.
*/
@Override
public void receive( AliasEvent event )
{
if( !mPlaylistLoading )
{
switch( event.getEvent() )
{
case ADD:
case DELETE:
case CHANGE:
schedulePlaylistSave();
break;
default:
//When a new event enum entry is added and received, throw an
//exception here to ensure developer adds support for the
//use case
throw new IllegalArgumentException( "Unrecognized Alias "
+ "Event [" + event.getEvent().toString() + "]" );
}
}
}
/** /**
* Channel event listener method. Monitors channel events for events that * Channel event listener method. Monitors channel events for events that
* indicate that the playlist has changed and queues automatic playlist * indicate that the playlist has changed and queues automatic playlist