[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/gui/dialogs RFIDAntennaDialog.java,1.2,1.3

[Johannes Z. <jza...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20109/src/net/sf/magicmap/client/gui/dialogs

Modified Files:
	RFIDAntennaDialog.java 
Log Message:
added RFID library check
added RFID functionality

Index: RFIDAntennaDialog.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/RFIDAntennaDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RFIDAntennaDialog.java	28 Feb 2006 12:40:29 -0000	1.2
--- RFIDAntennaDialog.java	7 Mar 2006 16:11:16 -0000	1.3
***************
*** 10,13 ****
--- 10,14 ----
  
  import javax.swing.JButton;
+ import javax.swing.JComboBox;
  import javax.swing.JDialog;
  import javax.swing.JFrame;
***************
*** 34,38 ****
  	private RFIDAntenna antenna;
  	
! 	private JTextField id;
  	
  	public static RFIDAntenna showDialog(JFrame owner) {
--- 35,40 ----
  	private RFIDAntenna antenna;
  	
! 	private JComboBox id;
! 	private JTextField url;
  	
  	public static RFIDAntenna showDialog(JFrame owner) {
***************
*** 79,90 ****
  	    getRootPane().setDefaultButton(okButton);
  	    
  	    
  	    //id
! 	    id = builder.addTextField("id");
  	    builder.addLabel("ID", "idlabel", id);
  	    builder.setLeft("idlabel", 20);
  	    builder.setRightRightDistance("id", null, -20);
! 	    builder.setTopBottomDistance("idlabel", "header", 20);
! 	    builder.setTopBottomDistance("id", "header", 20);
  	}
  	
--- 81,99 ----
  	    getRootPane().setDefaultButton(okButton);
  	    
+ 	    // url
+ 	    url = builder.addTextField("url");
+ 	    builder.addLabel("URL", "urllabel", url);
+ 	    builder.setLeft("urllabel", 20);
+ 	    builder.setRightRightDistance("url", null, -20);
+ 	    builder.setTopBottomDistance("urllabel", "header", 20);
+ 	    builder.setTopBottomDistance("url", "header", 20);
  	    
  	    //id
! 	    id = builder.addComboBox(new String[] {"01", "02", "03", "04"}, "id");
  	    builder.addLabel("ID", "idlabel", id);
  	    builder.setLeft("idlabel", 20);
  	    builder.setRightRightDistance("id", null, -20);
! 	    builder.setTopBottomDistance("idlabel", "header", 5);
! 	    builder.setTopBottomDistance("id", "header", 5);
  	}
  	
***************
*** 94,98 ****
  	public void actionPerformed(ActionEvent e) {
  	    if ("OK".equals(e.getActionCommand())) {
! 	    	this.antenna = new RFIDAntenna(id.getText(), -1, -1, "");
  	        this.setVisible(false);
  	      } else if ("CANCEL".equals(e.getActionCommand())){
--- 103,108 ----
  	public void actionPerformed(ActionEvent e) {
  	    if ("OK".equals(e.getActionCommand())) {
! 	    	this.antenna = new RFIDAntenna((String) id.getSelectedItem(), url.getText(), -1, -1, "");
! 	    	antenna.setAntennaId((String) id.getSelectedItem());
  	        this.setVisible(false);
  	      } else if ("CANCEL".equals(e.getActionCommand())){