[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/gui MapPanel.java,1.11,1.12

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

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

Modified Files:
	MapPanel.java 
Log Message:
movePosition um den MapName erweitert.

Index: MapPanel.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MapPanel.java	31 Aug 2005 12:40:15 -0000	1.11
--- MapPanel.java	7 Nov 2005 14:18:25 -0000	1.12
***************
*** 281,285 ****
                ((AccessPointNode) selectedNode).getMacAddress(), this);
          } else{
!           Controller.getInstance().movePosition(selectedNode.getId(), selectedNode.getX(), selectedNode.getY(), true,
                this);
          }
--- 281,285 ----
                ((AccessPointNode) selectedNode).getMacAddress(), this);
          } else{
!           Controller.getInstance().movePosition(selectedNode.getId(), Controller.getInstance().getCurrentMap().name , selectedNode.getX(), selectedNode.getY(), true,
                this);
          }
***************
*** 289,293 ****
                ((ClientNode) selectedNode).getMacAddress(), this);
          } else{
!           Controller.getInstance().movePosition(selectedNode.getId(), selectedNode.getX(), selectedNode.getY(), true,
                this);
          }
--- 289,293 ----
                ((ClientNode) selectedNode).getMacAddress(), this);
          } else{
!           Controller.getInstance().movePosition(selectedNode.getId(), Controller.getInstance().getCurrentMap().name, selectedNode.getX(), selectedNode.getY(), true,
                this);
          }
***************
*** 297,301 ****
                true, this);
          } else{
!           Controller.getInstance().movePosition(selectedNode.getId(), selectedNode.getX(), selectedNode.getY(), true,
                this);
          }
--- 297,301 ----
                true, this);
          } else{
!           Controller.getInstance().movePosition(selectedNode.getId(), Controller.getInstance().getCurrentMap().name, selectedNode.getX(), selectedNode.getY(), true,
                this);
          }
***************
*** 306,310 ****
        // Knoten unfixieren
        if (selectedNode.getId() != -1){
!         Controller.getInstance().movePosition(selectedNode.getId(), selectedNode.getX(), selectedNode.getY(), false,
              this);
        } else{
--- 306,310 ----
        // Knoten unfixieren
        if (selectedNode.getId() != -1){
!         Controller.getInstance().movePosition(selectedNode.getId(),Controller.getInstance().getCurrentMap().name, selectedNode.getX(), selectedNode.getY(), false,
              this);
        } else{