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

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

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

Modified Files:
	VirtualServerManager.java Controller.java ServerManager.java 
	SOAPServerManager.java 
Log Message:
Aenderungen von DeletePosition und MovePosition wie im Server und wsdls angepasst.

Index: VirtualServerManager.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VirtualServerManager.java	7 Nov 2005 14:18:25 -0000	1.3
--- VirtualServerManager.java	8 Nov 2005 11:24:19 -0000	1.4
***************
*** 236,240 ****
     *      net.sf.magicmap.client.interfaces.DeletePositionCallback)
     */
!   public void deletePosition(final long positionId, final DeletePositionCallback callback){
      if (!isConnected()) return;
      Thread thread = new Thread() {
--- 236,240 ----
     *      net.sf.magicmap.client.interfaces.DeletePositionCallback)
     */
!   public void deletePosition(final long positionId, final String mapname, final DeletePositionCallback callback){
      if (!isConnected()) return;
      Thread thread = new Thread() {
***************
*** 244,248 ****
            try{
  
!             positionFacade.deletePosition(sessionId, positionId);
              System.out.println("PositionID " + positionId + " deleted.");
              // TODO: Zusätzliche Parameter zur Position
--- 244,248 ----
            try{
  
!             positionFacade.deletePosition(sessionId, mapname, positionId);
              System.out.println("PositionID " + positionId + " deleted.");
              // TODO: Zusätzliche Parameter zur Position

Index: Controller.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Controller.java	7 Nov 2005 14:18:25 -0000	1.6
--- Controller.java	8 Nov 2005 11:24:19 -0000	1.7
***************
*** 352,360 ****
     * @param node
     */
!   public void deletePosition(String name, DeletePositionCallback callback){
      Node node = nodeModel.findNode(name);
      if (node != null){
        if (node.getId() != -1){
!         serverManager.deletePosition(node.getId(), callback);
        } else{
          System.out.println("Node has no positionId, so its position cannot be deleted.");
--- 352,360 ----
     * @param node
     */
!   public void deletePosition(String name, String mapname, DeletePositionCallback callback){
      Node node = nodeModel.findNode(name);
      if (node != null){
        if (node.getId() != -1){
!         serverManager.deletePosition(node.getId(), Controller.getInstance().getCurrentMap().name, callback);
        } else{
          System.out.println("Node has no positionId, so its position cannot be deleted.");

Index: ServerManager.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ServerManager.java	7 Nov 2005 14:18:25 -0000	1.7
--- ServerManager.java	8 Nov 2005 11:24:19 -0000	1.8
***************
*** 148,152 ****
     * @param callback
     */
!   public abstract void deletePosition(final long positionId, final DeletePositionCallback callback);
  
    /**
--- 148,152 ----
     * @param callback
     */
!   public abstract void deletePosition(final long positionId, final String mapname, final DeletePositionCallback callback);
  
    /**

Index: SOAPServerManager.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SOAPServerManager.java	7 Nov 2005 14:18:25 -0000	1.3
--- SOAPServerManager.java	8 Nov 2005 11:24:19 -0000	1.4
***************
*** 230,234 ****
     * @param callback
     */
!   public void deletePosition(final long positionId, final DeletePositionCallback callback){
      if (isConnected()){
        Thread deletePositionThread = new Thread() {
--- 230,234 ----
     * @param callback
     */
!   public void deletePosition(final long positionId, final String mapname, final DeletePositionCallback callback){
      if (isConnected()){
        Thread deletePositionThread = new Thread() {
***************
*** 237,241 ****
            synchronized (mutex){
              try{
!               SOAPServerManager.this.positionDelgate.deletePosition(sessionId, positionId);
                System.out.println("PositionID " + positionId + " deleted.");
                // TODO: Zusätzliche Parameter zur Position
--- 237,241 ----
            synchronized (mutex){
              try{
!               SOAPServerManager.this.positionDelgate.deletePosition(sessionId, mapname, positionId);
                System.out.println("PositionID " + positionId + " deleted.");
                // TODO: Zusätzliche Parameter zur Position