[Magicmap-commits] magicmapserver/src/net/sf/magicmap/server/facade PositionFacade.java,1.4,1.5

[Martin S. <sch...@us...>]

Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26024/src/net/sf/magicmap/server/facade

Modified Files:
	PositionFacade.java 
Log Message:
+Bug in webservice interface fixed, magicmap 0.3 was broken...

Index: PositionFacade.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PositionFacade.java	13 Feb 2005 22:27:25 -0000	1.4
--- PositionFacade.java	16 Feb 2005 08:58:26 -0000	1.5
***************
*** 4,7 ****
--- 4,8 ----
  import java.sql.Timestamp;
  import java.util.ArrayList;
+ import java.util.Arrays;
  import java.util.Collection;
  import java.util.Date;
***************
*** 155,168 ****
      pm.deletePersistentAll(pos.getScanResults());
      SimpleScanResultDTO[] dtos = character.getSimpleScanResults();
!     for (int i = 0; i < dtos.length; i++){
!       AccessPoint ap = findOrCreateAccessPoint(dtos[i].getMacAP(), pm);
!       //@TODO think about? ap.setSsid(dtos[i].getSsid());
!       Timestamp lastSeen = null;
!       if (dtos[i].getLastSeen() != null){
!         lastSeen = new Timestamp(dtos[i].getLastSeen().getTime());
        }
-       ScanResult sr = new ScanResult(client, ap, dtos[i].getSignalLevel(), dtos[i].getNoise(), lastSeen);
-       pm.makePersistent(sr);
-       sr.setPosition(pos);
      }
    }
--- 156,171 ----
      pm.deletePersistentAll(pos.getScanResults());
      SimpleScanResultDTO[] dtos = character.getSimpleScanResults();
!     if (dtos != null){
!       for (int i = 0; i < dtos.length; i++){
!         AccessPoint ap = findOrCreateAccessPoint(dtos[i].getMacAP(), pm);
!         //@TODO think about? ap.setSsid(dtos[i].getSsid());
!         Timestamp lastSeen = null;
!         if (dtos[i].getLastSeen() != null){
!           lastSeen = new Timestamp(dtos[i].getLastSeen().getTime());
!         }
!         ScanResult sr = new ScanResult(client, ap, dtos[i].getSignalLevel(), dtos[i].getNoise(), lastSeen);
!         pm.makePersistent(sr);
!         sr.setPosition(pos);
        }
      }
    }
***************
*** 644,651 ****
                  lastSeen = new Date(sr.getScantime().getTime());
                }
!               
                SimpleScanResultDTO ssr = new SimpleScanResultDTO(sr.getAccessPoint().getSsid(), sr.getAccessPoint()
                    .getMac(), sr.getSignalLevel(), sr.getNoiseLevel(), lastSeen);
!               dto.getCharacter().addSimpleScan(ssr);
              }
            }
--- 647,663 ----
                  lastSeen = new Date(sr.getScantime().getTime());
                }
! 
                SimpleScanResultDTO ssr = new SimpleScanResultDTO(sr.getAccessPoint().getSsid(), sr.getAccessPoint()
                    .getMac(), sr.getSignalLevel(), sr.getNoiseLevel(), lastSeen);
!               
!               ArrayList list;
!               if (dto.getCharacter().getSimpleScanResults() == null){
!                 list = new ArrayList();
!               } else {
!                 list = new ArrayList(Arrays.asList(dto.getCharacter().getSimpleScanResults())); 
!               }
! 
!               list.add(ssr);
!               dto.getCharacter().setSimpleScanResults((SimpleScanResultDTO[]) list.toArray(new SimpleScanResultDTO[0]));
              }
            }