[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/controller VirtualServerManager.java,1.2,1.3 Controller.java,1.5,1.6 ServerManager.java,1.6,1.7 SOAPServerManager.java,1.2,1.3

[Andreas W. <an...@us...>]

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

Modified Files:
	VirtualServerManager.java Controller.java ServerManager.java 
	SOAPServerManager.java 
Log Message:
movePosition um den MapName erweitert.

Index: VirtualServerManager.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VirtualServerManager.java	11 May 2005 15:45:01 -0000	1.2
--- VirtualServerManager.java	7 Nov 2005 14:18:25 -0000	1.3
***************
*** 264,268 ****
     *      net.sf.magicmap.client.interfaces.MovePositionCallback)
     */
!   public void movePosition(final long positionId, final int x, final int y, final boolean fixed,
        final MovePositionCallback callback){
      if (!isConnected()) return;
--- 264,268 ----
     *      net.sf.magicmap.client.interfaces.MovePositionCallback)
     */
!   public void movePosition(final long positionId, final String mapname, final int x, final int y, final boolean fixed,
        final MovePositionCallback callback){
      if (!isConnected()) return;
***************
*** 273,277 ****
            try{
  
!             positionFacade.movePosition(sessionId, positionId, x, y, fixed);
              // TODO: Zusätzliche Parameter zur Position
              callback.positionMoved(positionId);
--- 273,277 ----
            try{
  
!             positionFacade.movePosition(sessionId, mapname, positionId, x, y, fixed);
              // TODO: Zusätzliche Parameter zur Position
              callback.positionMoved(positionId);

Index: Controller.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Controller.java	8 Oct 2005 23:18:09 -0000	1.5
--- Controller.java	7 Nov 2005 14:18:25 -0000	1.6
***************
*** 373,379 ****
    }
  
!   public void movePosition(final long positionId, final int x, final int y, boolean fixed,
        final MovePositionCallback callback){
!     serverManager.movePosition(positionId, x, y, fixed, callback);
    }
  
--- 373,379 ----
    }
  
!   public void movePosition(final long positionId, final String mapname, final int x, final int y, boolean fixed,
        final MovePositionCallback callback){
!     serverManager.movePosition(positionId, mapname,x, y, fixed, callback);
    }
  

Index: ServerManager.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ServerManager.java	11 May 2005 10:51:27 -0000	1.6
--- ServerManager.java	7 Nov 2005 14:18:25 -0000	1.7
***************
*** 156,160 ****
     * @param callback
     */
!   public abstract void movePosition(final long positionId, final int x, final int y, final boolean fixed,
        final MovePositionCallback callback);
  
--- 156,160 ----
     * @param callback
     */
!   public abstract void movePosition(final long positionId,final String mapname, final int x, final int y, final boolean fixed,
        final MovePositionCallback callback);
  

Index: SOAPServerManager.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SOAPServerManager.java	15 Jul 2005 17:54:32 -0000	1.2
--- SOAPServerManager.java	7 Nov 2005 14:18:25 -0000	1.3
***************
*** 257,261 ****
     * @param callback
     */
!   public void movePosition(final long positionId, final int x, final int y, final boolean fixed,
        final MovePositionCallback callback){
      if (isConnected()){
--- 257,261 ----
     * @param callback
     */
!   public void movePosition(final long positionId,final String mapname, final int x, final int y, final boolean fixed,
        final MovePositionCallback callback){
      if (isConnected()){
***************
*** 265,269 ****
            synchronized (mutex){
              try{
!               SOAPServerManager.this.positionDelgate.movePosition(sessionId, positionId, x, y, fixed);
                // TODO: Zusätzliche Parameter zur Position
                callback.positionMoved(positionId);
--- 265,269 ----
            synchronized (mutex){
              try{
!               SOAPServerManager.this.positionDelgate.movePosition(sessionId, mapname, positionId, x, y, fixed);
                // TODO: Zusätzliche Parameter zur Position
                callback.positionMoved(positionId);