[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/controller ServerManager.java,1.4,1.5

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

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

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

Index: ServerManager.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ServerManager.java	13 Feb 2005 22:27:52 -0000	1.4
--- ServerManager.java	16 Feb 2005 09:02:31 -0000	1.5
***************
*** 5,14 ****
  package net.sf.magicmap.client.controller;
  
- import java.sql.Timestamp;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Calendar;
  import java.util.Collection;
- import java.util.Date;
  import java.util.GregorianCalendar;
  import java.util.Iterator;
--- 5,12 ----
***************
*** 229,234 ****
        //       zunächst nicht wichtig)
  
!       ArrayList list = new ArrayList(Arrays.asList(signalCharacter.getSimpleScanResults()));
! 
        Calendar c = new GregorianCalendar();
        c.setTimeInMillis(System.currentTimeMillis());
--- 227,236 ----
        //       zunächst nicht wichtig)
  
!       ArrayList list;
!       if (signalCharacter.getSimpleScanResults() == null){
!         list = new ArrayList();
!       } else {
!         list = new ArrayList(Arrays.asList(signalCharacter.getSimpleScanResults())); 
!       }
        Calendar c = new GregorianCalendar();
        c.setTimeInMillis(System.currentTimeMillis());
***************
*** 256,259 ****
--- 258,263 ----
      if (isConnected()){
        final SignalCharacterDTO signalCharacter = currentSignalCharacter();
+       System.out.println("signalCharacter.getSimpleScanResults() " + signalCharacter.getSimpleScanResults());
+       
        Thread createPositionThread = new Thread() {