[Magicmap-commits] magicmapserver/src/net/sf/magicmap/server/cache PositionCache.java,1.3,1.4

[Florian L. <fle...@us...>]

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

Modified Files:
	PositionCache.java 
Log Message:
anpassen der webservices an PositionCache

Index: PositionCache.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/cache/PositionCache.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PositionCache.java	7 Nov 2005 15:22:33 -0000	1.3
--- PositionCache.java	8 Nov 2005 13:14:50 -0000	1.4
***************
*** 94,106 ****
  	
  	protected void addPosition(PositionDTO position){
! 		Long id = getFirstFreeID(); 
  		position.setId(id);
! 		while(timeMap.containsKey(position.getLastModified())){
! 			position.setLastModified(position.getLastModified() + 1);
  		}
  		timeMap.put(position.getLastModified(),position.getName());
  		idHash.put(id,position.getName());
! 		positionHash.put(position.getName(),position);
! 		
  	}
  	
--- 94,112 ----
  	
  	protected void addPosition(PositionDTO position){
! 		Long id = new Long(1);
! 		while(idHash.containsKey(id)){
! 			++id;
! 		} 
  		position.setId(id);
! 		
! 		Long time = System.currentTimeMillis();
! 		while(timeMap.containsKey(time)){
! 			++time;
  		}
+ 		position.setLastModified(time);
+ 		
  		timeMap.put(position.getLastModified(),position.getName());
  		idHash.put(id,position.getName());
! 		positionHash.put(position.getName(),position);		
  	}
  	
***************
*** 126,135 ****
  		}
  	
- 	private Long getFirstFreeID() {
- 		Long id = new Long(1);
- 		while(idHash.containsKey(id))
- 			++id;
- 		return id;
- 	}
  
  	protected boolean existsPosition(String name){
--- 132,135 ----