magicmap-commits

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

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

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

Index: RFIDTag.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/RFIDTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RFIDTag.java	28 Feb 2006 11:23:16 -0000	1.1
--- RFIDTag.java	7 Mar 2006 16:11:16 -0000	1.2
***************
*** 4,7 ****
--- 4,9 ----
  package net.sf.magicmap.client.model.node;
  
+ import net.sf.magicmap.client.meta.MapInfo;
+ 
  /**
   * @author Johannes Zapotoczky (joh...@za...)
***************
*** 11,15 ****
  
  	private String url;
! 
  	private int x;
  	private int y;
--- 13,18 ----
  
  	private String url;
! 	private String antenna;
! 	
  	private int x;
  	private int y;
***************
*** 42,48 ****
  	}
  	
! 	public boolean equals(RFIDTag tag2) {
! 		return url.equals(tag2.getUrl());
  	}
  
  	public long getTimestamp() {
--- 45,54 ----
  	}
  	
! 	public boolean equals(Object tag2) {
! 		String url2 = ((RFIDTag)tag2).getUrl();
! 		return url.equals(url2);
  	}
+ 	
+ 	
  
  	public long getTimestamp() {
***************
*** 54,56 ****
--- 60,82 ----
  	}
  
+ 	public void setMap(String map) {
+ 		this.map = map;
+ 	}
+ 
+ 	public void setX(int x) {
+ 		this.x = x;
+ 	}
+ 
+ 	public void setY(int y) {
+ 		this.y = y;
+ 	}
+ 
+ 	public String getAntenna() {
+ 		return antenna;
+ 	}
+ 
+ 	public void setAntenna(String antenna) {
+ 		this.antenna = antenna;
+ 	}
+ 
  }

Index: RFIDAntenna.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/RFIDAntenna.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RFIDAntenna.java	28 Feb 2006 11:23:16 -0000	1.1
--- RFIDAntenna.java	7 Mar 2006 16:11:16 -0000	1.2
***************
*** 11,14 ****
--- 11,15 ----
  	
  	private String url;
+ 	private String antennaId;
  	
  	private int x;
***************
*** 19,23 ****
  	 * 
  	 */
! 	public RFIDAntenna(String url, int x, int y, String mapName) {
  		this.url = url;
  		this.x = x;
--- 20,25 ----
  	 * 
  	 */
! 	public RFIDAntenna(String id, String url, int x, int y, String mapName) {
! 		this.antennaId = id;
  		this.url = url;
  		this.x = x;
***************
*** 46,48 ****
--- 48,58 ----
  	}
  
+ 	public String getAntennaId() {
+ 		return antennaId;
+ 	}
+ 
+ 	public void setAntennaId(String antennaId) {
+ 		this.antennaId = antennaId;
+ 	}
+ 
  }