[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/controller Controller.java,1.16,1.17

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

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

Modified Files:
	Controller.java 
Log Message:
rfid bugfix

Index: Controller.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Controller.java	8 Mar 2006 20:07:14 -0000	1.16
--- Controller.java	9 Mar 2006 08:58:34 -0000	1.17
***************
*** 612,621 ****
  		if (antenna01 != null) {
  			newTag.setX(antenna01.getX());
! 			newTag.setY(antenna01.getY());
  		}
  	} else if (antenna.equals("02")) {
  		if (antenna01 != null) {
  			newTag.setX(antenna02.getX());
! 			newTag.setY(antenna02.getY());
  		}		
  	} else if (antenna.equals("03")) {
--- 612,621 ----
  		if (antenna01 != null) {
  			newTag.setX(antenna01.getX());
! 			newTag.setY(antenna01.getY()-5);
  		}
  	} else if (antenna.equals("02")) {
  		if (antenna01 != null) {
  			newTag.setX(antenna02.getX());
! 			newTag.setY(antenna02.getY()+5);
  		}		
  	} else if (antenna.equals("03")) {
***************
*** 633,637 ****
  		if (antenna03 != null) {
  			newTag.setX(antenna03.getX());
! 			newTag.setY(antenna03.getY());
  		}	
  	} else if (antenna.equals("05")) {
--- 633,637 ----
  		if (antenna03 != null) {
  			newTag.setX(antenna03.getX());
! 			newTag.setY(antenna03.getY()-5);
  		}	
  	} else if (antenna.equals("05")) {
***************
*** 683,687 ****
  		if (antenna04 != null) {
  			newTag.setX(antenna04.getX());
! 			newTag.setY(antenna04.getY());
  		}		
  	} else if (antenna.equals("09")) {
--- 683,687 ----
  		if (antenna04 != null) {
  			newTag.setX(antenna04.getX());
! 			newTag.setY(antenna04.getY()+5);
  		}		
  	} else if (antenna.equals("09")) {
***************
*** 819,824 ****
  	public void setRfidPollingActive(boolean rfidPollingActive) {
  		this.rfidPollingActive = rfidPollingActive;
! 		File file = new File("c:\\windows\\system32\\OBIDISC4J.dll");
! 		if (file.exists()) {
  			if (rfidController == null) {
  				try {
--- 819,830 ----
  	public void setRfidPollingActive(boolean rfidPollingActive) {
  		this.rfidPollingActive = rfidPollingActive;
! 		File file1 = new File("c:\\windows\\system32\\OBIDISC4J.dll");
! 		File file2 = new File("c:\\windows\\system32\\FeCom.dll");
! 		File file3 = new File("c:\\windows\\system32\\fefu.dll");
! 		File file4 = new File("c:\\windows\\system32\\FeUsb.dll");
! 		File file5 = new File("c:\\windows\\system32\\fetcp.dll");
! 		File file6 = new File("c:\\windows\\system32\\FeIsc.dll");
! 		if (file1.exists() && file2.exists() && file3.exists() && 
! 				file4.exists() && file5.exists() && file6.exists()) {
  			if (rfidController == null) {
  				try {