Updates LoJack message/event function and reply code aliasing.

-Adds new LoJack AliasID allowing user to specify a lojack function and
5-character reply code with wildcards.
-Removes SiteID as an alias option for LoJack.

Valid Alias IDs for LoJack now are:
-LoJack Alias ID: for function and reply code combinations
-ESN ID: for transponder addresses

src/module/decode/event/CallEventPanel.java

@@ -17,6 +17,8 @@
  ******************************************************************************/
 package module.decode.event;
 
+import java.awt.EventQueue;
+
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
@@ -58,7 +60,7 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
 	}
 
 	@Override
-    public void channelChanged( ChannelEvent event )
+    public void channelChanged( final ChannelEvent event )
     {
 		if( event.getEvent() == Event.CHANGE_SELECTED && 
 			event.getChannel().isSelected() )
@@ -67,26 +69,34 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
 				( mDisplayedChannel != null && 
 				  mDisplayedChannel != event.getChannel() ) )
 			{
-				removeAll();
-				
-				JTable table = new JTable(
-						event.getChannel().getCallEventModel() );
+				EventQueue.invokeLater( new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						removeAll();
+						
+						JTable table = new JTable(
+								event.getChannel().getCallEventModel() );
 
-				table.setAutoCreateRowSorter( true );
-		    	table.setAutoResizeMode( JTable.AUTO_RESIZE_LAST_COLUMN );
-				
-				table.getColumnModel().getColumn( CallEventModel.FROM_ALIAS )
-				.setCellRenderer( mRenderer );
+						table.setAutoCreateRowSorter( true );
+				    	table.setAutoResizeMode( JTable.AUTO_RESIZE_LAST_COLUMN );
+						
+						table.getColumnModel().getColumn( CallEventModel.FROM_ALIAS )
+						.setCellRenderer( mRenderer );
 
-				table.getColumnModel().getColumn( CallEventModel.TO_ALIAS )
-				.setCellRenderer( mRenderer );
+						table.getColumnModel().getColumn( CallEventModel.TO_ALIAS )
+						.setCellRenderer( mRenderer );
+						
+						add( new JScrollPane( table ) );
+						
+						mDisplayedChannel = event.getChannel();
+						
+						revalidate();
+						repaint();
+					}
+				} );
 				
-				add( new JScrollPane( table ) );
-				
-				mDisplayedChannel = event.getChannel();
-				
-				revalidate();
-				repaint();
 			}
 		}
 		else if( event.getEvent() == Event.CHANNEL_PROCESSING_STOPPED ||
@@ -96,11 +106,19 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
 				mDisplayedChannel == event.getChannel() )
 			{
 				mDisplayedChannel = null;
-				removeAll();
-				add( mEmptyScroller );
+				
+				EventQueue.invokeLater( new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						removeAll();
+						add( mEmptyScroller );
 
-				revalidate();
-				repaint();
+						revalidate();
+						repaint();
+					}
+				} );
 			}
 		}
     }

src/module/decode/lj1200/LJ1200DecoderState.java

@@ -87,7 +87,7 @@ public class LJ1200DecoderState extends DecoderState
 			if( lj.isValid() )
 			{
 				setAddress( lj.getAddress() );
-				setAddressAlias( lj.getAddressAlias() );
+				setAddressAlias( lj.getTransponderAlias() );
 				
 				mAddresses.add( mAddress );
 

src/module/decode/lj1200/LJ1200Message.java

@@ -17,7 +17,6 @@
  ******************************************************************************/
 package module.decode.lj1200;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -61,8 +60,6 @@ public class LJ1200Message extends Message
 	public static int[] MESSAGE_CRC = { 79,78,77,76,75,74,73,72,71,70,69,68,67,
 		66,65,64 };
 	
-	private static SimpleDateFormat mSDF = new SimpleDateFormat( "yyyyMMdd HHmmss" );
-
     private BinaryMessage mMessage;
     private AliasList mAliasList;
     private CRC mCRC;
@@ -126,7 +123,7 @@ public class LJ1200Message extends Message
     	return mMessage.getHex( ADDRESS, 7 );
     }
     
-    public Alias getAddressAlias()
+    public Alias getTransponderAlias()
     {
     	if( mAliasList != null )
     	{
@@ -136,21 +133,11 @@ public class LJ1200Message extends Message
     	return null;
     }
     
-    public Alias getSiteAndReplyCodeAlias()
+    public Alias getFunctionAndIDAlias()
     {
-    	Function function = getFunction();
-    	
     	if( mAliasList != null )
     	{
-    		if( function == Function.F1_SITE_ID ||
-    			function == Function.F1_SPEED_UP ||
-    			function == Function.F2_TEST ||
-    			function == Function.F3_DEACTIVATE ||
-    			function == Function.F4_ACTIVATE ||
-    			function == Function.FF_TRACK_PULSE )
-    		{
-        		return mAliasList.getSiteID( getReplyCode() );
-    		}
+    		return mAliasList.getLoJackAlias( getFunction(), getReplyCode() );
     	}
     	
     	return null;
@@ -200,7 +187,7 @@ public class LJ1200Message extends Message
     	
 		sb.append( getReplyCode() );
 
-		Alias site = getSiteAndReplyCodeAlias();
+		Alias site = getFunctionAndIDAlias();
 		
 		if( site != null )
 		{
@@ -286,7 +273,7 @@ public class LJ1200Message extends Message
 	@Override
     public Alias getFromIDAlias()
     {
-		return getSiteAndReplyCodeAlias();
+		return getFunctionAndIDAlias();
     }
 
 	@Override
@@ -415,18 +402,18 @@ public class LJ1200Message extends Message
 	{
 		List<Alias> aliases = new ArrayList<Alias>();
 		
-		Alias siteAndReply = getSiteAndReplyCodeAlias();
+		Alias functionAndID = getFunctionAndIDAlias();
 		
-		if( siteAndReply != null )
+		if( functionAndID != null )
 		{
-			aliases.add( siteAndReply );
+			aliases.add( functionAndID );
 		}
 
-		Alias address = getAddressAlias();
+		Alias transponder = getTransponderAlias();
 		
-		if( address != null )
+		if( transponder != null )
 		{
-			aliases.add( address );
+			aliases.add( transponder );
 		}
 		
 		return aliases;