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

[Tobias H. <thu...@us...>]

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

Modified Files:
	MapFacade.java PositionFacade.java SessionFacade.java 
Log Message:
+ Client is usable without server

Index: MapFacade.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/MapFacade.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MapFacade.java	12 Feb 2005 15:19:27 -0000	1.3
--- MapFacade.java	11 May 2005 10:45:05 -0000	1.4
***************
*** 110,115 ****
        Map map = new Map(name, URL, new Integer(10), new Integer(10), new Integer(width), new Integer(height));
        pm.makePersistent(map);
!       result = new MapDTO(new Long(map.getId()), map.getImageURL(), map.getName(), map.getImageHeight(), map
!           .getImageWidth());
        JDOUtil.commit(tx);
      } finally{
--- 110,120 ----
        Map map = new Map(name, URL, new Integer(10), new Integer(10), new Integer(width), new Integer(height));
        pm.makePersistent(map);
!       result = new MapDTO();
! 
!       result.setId(new Long(map.getId()));
!       result.setName(map.getName());
!       result.setImageHeight(map.getImageHeight());
!       result.setImageWidth(map.getImageWidth());
!       result.setImageURL(map.getImageURL());
        JDOUtil.commit(tx);
      } finally{
***************
*** 140,145 ****
        }
        Map map = (Map) results.iterator().next();
!       result = new MapDTO(new Long(map.getId()), map.getImageURL(), map.getName(), map.getImageHeight(), map
!           .getImageWidth());
        JDOUtil.commit(tx);
      } finally{
--- 145,156 ----
        }
        Map map = (Map) results.iterator().next();
! 
!       result = new MapDTO();
! 
!       result.setId(new Long(map.getId()));
!       result.setName(map.getName());
!       result.setImageHeight(map.getImageHeight());
!       result.setImageWidth(map.getImageWidth());
!       result.setImageURL(map.getImageURL());
        JDOUtil.commit(tx);
      } finally{

Index: SessionFacade.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/SessionFacade.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SessionFacade.java	13 Feb 2005 21:34:43 -0000	1.4
--- SessionFacade.java	11 May 2005 10:45:05 -0000	1.5
***************
*** 41,45 ****
      // check Version
      if (!Version.PROTOCOL_VERSION.equals(version)){
!       throw new AuthenticationException("Client-Server-Versionen passen nicht: " + Version.PROTOCOL_VERSION + " <> " + version);
      }
  
--- 41,46 ----
      // check Version
      if (!Version.PROTOCOL_VERSION.equals(version)){
!       throw new AuthenticationException("Client-Server-Versionen passen nicht: " + Version.PROTOCOL_VERSION + " <> "
!           + version);
      }
  

Index: PositionFacade.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PositionFacade.java	16 Feb 2005 08:58:26 -0000	1.5
--- PositionFacade.java	11 May 2005 10:45:05 -0000	1.6
***************
*** 160,168 ****
          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);
--- 160,165 ----
          AccessPoint ap = findOrCreateAccessPoint(dtos[i].getMacAP(), pm);
          //@TODO think about? ap.setSsid(dtos[i].getSsid());
!         ScanResult sr = new ScanResult(client, ap, dtos[i].getSignalLevel(), dtos[i].getNoise(), new Timestamp(System
!             .currentTimeMillis())); //@TODO use lastSeen
          pm.makePersistent(sr);
          sr.setPosition(pos);
***************
*** 648,659 ****
                }
  
!               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())); 
                }
  
--- 645,661 ----
                }
  
!               SimpleScanResultDTO ssr = new SimpleScanResultDTO();
! 
!               //ssr.setLastSeen(lastSeen); //TODO: last seen benutzen
!               ssr.setMacAP(sr.getAccessPoint().getMac());
!               ssr.setNoise(sr.getNoiseLevel());
!               ssr.setSignalLevel(sr.getSignalLevel());
!               ssr.setSsid(sr.getAccessPoint().getSsid());
! 
                ArrayList list;
                if (dto.getCharacter().getSimpleScanResults() == null){
                  list = new ArrayList();
!               } else{
!                 list = new ArrayList(Arrays.asList(dto.getCharacter().getSimpleScanResults()));
                }